mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-25 16:43:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci_transport: check type of transport config before accessing baud rates

Browse Source
This commit is contained in:
Matthias Ringwald 2016-01-07 10:18:04 +01:00
parent 9796ebea28
commit 2b5067ded8
4 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chipset/csr/bt_control_csr.c
View File

@ -74,14 +74,20 @@ static int bt_control_csr_on(void *config){
} }
// set requested baud rate // set requested baud rate
static void bt_control_csr_update_command(hci_transport_config_uart_t *config, uint8_t *hci_cmd_buffer){ static void bt_control_csr_update_command(void *config, uint8_t *hci_cmd_buffer){
uint16_t varid = READ_BT_16(hci_cmd_buffer, 10); uint16_t varid = READ_BT_16(hci_cmd_buffer, 10);
if (varid != 0x7003) return; if (varid != 0x7003) return;
uint16_t key = READ_BT_16(hci_cmd_buffer, 14); uint16_t key = READ_BT_16(hci_cmd_buffer, 14);
if (key != 0x01ea) return; if (key != 0x01ea) return;
uint32_t baudrate = config->baudrate_main;
// check for hci_transport_config_uart_t
if (!config) return;
if (((hci_transport_config_t*))->type != HCI_TRANSPORT_CONFIG_UART) return;
hci_transport_config_uart_t * hci_transport_config_uart = (hci_transport_config_uart_t*) config;
uint32_t baudrate = hci_transport_config_uart->baudrate_main;
if (baudrate == 0){ if (baudrate == 0){
baudrate = config->baudrate_init; baudrate = hci_transport_config_uart->baudrate_init;
} }
// uint32_t is stored as 2 x uint16_t with most important 16 bits first // uint32_t is stored as 2 x uint16_t with most important 16 bits first
bt_store_16(hci_cmd_buffer, 20, baudrate >> 16); bt_store_16(hci_cmd_buffer, 20, baudrate >> 16);
@ -104,7 +110,7 @@ static int bt_control_csr_next_cmd(void *config, uint8_t *hci_cmd_buffer){
memcpy(&hci_cmd_buffer[3], (uint8_t *) &init_script[init_script_offset], payload_len); memcpy(&hci_cmd_buffer[3], (uint8_t *) &init_script[init_script_offset], payload_len);
// support for on-the-fly configuration updates // support for on-the-fly configuration updates
bt_control_csr_update_command((hci_transport_config_uart_t*)config, hci_cmd_buffer); bt_control_csr_update_command(config, hci_cmd_buffer);
init_script_offset += payload_len; init_script_offset += payload_len;

13
platform/posix/src/hci_transport_h4.c
View File

@ -63,7 +63,6 @@
static int h4_process(struct data_source *ds); static int h4_process(struct data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size); static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size);
static hci_transport_config_uart_t *hci_transport_config_uart;
typedef enum { typedef enum {
H4_W4_PACKET_TYPE, H4_W4_PACKET_TYPE,
@ -133,6 +132,18 @@ static int h4_set_baudrate(uint32_t baudrate){
} }
static int h4_open(void *transport_config){ static int h4_open(void *transport_config){
// check for hci_transport_config_uart_t
if (!transport_config) {
log_error("hci_transport_h4_posix: no config!");
return -1;
}
if (((hci_transport_config_t*)transport_config)->type != HCI_TRANSPORT_CONFIG_UART) {
log_error("hci_transport_h4_posix: config not of type != HCI_TRANSPORT_CONFIG_UART!");
return -1;
}
hci_transport_config_uart_t * hci_transport_config_uart = (hci_transport_config_uart_t*) transport_config;
hci_transport_config_uart = (hci_transport_config_uart_t*) transport_config; hci_transport_config_uart = (hci_transport_config_uart_t*) transport_config;
struct termios toptions; struct termios toptions;
int flags = O_RDWR | O_NOCTTY | O_NONBLOCK; int flags = O_RDWR | O_NOCTTY | O_NONBLOCK;

11
platform/posix/src/hci_transport_h5.c
View File

@ -81,12 +81,21 @@ static hci_transport_h5_t * hci_transport_h5 = NULL;
static int h5_process(struct data_source *ds); static int h5_process(struct data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, int size); static void dummy_handler(uint8_t packet_type, uint8_t *packet, int size);
static hci_transport_config_uart_t *hci_transport_config_uart;
static void (*packet_handler)(uint8_t packet_type, uint8_t *packet, int size) = dummy_handler; static void (*packet_handler)(uint8_t packet_type, uint8_t *packet, int size) = dummy_handler;
// prototypes // prototypes
static int h5_open(void *transport_config){ static int h5_open(void *transport_config){
// check for hci_transport_config_uart_t
if (!transport_config) {
log_error("hci_transport_h5_posix: no config!");
return -1;
}
if (((hci_transport_config_t*)transport_config)->type != HCI_TRANSPORT_CONFIG_UART) {
log_error("hci_transport_h5_posix: config not of type != HCI_TRANSPORT_CONFIG_UART!");
return -1;
}
hci_transport_config_uart = (hci_transport_config_uart_t*) transport_config; hci_transport_config_uart = (hci_transport_config_uart_t*) transport_config;
struct termios toptions; struct termios toptions;
int fd = open(hci_transport_config_uart->device_name, O_RDWR | O_NOCTTY | O_NDELAY); int fd = open(hci_transport_config_uart->device_name, O_RDWR | O_NOCTTY | O_NDELAY);

10
port/ios/src/bt_control_iphone.m
View File

@ -454,6 +454,16 @@ static int iphone_on (void *transport_config){
int err = 0; int err = 0;
// check for hci_transport_config_uart_t
if (!transport_config) {
log_error("hci_transport_h5_posix: no config!");
return -1;
}
if (((hci_transport_config_t *)transport_config)->type != HCI_TRANSPORT_CONFIG_UART) {
log_error("hci_transport_h5_posix: config not of type != HCI_TRANSPORT_CONFIG_UART!";
return -1;
}
hci_transport_config_uart_t * hci_transport_config_uart = (hci_transport_config_uart_t*) transport_config; hci_transport_config_uart_t * hci_transport_config_uart = (hci_transport_config_uart_t*) transport_config;
// get local-mac-addr and transport-speed from IORegistry // get local-mac-addr and transport-speed from IORegistry