mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-18 14:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/bluekitchen/btstack into develop

Browse Source
This commit is contained in:
Matthias Ringwald 2016-04-01 12:36:44 +02:00
commit 000580bcf9
44 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual/docs/profiles.md
View File

@ -62,7 +62,7 @@ Extended Inquiry Result (EIR). A code snippet is shown in Listing
void print_inquiry_results(uint8_t *packet){ void print_inquiry_results(uint8_t *packet){
int event = packet[0]; int event = packet[0];
int numResponses = packet[2]; int numResponses = hci_event_inquiry_result_get_num_responses(packet);
uint16_t classOfDevice, clockOffset; uint16_t classOfDevice, clockOffset;
uint8_t rssi, pageScanRepetitionMode; uint8_t rssi, pageScanRepetitionMode;
for (i=0; i<numResponses; i++){ for (i=0; i<numResponses; i++){

2
doc/manual/docs/protocols.md
View File

@ -631,7 +631,7 @@ registered callback, as shown in Listing [below](#lst:SDPClientRFCOMM).
switch (event) { switch (event) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
sdp_client_query_rfcomm_channel_and_name_for_uuid(remote, 0x0003); sdp_client_query_rfcomm_channel_and_name_for_uuid(remote, 0x0003);
} }
break; break;

2
example/gap_dedicated_bonding.c
View File

@ -54,7 +54,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
gap_dedicated_bonding(remote, 1); gap_dedicated_bonding(remote, 1);
} }
break; break;

4
example/gap_inquiry.c
View File

@ -145,7 +145,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case INIT: case INIT:
switch(event){ switch(event){
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
start_scan(); start_scan();
state = ACTIVE; state = ACTIVE;
} }
@ -170,7 +170,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
reverse_bd_addr(&packet[3 + i * 6], addr); reverse_bd_addr(&packet[3 + i * 6], addr);
index = getDeviceIndexForAddress(addr); index = getDeviceIndexForAddress(addr);

4
example/gap_inquiry_and_bond.c
View File

@ -130,7 +130,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
case INIT: case INIT:
switch(event){ switch(event){
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
hci_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI hci_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI
state = W4_INQUIRY_MODE_COMPLETE; state = W4_INQUIRY_MODE_COMPLETE;
} }
@ -151,7 +151,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{ case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
int offset = 3; int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
reverse_bd_addr(&packet[offset], addr); reverse_bd_addr(&packet[offset], addr);

2
example/gap_le_advertisements.c
View File

@ -235,7 +235,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// BTstack activated, get started // BTstack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack activated, start scaning!\n"); printf("BTstack activated, start scaning!\n");
gap_set_scan_parameters(0,0x0030, 0x0030); gap_set_scan_parameters(0,0x0030, 0x0030);
gap_start_scan(); gap_start_scan();

3
example/hfp_ag_demo.c
View File

@ -186,7 +186,7 @@ static void inquiry_packet_handler (uint8_t packet_type, uint8_t *packet, uint16
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{ case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
int offset = 3; int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
reverse_bd_addr(addr, &packet[offset]); reverse_bd_addr(addr, &packet[offset]);
@ -679,3 +679,4 @@ int btstack_main(int argc, const char * argv[]){
return 0; return 0;
} }
/* LISTING_END */ /* LISTING_END */
/* EXAMPLE_END */

1
example/hfp_hf_demo.c
View File

@ -542,3 +542,4 @@ int btstack_main(int argc, const char * argv[]){
return 0; return 0;
} }
/* LISTING_END */ /* LISTING_END */
/* EXAMPLE_END */

1
example/hsp_ag_demo.c
View File

@ -343,3 +343,4 @@ int btstack_main(int argc, const char * argv[]){
return 0; return 0;
} }
/* LISTING_END */ /* LISTING_END */
/* EXAMPLE_END */

1
example/hsp_hs_demo.c
View File

@ -352,3 +352,4 @@ int btstack_main(int argc, const char * argv[]){
return 0; return 0;
} }
/* LISTING_END */ /* LISTING_END */
/* EXAMPLE_END */

2
example/le_counter.c
View File

@ -130,7 +130,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("LE Counter Demo ready.\n"); printf("LE Counter Demo ready.\n");
beat(); beat();
} }

2
example/panu_demo.c
View File

