mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-07 15:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation

Browse Source
This commit is contained in:
Matthias Ringwald 2019-03-30 21:30:47 +01:00
parent d2e78ccc37
commit 489a58de68
6 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ble/sm.c
View File

@ -3972,8 +3972,7 @@ void sm_request_pairing(hci_con_handle_t con_handle){
case IRK_LOOKUP_SUCCEEDED:
#ifndef ENABLE_LE_CENTRAL_AUTO_ENCRYPTION
le_device_db_encryption_get(sm_conn->sm_le_db_index, NULL, NULL, ltk, NULL, NULL, NULL, NULL);
int have_ltk = !sm_is_null_key(ltk);
log_info("have ltk %u", have_ltk);
log_info("have ltk %u", !sm_is_null_key(ltk));
// trigger 'pairing complete' event on encryption change
sm_conn->sm_pairing_requested = 1;
sm_conn->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK;

6
test/avrcp/Makefile
View File

@ -31,10 +31,15 @@ COMMON += \
sdp_server.c \
sdp_client.c \
sdp_util.c \
btstack_chipset_zephyr.c \
wav_util.c \
sm.c \
btstack_crypto.c \
uECC.c \
CFLAGS += -g -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-parameter -Werror
# -Wstrict-prototypes disabled because of portaudio headers
CFLAGS += -I${BTSTACK_ROOT}/chipset/zephyr
CFLAGS += -I${BTSTACK_ROOT}/src
CFLAGS += -I${BTSTACK_ROOT}/src/classic
CFLAGS += -I${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/include -D OI_DEBUG
@ -44,6 +49,7 @@ CFLAGS += -I${BTSTACK_ROOT}/platform/posix
CFLAGS += -I${BTSTACK_ROOT}/platform/embedded
CFLAGS += -I..
VPATH += ${BTSTACK_ROOT}/chipset/zephyr
VPATH += ${BTSTACK_ROOT}/src
VPATH += ${BTSTACK_ROOT}/src/classic
VPATH += ${BTSTACK_ROOT}/platform/posix

17
test/gatt_client/Makefile
View File

@ -13,18 +13,17 @@ VPATH += ${BTSTACK_ROOT}/platform/posix
COMMON = \
ad_parser.c \
att_db.c \
att_dispatch.c \
btstack_linked_list.c \
btstack_memory.c \
att_db.c \
att_dispatch.c \
btstack_linked_list.c \
btstack_memory.c \
btstack_memory_pool.c \
btstack_util.c \
gatt_client.c \
hci_cmd.c \
hci_dump.c \
hci_cmd.c \
hci_dump.c \
le_device_db_memory.c \
btstack_memory_pool.c \
mock.c \
btstack_util.c \
COMMON_OBJ = $(COMMON:.c=.o)

5
test/gatt_client/mock.c
View File

@ -54,6 +54,11 @@ uint8_t gap_connect(bd_addr_t addr, bd_addr_type_t addr_type){
void gap_set_scan_parameters(uint8_t scan_type, uint16_t scan_interval, uint16_t scan_window){
}
int gap_reconnect_security_setup_active(hci_con_handle_t con_handle){
UNUSED(con_handle);
return 0;
}
static void att_init_connection(att_connection_t * att_connection){
att_connection->mtu = 23;
att_connection->max_mtu = 23;

3
test/security_manager/Makefile
View File

@ -32,7 +32,8 @@ COMMON = \
rijndael.c \
sm.c \
btstack_util.c \
btstack_tlv.c \
COMMON_OBJ = $(COMMON:.c=.o)
MBEDTLS = \

4
test/security_manager/mock.c
View File

@ -127,6 +127,10 @@ void gap_local_bd_addr(bd_addr_t address_buffer){
address_buffer[i] = 0x11 * (i+1);
}
}
void hci_halting_defer(void){
}
int hci_can_send_command_packet_now(void){
return 1;
}