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

Merge branch 'master' of https://github.com/bluekitchen/btstack

Browse Source
This commit is contained in:
Milanka Ringwald 2016-02-18 15:08:37 +01:00
commit 1f8186a719
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sdp_parser.c
View File

@ -263,7 +263,7 @@ void sdp_parser_handle_service_search(uint8_t * data, uint16_t total_count, uint
sdp_query_service_record_handle_event_t service_record_handle_event = {
SDP_QUERY_SERVICE_RECORD_HANDLE,
total_count,
record_counter,
(uint16_t) record_counter,
record_handle
};
(*sdp_query_callback)((sdp_query_event_t*)&service_record_handle_event);

2
test/gatt_client/Makefile
View File

@ -4,7 +4,7 @@ CC = g++
BTSTACK_ROOT = ../..
CFLAGS = -DUNIT_TEST -x c++ -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include
CFLAGS = -DUNIT_TEST -x c++ -g -Wall -Wnarrowing -Wconversion-null -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include
LDFLAGS += -lCppUTest -lCppUTestExt
VPATH += ${BTSTACK_ROOT}/ble

2
test/gatt_client/mock.c
View File

@ -24,7 +24,7 @@ uint16_t get_gatt_client_handle(void){
}
void mock_simulate_command_complete(const hci_cmd_t *cmd){
uint8_t packet[] = {HCI_EVENT_COMMAND_COMPLETE, 4, 1, cmd->opcode & 0xff, cmd->opcode >> 8, 0};
uint8_t packet[] = {HCI_EVENT_COMMAND_COMPLETE, 4, 1, (uint8_t) (cmd->opcode & 0xff), (uint8_t) (cmd->opcode >> 8), 0};
registered_l2cap_packet_handler(NULL, HCI_EVENT_PACKET, NULL, (uint8_t *)&packet, sizeof(packet));
}

2
test/hfp/Makefile
View File

@ -45,7 +45,7 @@ COMMON_OBJ = $(COMMON:.c=.o)
MOCK_OBJ = $(MOCK:.c=.o)
# CC = gcc-fsf-4.9
CFLAGS = -g -Wall -Wmissing-prototype -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
CFLAGS = -g -Wall -Wmissing-prototype -Wnarrowing -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
CFLAGS += -Werror
VPATH += ${BTSTACK_ROOT}/src

3
test/hfp/hfp_ag_parser_test.c
View File

@ -78,8 +78,7 @@ static hfp_connection_t context;
TEST_GROUP(HFPParser){
char packet[200];
int pos;
int offset;
uint16_t pos;
void setup(void){
context.parser_state = HFP_PARSER_CMD_HEADER;