mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-03 23:47:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/avrcp: fix compilation

Browse Source
This commit is contained in:
Matthias Ringwald 2019-03-30 22:13:17 +01:00
parent 62a563bba7
commit 6d80b49579
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ble/sm.c
View File

@ -393,9 +393,6 @@ static const stk_generation_method_t stk_generation_method_with_secure_connectio
#endif #endif
static void sm_run(void); static void sm_run(void);
#ifdef USE_CMAC_ENGINE
static void sm_cmac_message_start(const sm_key_t key, uint16_t message_len, const uint8_t * message, void (*done_callback)(uint8_t * hash));
#endif
static void sm_done_for_handle(hci_con_handle_t con_handle); static void sm_done_for_handle(hci_con_handle_t con_handle);
static sm_connection_t * sm_get_connection_for_handle(hci_con_handle_t con_handle); static sm_connection_t * sm_get_connection_for_handle(hci_con_handle_t con_handle);
static inline int sm_calc_actual_encryption_key_size(int other); static inline int sm_calc_actual_encryption_key_size(int other);
@ -419,6 +416,7 @@ static void sm_handle_encryption_result_rau(void *arg);
static void sm_handle_random_result_ph2_tk(void * arg); static void sm_handle_random_result_ph2_tk(void * arg);
static void sm_handle_random_result_rau(void * arg); static void sm_handle_random_result_rau(void * arg);
#ifdef ENABLE_LE_SECURE_CONNECTIONS #ifdef ENABLE_LE_SECURE_CONNECTIONS
static void sm_cmac_message_start(const sm_key_t key, uint16_t message_len, const uint8_t * message, void (*done_callback)(uint8_t * hash));
static void sm_ec_generate_new_key(void); static void sm_ec_generate_new_key(void);
static void sm_handle_random_result_sc_get_random(void * arg); static void sm_handle_random_result_sc_get_random(void * arg);
static int sm_passkey_entry(stk_generation_method_t method); static int sm_passkey_entry(stk_generation_method_t method);
@ -890,7 +888,9 @@ static void sm_cmac_done_trampoline(void * arg){
int sm_cmac_ready(void){ int sm_cmac_ready(void){
return sm_cmac_active == 0; return sm_cmac_active == 0;
} }
#endif
#ifdef ENABLE_LE_SECURE_CONNECTIONS
// generic cmac calculation // generic cmac calculation
static void sm_cmac_message_start(const sm_key_t key, uint16_t message_len, const uint8_t * message, void (*done_callback)(uint8_t * hash)){ static void sm_cmac_message_start(const sm_key_t key, uint16_t message_len, const uint8_t * message, void (*done_callback)(uint8_t * hash)){
sm_cmac_active = 1; sm_cmac_active = 1;

3
test/avrcp/Makefile
View File

@ -36,6 +36,7 @@ COMMON += \
sm.c \ sm.c \
btstack_crypto.c \ btstack_crypto.c \
uECC.c \ uECC.c \
le_device_db_fs.c \
CFLAGS += -g -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-parameter -Werror CFLAGS += -g -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-parameter -Werror
# -Wstrict-prototypes disabled because of portaudio headers # -Wstrict-prototypes disabled because of portaudio headers
@ -52,11 +53,13 @@ CFLAGS += -I..
VPATH += ${BTSTACK_ROOT}/chipset/zephyr VPATH += ${BTSTACK_ROOT}/chipset/zephyr
VPATH += ${BTSTACK_ROOT}/src VPATH += ${BTSTACK_ROOT}/src
VPATH += ${BTSTACK_ROOT}/src/classic VPATH += ${BTSTACK_ROOT}/src/classic
VPATH += ${BTSTACK_ROOT}/src/ble
VPATH += ${BTSTACK_ROOT}/platform/posix VPATH += ${BTSTACK_ROOT}/platform/posix
VPATH += ${BTSTACK_ROOT}/platform/libusb VPATH += ${BTSTACK_ROOT}/platform/libusb
VPATH += ${BTSTACK_ROOT}/port/libusb VPATH += ${BTSTACK_ROOT}/port/libusb
VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/srce VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/srce
VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/srce VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/srce
VPATH += ${BTSTACK_ROOT}/3rd-party/micro-ecc
# use pkg-config for libusb # use pkg-config for libusb
CFLAGS += $(shell pkg-config libusb-1.0 --cflags) CFLAGS += $(shell pkg-config libusb-1.0 --cflags)