mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-21 12:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

use DAEMON prefix for daemon events

Browse Source
This commit is contained in:
Matthias Ringwald 2016-02-18 12:24:44 +01:00
parent 023f27646b
commit 827b1c43e5
8 changed files with 80 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/daemon/inquiry.c
View File

@ -201,7 +201,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
start_scan();
break;
case BTSTACK_EVENT_REMOTE_NAME_CACHED:
case DAEMON_EVENT_REMOTE_NAME_CACHED:
reverse_bd_addr(&packet[3], addr);
printf("Cached remote name for %s: '%s'\n", bd_addr_to_str(addr), &packet[9]);
break;

12
platform/daemon/daemon.c
View File

@ -683,9 +683,9 @@ static void daemon_disconnect_client(connection_t * connection){
}
static void hci_emit_btstack_version(void){
log_info("BTSTACK_EVENT_VERSION %u.%u", BTSTACK_MAJOR, BTSTACK_MINOR);
log_info("DAEMON_EVENT_VERSION %u.%u", BTSTACK_MAJOR, BTSTACK_MINOR);
uint8_t event[6];
event[0] = BTSTACK_EVENT_VERSION;
event[0] = DAEMON_EVENT_VERSION;
event[1] = sizeof(event) - 2;
event[2] = BTSTACK_MAJOR;
event[3] = BTSTACK_MINOR;
@ -694,9 +694,9 @@ static void hci_emit_btstack_version(void){
}
static void hci_emit_system_bluetooth_enabled(uint8_t enabled){
log_info("BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED %u", enabled);
log_info("DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED %u", enabled);
uint8_t event[3];
event[0] = BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED;
event[0] = DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED;
event[1] = sizeof(event) - 2;
event[2] = enabled;
hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event));
@ -1559,13 +1559,13 @@ static void daemon_packet_handler(void * connection, uint8_t packet_type, uint16
for (i=0; i<packet[2];i++){
reverse_bd_addr(&packet[offset], addr);
if (btstack_device_name_db->get_name(addr, (device_name_t *) &remote_name_event[9])){
remote_name_event[0] = BTSTACK_EVENT_REMOTE_NAME_CACHED;
remote_name_event[0] = DAEMON_EVENT_REMOTE_NAME_CACHED;
remote_name_event[1] = sizeof(remote_name_event) - 2 - 1;
remote_name_event[2] = 0; // just to be compatible with HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE
reverse_bd_addr(addr, &remote_name_event[3]);
remote_name_event[9+248] = 0; // assert \0 for log_info
log_info("BTSTACK_EVENT_REMOTE_NAME_CACHED %s = '%s'", bd_addr_to_str(addr), &remote_name_event[9]);
log_info("DAEMON_EVENT_REMOTE_NAME_CACHED %s = '%s'", bd_addr_to_str(addr), &remote_name_event[9]);
hci_dump_packet(HCI_EVENT_PACKET, 0, remote_name_event, sizeof(remote_name_event)-1);
daemon_emit_packet(connection, HCI_EVENT_PACKET, channel, remote_name_event, sizeof(remote_name_event) -1);
}

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

@ -263,8 +263,8 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case kW4SysBTState:
case kW4SysBTDisabled:
// BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED
if ( packet[0] == BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED){
// DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED
if ( packet[0] == DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED){
if (packet[2]){
// system bt on - first time try to disable it
if ( state == kW4SysBTState) {
@ -458,7 +458,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
}
break;
}
case BTSTACK_EVENT_REMOTE_NAME_CACHED:
case DAEMON_EVENT_REMOTE_NAME_CACHED:
[self handleRemoteNameCached:packet];
break;

8
port/ios/PrefsBundle/BluetoothController.m
View File

@ -184,9 +184,9 @@ static BluetoothController* sharedInstance = nil;
hci_state = packet[2];
// NSLog(@"new BTSTACK_EVENT_STATE %u", hci_state);
break;
case BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED:
case DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED:
system_bluetooth = packet[2];
// NSLog(@"new BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED %u", system_bluetooth);
// NSLog(@"new DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED %u", system_bluetooth);
break;
default:
break;
@ -205,7 +205,7 @@ static BluetoothController* sharedInstance = nil;
break;
case kW4SystemOffToEnableBTstack:
if (packet[0] == BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED) {
if (packet[0] == DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED) {
if (system_bluetooth == 0){
bt_send_cmd(&btstack_set_power_mode, HCI_POWER_ON);
state = kIdle;
@ -220,7 +220,7 @@ static BluetoothController* sharedInstance = nil;
bt_send_cmd(&btstack_set_system_bluetooth_enabled, 1);
}
}
if (packet[0] == BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED) {
if (packet[0] == DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED) {
if (system_bluetooth == 0){
// NSLog(@"Sending set system bluetooth enable B");
bt_send_cmd(&btstack_set_system_bluetooth_enabled, 1);

79
src/btstack_defines.h
View File

@ -268,24 +268,27 @@ typedef uint8_t sm_key_t[16];
*/
#define BTSTACK_EVENT_POWERON_FAILED 0x62
/**
* @format 1
* @param discoverable
*/
#define BTSTACK_EVENT_DISCOVERABLE_ENABLED 0x66
// Daemon Events
/**
* @format 112
* @param major
* @param minor
@ @param revision
*/
#define BTSTACK_EVENT_VERSION 0x63
#define DAEMON_EVENT_VERSION 0x63
// data: system bluetooth on/off (bool)
#define BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED 0x64
#define DAEMON_EVENT_SYSTEM_BLUETOOTH_ENABLED 0x64
// data: event (8), len(8), status (8) == 0, address (48), name (1984 bits = 248 bytes)
#define BTSTACK_EVENT_REMOTE_NAME_CACHED 0x65
// data: discoverable enabled (bool)
#define BTSTACK_EVENT_DISCOVERABLE_ENABLED 0x66
// Daemon Events used internally
#define DAEMON_EVENT_REMOTE_NAME_CACHED 0x65
// data: event(8)
#define DAEMON_EVENT_CONNECTION_OPENED 0x68
@ -302,6 +305,7 @@ typedef uint8_t sm_key_t[16];
// data: event(8)
#define DAEMON_EVENT_HCI_PACKET_SENT 0x6C
// additional HCI events
/**
* @format B
@ -738,16 +742,59 @@ typedef uint8_t sm_key_t[16];
*/
#define GAP_LE_EVENT_ADVERTISING_REPORT 0xE2
#define HCI_EVENT_HSP_META 0xE8
#define HSP_SUBEVENT_ERROR 0x01
#define HSP_SUBEVENT_AUDIO_CONNECTION_COMPLETE 0x02
#define HSP_SUBEVENT_AUDIO_DISCONNECTION_COMPLETE 0x03
#define HSP_SUBEVENT_RING 0x04
#define HSP_SUBEVENT_MICROPHONE_GAIN_CHANGED 0x05
#define HSP_SUBEVENT_SPEAKER_GAIN_CHANGED 0x06
#define HSP_SUBEVENT_HS_COMMAND 0x07
#define HSP_SUBEVENT_AG_INDICATION 0x08
/**
* @format 11
* @param subevent_code
* @param status 0 == OK
*/
#define HSP_SUBEVENT_AUDIO_CONNECTION_COMPLETE 0x01
/**
* @format 11
* @param subevent_code
* @param status 0 == OK
*/
#define HSP_SUBEVENT_AUDIO_DISCONNECTION_COMPLETE 0x02
/**
* @format 1
* @param subevent_code
*/
#define HSP_SUBEVENT_RING 0x03
/**
* @format 11
* @param subevent_code
* @param gain Valid range: [0,15]
*/
#define HSP_SUBEVENT_MICROPHONE_GAIN_CHANGED 0x04
/**
* @format 11
* @param subevent_code
* @param gain Valid range: [0,15]
*/
#define HSP_SUBEVENT_SPEAKER_GAIN_CHANGED 0x05
/**
* @format 1JV
* @param subevent_code
* @param value_length
* @param value
*/
#define HSP_SUBEVENT_HS_COMMAND 0x06
/**
* @format 1JV
* @param subevent_code
* @param value_length
* @param value
*/
#define HSP_SUBEVENT_AG_INDICATION 0x07
#define HCI_EVENT_HFP_META 0xE9

2
src/classic/hfp.c
View File

@ -637,7 +637,7 @@ void hfp_handle_hci_event(uint8_t packet_type, uint8_t *packet, uint16_t size){
case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:
case HCI_EVENT_INQUIRY_COMPLETE:
case BTSTACK_EVENT_REMOTE_NAME_CACHED:
case DAEMON_EVENT_REMOTE_NAME_CACHED:
case HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE:
// forward inquiry events to app - TODO: replace with new event handler architecture
(*hfp_callback)(packet, size);

2
test/pts/classic_test.c
View File

@ -237,7 +237,7 @@ static void inquiry_packet_handler (uint8_t packet_type, uint8_t *packet, uint16
continue_remote_names();
break;
case BTSTACK_EVENT_REMOTE_NAME_CACHED:
case DAEMON_EVENT_REMOTE_NAME_CACHED:
reverse_bd_addr(&packet[3], addr);
printf("Cached remote name for %s: '%s'\n", bd_addr_to_str(addr), &packet[9]);
break;

2
test/pts/hfp_ag_test.c
View File

@ -241,7 +241,7 @@ static void inquiry_packet_handler (uint8_t packet_type, uint8_t *packet, uint16
continue_remote_names();
break;
case BTSTACK_EVENT_REMOTE_NAME_CACHED:
case DAEMON_EVENT_REMOTE_NAME_CACHED:
reverse_bd_addr(&packet[3], addr);
printf("Cached remote name for %s: '%s'\n", bd_addr_to_str(addr), &packet[9]);
break;