mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-29 21:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto-pts: set AD-Flags based on discoverable type

Browse Source
This commit is contained in:
Matthias Ringwald 2019-11-07 12:05:36 +01:00
parent f0e3106b0c
commit 8372d94edd
2 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/auto-pts/btp.h
View File

@ -107,6 +107,11 @@ extern "C" {
#define BTP_GAP_OP_SET_POWERED 0x05
#define BTP_GAP_OP_SET_CONNECTABLE 0x06
#define BTP_GAP_OP_SET_FAST_CONNECTABLE 0x07
#define BTP_GAP_DISCOVERABLE_NON 0x00
#define BTP_GAP_DISCOVERABLE_GENERAL 0x01
#define BTP_GAP_DISCOVERABLE_LIMITED 0x02
#define BTP_GAP_OP_SET_DISCOVERABLE 0x08
#define BTP_GAP_OP_SET_BONDABLE 0x09
#define BTP_GAP_OP_START_ADVERTISING 0x0a

64
test/auto-pts/btpclient.c
View File

@ -56,8 +56,11 @@
#define AUTOPTS_SOCKET_NAME "/tmp/bt-stack-tester"
int btstack_main(int argc, const char * argv[]);
#define BT_LE_AD_LIMITED (1U << 0)
#define BT_LE_AD_GENERAL (1U << 1)
#define BT_LE_AD_NO_BREDR (1U << 2)
int btstack_main(int argc, const char * argv[]);
static btstack_packet_callback_registration_t hci_event_callback_registration;
static bool gap_send_powered_state;
@ -66,6 +69,7 @@ static char gap_short_name[11];
static uint32_t gap_cod;
// gap_adv_data_len/gap_scan_response is 16-bit to simplify bounds calculation
static uint8_t ad_flags;
static uint8_t gap_adv_data[31];
static uint16_t gap_adv_data_len;
static uint8_t gap_scan_response[31];
@ -103,6 +107,24 @@ static void btp_send_gap_settings(uint8_t opcode){
btp_send(BTP_SERVICE_ID_GAP, opcode, 0, 4, buffer);
}
static void reset_gap(void){
// current settings
current_settings |= BTP_GAP_SETTING_SSP;
current_settings |= BTP_GAP_SETTING_LE;
current_settings |= BTP_GAP_SETTING_PRIVACY;
#ifdef ENABLE_CLASSIC
current_settings |= BTP_GAP_SETTING_BREDR;
#endif
#ifdef ENABLE_BLE
#endif
#ifdef ENABLE_LE_SECURE_CONNECTIONS
current_settings |= BTP_GAP_SETTING_SC;
#endif
// TODO: check ENABLE_CLASSIC / Controller features
ad_flags = BT_LE_AD_NO_BREDR;
}
static void btstack_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
UNUSED(channel);
switch (packet_type) {
@ -307,12 +329,26 @@ static void btp_gap_handler(uint8_t opcode, uint8_t controller_index, uint16_t l
MESSAGE("BTP_GAP_OP_SET_DISCOVERABLE");
if (controller_index == 0){
uint8_t discoverable = data[0];
gap_discoverable_control(discoverable);
if (discoverable) {
current_settings |= BTP_GAP_SETTING_DISCOVERABLE;
} else {
current_settings &= ~BTP_GAP_SETTING_DISCOVERABLE;
// Classic
gap_discoverable_control(discoverable > 0);
switch (discoverable) {
case BTP_GAP_DISCOVERABLE_NON:
ad_flags &= ~(BT_LE_AD_GENERAL | BT_LE_AD_LIMITED);
current_settings &= ~BTP_GAP_SETTING_DISCOVERABLE;
break;
case BTP_GAP_DISCOVERABLE_GENERAL:
ad_flags &= ~BT_LE_AD_LIMITED;
ad_flags |= BT_LE_AD_GENERAL;
current_settings |= BTP_GAP_SETTING_DISCOVERABLE;
break;
case BTP_GAP_DISCOVERABLE_LIMITED:
ad_flags &= ~BT_LE_AD_GENERAL;
ad_flags |= BT_LE_AD_LIMITED;
current_settings |= BTP_GAP_SETTING_DISCOVERABLE;
break;
default:
return;
}
btp_send_gap_settings(opcode);
}
@ -345,8 +381,7 @@ static void btp_gap_handler(uint8_t opcode, uint8_t controller_index, uint16_t l
gap_adv_data_len = 0;
gap_adv_data[gap_adv_data_len++] = 0x02;
gap_adv_data[gap_adv_data_len++] = 0x01;
// TODO: calculate flags from connectable/discoverable settings
gap_adv_data[gap_adv_data_len++] = 0x04;
gap_adv_data[gap_adv_data_len++] = ad_flags;
uint8_t ad_pos = 0;
while ((ad_pos + 2) < adv_data_len){
@ -595,18 +630,7 @@ int btstack_main(int argc, const char * argv[])
gap_cod = 0x007a020c; // smartphone
gap_set_class_of_device(gap_cod);
// current settings
current_settings |= BTP_GAP_SETTING_SSP;
current_settings |= BTP_GAP_SETTING_LE;
current_settings |= BTP_GAP_SETTING_PRIVACY;
#ifdef ENABLE_CLASSIC
current_settings |= BTP_GAP_SETTING_BREDR;
#endif
#ifdef ENABLE_BLE
#endif
#ifdef ENABLE_LE_SECURE_CONNECTIONS
current_settings |= BTP_GAP_SETTING_SC;
#endif
reset_gap();
MESSAGE("auto-pts iut-btp-client started");