@ -441,7 +441,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
* is received and the example is started in client mode, the remote SDP BNEP query is started. * is received and the example is started in client mode, the remote SDP BNEP query is started.
*/ */
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("Start SDP BNEP query.\n"); printf("Start SDP BNEP query.\n");
sdp_client_query_uuid16(&handle_sdp_client_query_result, remote, SDP_BNEPProtocol); sdp_client_query_uuid16(&handle_sdp_client_query_result, remote, SDP_BNEPProtocol);
} }

2
example/sdp_bnep_query.c
View File

@ -118,7 +118,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (event) { switch (event) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// BTstack activated, get started // BTstack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("Start SDP BNEP query.\n"); printf("Start SDP BNEP query.\n");
sdp_client_query_uuid16(&handle_sdp_client_query_result, remote, SDP_BNEPProtocol); sdp_client_query_uuid16(&handle_sdp_client_query_result, remote, SDP_BNEPProtocol);
} }

2
example/sdp_general_query.c
View File

@ -112,7 +112,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (event) { switch (event) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
sdp_client_query_uuid16(&handle_sdp_client_query_result, remote, SDP_PublicBrowseGroup); sdp_client_query_uuid16(&handle_sdp_client_query_result, remote, SDP_PublicBrowseGroup);
} }
break; break;

2
example/sdp_rfcomm_query.c
View File

@ -77,7 +77,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch (event) { switch (event) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
sdp_client_query_rfcomm_channel_and_name_for_uuid(&handle_query_rfcomm_event, remote, SDP_PublicBrowseGroup); sdp_client_query_rfcomm_channel_and_name_for_uuid(&handle_query_rfcomm_event, remote, SDP_PublicBrowseGroup);
} }
break; break;

2
example/spp_counter.c
View File

@ -181,7 +181,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// BTstack activated, get started // BTstack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack is up and running\n"); printf("BTstack is up and running\n");
} }
break; break;

2
example/spp_flowcontrol.c
View File

@ -139,7 +139,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack is up and running\n"); printf("BTstack is up and running\n");
} }
break; break;

2
example/spp_streamer.c
View File

@ -155,7 +155,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (event) { switch (event) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("SDP Query for RFCOMM services on %s started\n", bd_addr_to_str(remote)); printf("SDP Query for RFCOMM services on %s started\n", bd_addr_to_str(remote));
sdp_client_query_rfcomm_channel_and_name_for_uuid(&handle_query_rfcomm_event, remote, SDP_PublicBrowseGroup); sdp_client_query_rfcomm_channel_and_name_for_uuid(&handle_query_rfcomm_event, remote, SDP_PublicBrowseGroup);
} }

4
platform/daemon/example/inquiry.c
View File

@ -119,7 +119,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch(state){ switch(state){
case INIT: case INIT:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
bt_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI bt_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI
state = W4_INQUIRY_MODE_COMPLETE; state = W4_INQUIRY_MODE_COMPLETE;
} }
@ -150,7 +150,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{ case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
int offset = 3; int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
reverse_bd_addr(&packet[offset], addr); reverse_bd_addr(&packet[offset], addr);

2
platform/daemon/example/l2cap_server.c
View File

@ -88,7 +88,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
bt_send_cmd(&hci_write_class_of_device, 0x2540); bt_send_cmd(&hci_write_class_of_device, 0x2540);
} }
break; break;

2
platform/daemon/example/l2cap_throughput.c
View File

@ -103,7 +103,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
if (serverMode) { if (serverMode) {
printf("Waiting for incoming L2CAP connection on PSM %04x...\n", PSM_TEST); printf("Waiting for incoming L2CAP connection on PSM %04x...\n", PSM_TEST);
timer.process = timer_handler; timer.process = timer_handler;

2
platform/daemon/example/le_scan.c
View File

@ -57,7 +57,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
printf("- btstack state %u\n", packet[2]); printf("- btstack state %u\n", packet[2]);
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
bt_send_cmd(&gap_le_set_scan_parameters, 1, 0x30, 0x30); bt_send_cmd(&gap_le_set_scan_parameters, 1, 0x30, 0x30);
bt_send_cmd(&gap_le_scan_start); bt_send_cmd(&gap_le_scan_start);
} }

2
platform/daemon/example/rfcomm_cat.c
View File

@ -86,7 +86,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
bt_send_cmd(&rfcomm_create_channel_cmd, addr, rfcomm_channel); bt_send_cmd(&rfcomm_create_channel_cmd, addr, rfcomm_channel);
} }
break; break;

2
platform/daemon/example/rfcomm_echo.c
View File

