From 3299daa2379e05b73def0ad129ae8f248a7a166f Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Thu, 21 May 2015 22:08:14 +0200 Subject: [PATCH] fix warnings caused by newly 4-byte aligned sdp service buffer --- example/daemon/rfcomm-echo.c | 2 +- example/daemon/rfcomm-test.c | 2 +- example/embedded/classic_test.c | 16 ++++++++-------- example/embedded/spp_and_le_counter.c | 6 +++--- example/embedded/spp_counter.c | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/example/daemon/rfcomm-echo.c b/example/daemon/rfcomm-echo.c index 4a18e5971..204906afb 100644 --- a/example/daemon/rfcomm-echo.c +++ b/example/daemon/rfcomm-echo.c @@ -101,7 +101,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint case RFCOMM_EVENT_SERVICE_REGISTERED: printf("RFCOMM_EVENT_SERVICE_REGISTERED channel: %u, status: 0x%02x\n", packet[3], packet[2]); // register SDP for our SPP - sdp_create_spp_service(service_buffer, rfcomm_channel_nr, "SPP ECHO"); + sdp_create_spp_service((uint8_t*)service_buffer, rfcomm_channel_nr, "SPP ECHO"); bt_send_cmd(&sdp_register_service_record, service_buffer); bt_send_cmd(&btstack_set_discoverable, 1); break; diff --git a/example/daemon/rfcomm-test.c b/example/daemon/rfcomm-test.c index 4b90eba92..8a45c2d8b 100644 --- a/example/daemon/rfcomm-test.c +++ b/example/daemon/rfcomm-test.c @@ -117,7 +117,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint printf("RFCOMM_EVENT_SERVICE_REGISTERED\n"); rfcomm_channel_nr = packet[3]; // register SDP for our SPP - sdp_create_spp_service( spp_service_buffer, rfcomm_channel_nr, "RFCOMM Test"); + sdp_create_spp_service((uint8_t*) spp_service_buffer, rfcomm_channel_nr, "RFCOMM Test"); bt_send_cmd(&sdp_register_service_record, spp_service_buffer); bt_send_cmd(&btstack_set_discoverable, 1); break; diff --git a/example/embedded/classic_test.c b/example/embedded/classic_test.c index 6f11f0958..3a757939e 100644 --- a/example/embedded/classic_test.c +++ b/example/embedded/classic_test.c @@ -802,15 +802,15 @@ int btstack_main(int argc, const char * argv[]){ // init SDP, create record for SPP and register with SDP sdp_init(); memset(spp_service_buffer, 0, sizeof(spp_service_buffer)); - sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); - de_dump_data_element(spp_service_buffer); - printf("SDP service record size: %u\n\r", de_get_len(spp_service_buffer)); - sdp_register_service_internal(NULL, spp_service_buffer); + sdp_create_spp_service((uint8_t*) spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); + de_dump_data_element((uint8_t*) spp_service_buffer); + printf("SDP service record size: %u\n\r", de_get_len((uint8_t*)spp_service_buffer)); + sdp_register_service_internal(NULL, (uint8_t*)spp_service_buffer); memset(dummy_service_buffer, 0, sizeof(dummy_service_buffer)); - sdp_create_dummy_service(dummy_service_buffer, "UUID128 Test"); - de_dump_data_element(dummy_service_buffer); - printf("Dummy service record size: %u\n\r", de_get_len(dummy_service_buffer)); - sdp_register_service_internal(NULL, dummy_service_buffer); + sdp_create_dummy_service((uint8_t*)dummy_service_buffer, "UUID128 Test"); + de_dump_data_element((uint8_t*)dummy_service_buffer); + printf("Dummy service record size: %u\n\r", de_get_len((uint8_t*)dummy_service_buffer)); + sdp_register_service_internal(NULL, (uint8_t*)dummy_service_buffer); sdp_query_rfcomm_register_callback(handle_query_rfcomm_event, NULL); diff --git a/example/embedded/spp_and_le_counter.c b/example/embedded/spp_and_le_counter.c index b9dd70717..333457a9c 100644 --- a/example/embedded/spp_and_le_counter.c +++ b/example/embedded/spp_and_le_counter.c @@ -314,9 +314,9 @@ int btstack_main(void) sdp_register_service_internal(NULL, service_record_item); /* LISTING_PAUSE */ #else - sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); - printf("SDP service record size: %u\n", de_get_len(spp_service_buffer)); - sdp_register_service_internal(NULL, spp_service_buffer); + sdp_create_spp_service( (uint8_t*)spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); + printf("SDP service record size: %u\n", de_get_len((uint8_t*)spp_service_buffer)); + sdp_register_service_internal(NULL, (uint8_t*)spp_service_buffer); #endif /* LISTING_RESUME */ diff --git a/example/embedded/spp_counter.c b/example/embedded/spp_counter.c index 8e8438239..70a37d127 100644 --- a/example/embedded/spp_counter.c +++ b/example/embedded/spp_counter.c @@ -109,9 +109,9 @@ void spp_service_setup(void){ sdp_register_service_internal(NULL, service_record_item); /* LISTING_PAUSE */ #else - sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); - printf("SDP service record size: %u\n", de_get_len(spp_service_buffer)); - sdp_register_service_internal(NULL, spp_service_buffer); + sdp_create_spp_service( (uint8_t*) spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); + printf("SDP service record size: %u\n", de_get_len((uint8_t*) spp_service_buffer)); + sdp_register_service_internal(NULL, (uint8_t*)spp_service_buffer); #endif /* LISTING_RESUME */ }