From c6d71a3daad251f5ee75bb4d0e16bfae65dd080a Mon Sep 17 00:00:00 2001 From: "mila@ringwald.ch" Date: Fri, 15 Aug 2014 14:39:01 +0000 Subject: [PATCH] removed hci_write_authentication_enable from code --- CocoaTouch/src/BTstackManager.m | 4 ---- MSP-EXP430F5438-CC256x/example/hid_demo.c | 12 ++++-------- example/l2cap-server.c | 8 ++++---- example/l2cap-throughput.c | 5 +---- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/CocoaTouch/src/BTstackManager.m b/CocoaTouch/src/BTstackManager.m index 85635e137..5670f2eb6 100644 --- a/CocoaTouch/src/BTstackManager.m +++ b/CocoaTouch/src/BTstackManager.m @@ -556,10 +556,6 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe BD_ADDR_COPY(&connAddr, address); connPSM = psm; connAuth = authentication; - - // send write authentication enabled - bt_send_cmd(&hci_write_authentication_enable, authentication); - state = kW4AuthenticationEnableCommand; #endif return 0; }; diff --git a/MSP-EXP430F5438-CC256x/example/hid_demo.c b/MSP-EXP430F5438-CC256x/example/hid_demo.c index ed7d4fffb..e96ab7bd1 100644 --- a/MSP-EXP430F5438-CC256x/example/hid_demo.c +++ b/MSP-EXP430F5438-CC256x/example/hid_demo.c @@ -243,8 +243,10 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha case BTSTACK_EVENT_STATE: // bt stack activated, get started - set local name if (packet[2] == HCI_STATE_WORKING) { - // dumpCmds = 1; - hci_send_cmd(&hci_write_authentication_enable, 1); + printLine("Inquiry"); + state = inquiry; + hci_send_cmd(&hci_inquiry, HCI_INQUIRY_LAP, INQUIRY_INTERVAL, 0); + break; } break; @@ -293,12 +295,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha break; case HCI_EVENT_COMMAND_COMPLETE: - if (COMMAND_COMPLETE_EVENT(packet, hci_write_authentication_enable)){ - printLine("Inquiry"); - state = inquiry; - hci_send_cmd(&hci_inquiry, HCI_INQUIRY_LAP, INQUIRY_INTERVAL, 0); - break; - } if (COMMAND_COMPLETE_EVENT(packet, hci_inquiry_cancel) ) { // inq successfully cancelled // printLine("Connecting"); diff --git a/example/l2cap-server.c b/example/l2cap-server.c index 920039116..b351e6f39 100644 --- a/example/l2cap-server.c +++ b/example/l2cap-server.c @@ -84,9 +84,9 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint break; case BTSTACK_EVENT_STATE: - // bt stack activated, get started - set local name + // bt stack activated, get started if (packet[2] == HCI_STATE_WORKING) { - bt_send_cmd(&hci_write_authentication_enable, 0); + bt_send_cmd(&hci_write_class_of_device, 0x2540); } break; @@ -177,8 +177,8 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint break; case HCI_EVENT_COMMAND_COMPLETE: - if ( COMMAND_COMPLETE_EVENT(packet, hci_write_authentication_enable) ) { - bt_send_cmd(&hci_write_class_of_device, 0x2540); + if ( COMMAND_COMPLETE_EVENT(packet, hci_write_class_of_device) ) { + printf("Ready\n"); } default: // other event diff --git a/example/l2cap-throughput.c b/example/l2cap-throughput.c index eb691bcae..8b0a1b346 100644 --- a/example/l2cap-throughput.c +++ b/example/l2cap-throughput.c @@ -106,16 +106,13 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint run_loop_set_timer(&timer, 3000); // run_loop_add_timer(&timer); } else { - bt_send_cmd(&hci_write_authentication_enable, 0); + bt_send_cmd(&hci_write_class_of_device, 0x38010c); } } break; case HCI_EVENT_COMMAND_COMPLETE: // use pairing yes/no - if ( COMMAND_COMPLETE_EVENT(packet, hci_write_authentication_enable) ) { - bt_send_cmd(&hci_write_class_of_device, 0x38010c); - } if ( COMMAND_COMPLETE_EVENT(packet, hci_write_class_of_device) ) { bt_send_cmd(&l2cap_create_channel_mtu, addr, PSM_TEST, PACKET_SIZE); }