@ -86,7 +86,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
// get persistent RFCOMM channel // get persistent RFCOMM channel
printf("HCI_STATE_WORKING\n"); printf("HCI_STATE_WORKING\n");
bt_send_cmd(&rfcomm_persistent_channel_for_service_cmd, "ch.ringwald.btstack.rfcomm_echo2"); bt_send_cmd(&rfcomm_persistent_channel_for_service_cmd, "ch.ringwald.btstack.rfcomm_echo2");

2
platform/daemon/example/rfcomm_test.c
View File

@ -101,7 +101,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
// get persistent RFCOMM channel // get persistent RFCOMM channel
printf("HCI_STATE_WORKING\n"); printf("HCI_STATE_WORKING\n");
bt_send_cmd(&rfcomm_persistent_channel_for_service_cmd, "ch.ringwald.btstack.rfcomm_test"); bt_send_cmd(&rfcomm_persistent_channel_for_service_cmd, "ch.ringwald.btstack.rfcomm_test");

2
platform/daemon/example/test.c
View File

@ -71,7 +71,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
uint8_t des_serviceSearchPattern[5] = {0x35, 0x03, 0x19, 0x10, 0x02}; uint8_t des_serviceSearchPattern[5] = {0x35, 0x03, 0x19, 0x10, 0x02};
bt_send_cmd(&sdp_client_query_rfcomm_services_cmd, addr, des_serviceSearchPattern); bt_send_cmd(&sdp_client_query_rfcomm_services_cmd, addr, des_serviceSearchPattern);
} }

2
port/arduino/BTstack.cpp
View File

@ -139,7 +139,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
btstack_state = packet[2]; btstack_state = packet[2];
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
le_peripheral_todos |= SET_ADVERTISEMENT_PARAMS le_peripheral_todos |= SET_ADVERTISEMENT_PARAMS
| SET_ADVERTISEMENT_DATA | SET_ADVERTISEMENT_DATA
| SET_ADVERTISEMENT_ENABLED; | SET_ADVERTISEMENT_ENABLED;

2
port/ez430-rf2560/example/ant_test.c
View File

@ -94,7 +94,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack is up and running\n"); printf("BTstack is up and running\n");
// start ANT init // start ANT init
ant_send_cmd(&ant_reset); ant_send_cmd(&ant_reset);

2
port/ez430-rf2560/example/spp_accel.c
View File

@ -133,7 +133,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack is up and running\n"); printf("BTstack is up and running\n");
} }
break; break;

2
port/ios/CocoaTouch/src/BTInquiryViewController.m
View File

@ -156,7 +156,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:
{ {
int numResponses = packet[2]; int numResponses = hci_event_inquiry_result_get_num_responses(packet);
int i; int i;
int offset = 3; int offset = 3;
for (i=0; i<numResponses;i++){ for (i=0; i<numResponses;i++){

6
port/ios/CocoaTouch/src/BTstackManager.m
View File

@ -291,7 +291,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case kW4Activated: case kW4Activated:
switch (hci_event_packet_get_type(packet)){ switch (hci_event_packet_get_type(packet)){
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
state = kActivated; state = kActivated;
[self sendActivated]; [self sendActivated];
} }
@ -414,7 +414,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch (hci_event_packet_get_type(packet)){ switch (hci_event_packet_get_type(packet)){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
for (i=0; i<numResponses ; i++){ for (i=0; i<numResponses ; i++){
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[3+i*6]);
// NSLog(@"found %@", [BTDevice stringForAddress:addr]); // NSLog(@"found %@", [BTDevice stringForAddress:addr]);
@ -434,7 +434,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
break; break;
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{ case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
int offset = 3; int offset = 3;
for (i=0; i<numResponses ;i++){ for (i=0; i<numResponses ;i++){
bt_flip_addr(addr, &packet[offset]); bt_flip_addr(addr, &packet[offset]);

2
port/msp-exp430f5438-cc2564b/example/ant_test.c
View File

@ -93,7 +93,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack is up and running\n"); printf("BTstack is up and running\n");
// start ANT init // start ANT init
ant_send_cmd(&ant_reset); ant_send_cmd(&ant_reset);

2
port/msp-exp430f5438-cc2564b/example/ble_server.c
View File

@ -107,7 +107,7 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name // bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("Working!\n"); printf("Working!\n");
hci_send_cmd(&hci_le_set_advertising_data, sizeof(adv_data), adv_data); hci_send_cmd(&hci_le_set_advertising_data, sizeof(adv_data), adv_data);
} }

2
port/msp-exp430f5438-cc2564b/example/hid_demo.c
View File

@ -281,7 +281,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name // bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printLine("Inquiry"); printLine("Inquiry");
state = inquiry; state = inquiry;
hci_send_cmd(&hci_inquiry, HCI_INQUIRY_LAP, INQUIRY_INTERVAL, 0); hci_send_cmd(&hci_inquiry, HCI_INQUIRY_LAP, INQUIRY_INTERVAL, 0);

2
port/msp-exp430f5438-cc2564b/example/spp_accel.c
View File

@ -134,7 +134,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack is up and running.\n"); printf("BTstack is up and running.\n");
} }
break; break;

2
port/msp430f5229lp-cc2564b/example/ble_server.c
View File

@ -83,7 +83,7 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name // bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("Working!\n"); printf("Working!\n");
hci_send_cmd(&hci_le_set_advertising_data, sizeof(adv_data), adv_data); hci_send_cmd(&hci_le_set_advertising_data, sizeof(adv_data), adv_data);
} }

2
src/ble/sm.c
View File

@ -1839,7 +1839,7 @@ static void sm_event_packet_handler (uint8_t packet_type, uint16_t channel, uint
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
log_info("HCI Working!"); log_info("HCI Working!");
dkg_state = sm_persistent_irk_ready ? DKG_CALC_DHK : DKG_CALC_IRK; dkg_state = sm_persistent_irk_ready ? DKG_CALC_DHK : DKG_CALC_IRK;
rau_state = RAU_IDLE; rau_state = RAU_IDLE;

2
test/pts/ble_central_test.c
View File

@ -331,7 +331,7 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("Central test ready\n"); printf("Central test ready\n");
show_usage(); show_usage();
gap_run(); gap_run();

2
test/pts/ble_peripheral_test.c
View File

@ -549,7 +549,7 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("SM Init completed\n"); printf("SM Init completed\n");
todos = SET_ADVERTISEMENT_PARAMS | SET_ADVERTISEMENT_DATA | SET_SCAN_RESPONSE_DATA | ENABLE_ADVERTISEMENTS; todos = SET_ADVERTISEMENT_PARAMS | SET_ADVERTISEMENT_DATA | SET_SCAN_RESPONSE_DATA | ENABLE_ADVERTISEMENTS;
update_advertisements(); update_advertisements();

2
test/pts/bnep_test.c
View File

@ -682,7 +682,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
switch (event) { switch (event) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
/* BT Stack activated, get started */ /* BT Stack activated, get started */
if (packet[2] == HCI_STATE_WORKING) { if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BNEP Test ready\n"); printf("BNEP Test ready\n");
show_usage(); show_usage();
} }

4
test/pts/classic_test.c
View File

@ -192,7 +192,7 @@ static void inquiry_packet_handler (uint8_t packet_type, uint8_t *packet, uint16
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{ case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
int offset = 3; int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
reverse_bd_addr(&packet[offset], addr); reverse_bd_addr(&packet[offset], addr);
@ -285,7 +285,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack Bluetooth Classic Test Ready\n"); printf("BTstack Bluetooth Classic Test Ready\n");
hci_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI hci_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI
show_usage(); show_usage();

2
test/pts/hfp_ag_test.c
View File

@ -194,7 +194,7 @@ static void inquiry_packet_handler (uint8_t packet_type, uint8_t *packet, uint16
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{ case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = hci_event_inquiry_result_get_num_responses(packet);
int offset = 3; int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
reverse_bd_addr(&packet[offset], addr); reverse_bd_addr(&packet[offset], addr);

2
test/pts/hfp_test.c
View File

@ -105,7 +105,7 @@ static void packet_handler(void * connection, uint8_t packet_type, uint16_t chan
switch (event) { switch (event) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("Start SDP RFCOMM Query for UUID 0x%02x\n", SDP_Handsfree); printf("Start SDP RFCOMM Query for UUID 0x%02x\n", SDP_Handsfree);
sdp_client_query_rfcomm_channel_and_name_for_uuid(&handle_query_rfcomm_event, remote, SDP_Handsfree); sdp_client_query_rfcomm_channel_and_name_for_uuid(&handle_query_rfcomm_event, remote, SDP_Handsfree);
} }

2
test/pts/l2cap_test.c
View File

@ -79,7 +79,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch (packet[0]) { switch (packet[0]) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started // bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){ if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
printf("BTstack L2CAP Test Ready\n"); printf("BTstack L2CAP Test Ready\n");
show_usage(); show_usage();
} }