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

fix other warnings

Browse Source
This commit is contained in:
Matthias Ringwald 2022-11-15 21:18:26 +01:00
parent 2490d60885
commit 7fbe4b77ee
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/embedded/hal_flash_bank_memory.c
View File

@ -42,6 +42,7 @@
#include "stdint.h" #include "stdint.h"
#include "string.h" #include "string.h"
#include "inttypes.h"
static uint32_t hal_flash_bank_memory_get_size(void * context){ static uint32_t hal_flash_bank_memory_get_size(void * context){
hal_flash_bank_memory_t * self = (hal_flash_bank_memory_t *) context; hal_flash_bank_memory_t * self = (hal_flash_bank_memory_t *) context;
@ -74,7 +75,7 @@ static void hal_flash_bank_memory_read(void * context, int bank, uint32_t offset
static void hal_flash_bank_memory_write(void * context, int bank, uint32_t offset, const uint8_t * data, uint32_t size){ static void hal_flash_bank_memory_write(void * context, int bank, uint32_t offset, const uint8_t * data, uint32_t size){
hal_flash_bank_memory_t * self = (hal_flash_bank_memory_t *) context; hal_flash_bank_memory_t * self = (hal_flash_bank_memory_t *) context;
log_info("write offset %u, len %u", offset, size); log_info("write offset %" PRIu32", len %" PRIu32, offset, size);
log_info_hexdump(data, size); log_info_hexdump(data, size);
if (bank > 1) return; if (bank > 1) return;
@ -90,7 +91,7 @@ static void hal_flash_bank_memory_write(void * context, int bank, uint32_t offse
} }
// writing something other than 0x00 is only allowed once // writing something other than 0x00 is only allowed once
if (self->banks[bank][offset] != 0xff && data[i] != 0x00){ if (self->banks[bank][offset] != 0xff && data[i] != 0x00){
log_error("Error: offset %u written twice. Data: 0x%02x!", offset+i, data[i]); log_error("Error: offset %" PRIu32 " written twice. Data: 0x%02x!", offset+i, data[i]);
} else { } else {
self->banks[bank][offset++] = data[i]; self->banks[bank][offset++] = data[i];
} }

44
test/classic-oob-pairing/spp_counter.c
View File

@ -20,8 +20,8 @@
* THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BLUEKITCHEN
* RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * GMBH OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
@ -90,6 +90,11 @@ static void spp_service_setup(void){
l2cap_init(); l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
rfcomm_init(); rfcomm_init();
rfcomm_register_service(packet_handler, RFCOMM_SERVER_CHANNEL, 0xffff); // reserved channel, mtu limited by l2cap rfcomm_register_service(packet_handler, RFCOMM_SERVER_CHANNEL, 0xffff); // reserved channel, mtu limited by l2cap
@ -98,6 +103,7 @@ static void spp_service_setup(void){
memset(spp_service_buffer, 0, sizeof(spp_service_buffer)); memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
spp_create_sdp_record(spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter"); spp_create_sdp_record(spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter");
sdp_register_service(spp_service_buffer); sdp_register_service(spp_service_buffer);
printf("SDP service record size: %u\n", de_get_len(spp_service_buffer));
} }
/* LISTING_END */ /* LISTING_END */
@ -114,7 +120,8 @@ static void heartbeat_handler(struct btstack_timer_source *ts){
static int counter = 0; static int counter = 0;
if (rfcomm_channel_id){ if (rfcomm_channel_id){
sprintf(lineBuffer, "BTstack counter %04u\n", ++counter); snprintf(lineBuffer, sizeof(lineBuffer), "BTstack counter %04u\n", ++counter);
printf("%s", lineBuffer);
rfcomm_request_can_send_now_event(rfcomm_channel_id); rfcomm_request_can_send_now_event(rfcomm_channel_id);
} }
@ -174,50 +181,54 @@ static void one_shot_timer_setup(void){
/* LISTING_START(SppServerPacketHandler): SPP Server - Heartbeat Counter over RFCOMM */ /* LISTING_START(SppServerPacketHandler): SPP Server - Heartbeat Counter over RFCOMM */
static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
UNUSED(channel); UNUSED(channel);
UNUSED(size);
/* LISTING_PAUSE */ /* LISTING_PAUSE */
bd_addr_t event_addr; bd_addr_t event_addr;
uint8_t rfcomm_channel_nr;
uint16_t mtu;
int i;
switch (packet_type) { switch (packet_type) {
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
/* LISTING_RESUME */ /* LISTING_RESUME */
case HCI_EVENT_PIN_CODE_REQUEST: case HCI_EVENT_PIN_CODE_REQUEST:
// inform about pin code request // inform about pin code request
log_info("Pin code request - using '0000'\n"); printf("Pin code request - using '0000'\n");
hci_event_pin_code_request_get_bd_addr(packet, event_addr); hci_event_pin_code_request_get_bd_addr(packet, event_addr);
gap_pin_code_response(event_addr, "0000"); gap_pin_code_response(event_addr, "0000");
break; break;
case HCI_EVENT_USER_CONFIRMATION_REQUEST: case HCI_EVENT_USER_CONFIRMATION_REQUEST:
// ssp: inform about user confirmation request // ssp: inform about user confirmation request
log_info("SSP User Confirmation Request with numeric value '%06"PRIu32"'\n", little_endian_read_32(packet, 8)); printf("SSP User Confirmation Request with numeric value '%06"PRIu32"'\n", little_endian_read_32(packet, 8));
log_info("SSP User Confirmation Auto accept\n"); printf("SSP User Confirmation Auto accept\n");
break; break;
case RFCOMM_EVENT_INCOMING_CONNECTION: case RFCOMM_EVENT_INCOMING_CONNECTION:
// data: event (8), len(8), address(48), channel (8), rfcomm_cid (16) rfcomm_event_incoming_connection_get_bd_addr(packet, event_addr);
rfcomm_event_incoming_connection_get_bd_addr(packet, event_addr); rfcomm_channel_nr = rfcomm_event_incoming_connection_get_server_channel(packet);
rfcomm_channel_id = rfcomm_event_incoming_connection_get_rfcomm_cid(packet); rfcomm_channel_id = rfcomm_event_incoming_connection_get_rfcomm_cid(packet);
printf("RFCOMM channel %u requested for %s\n", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_CHANNEL_OPENED: case RFCOMM_EVENT_CHANNEL_OPENED:
// data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16)
if (rfcomm_event_channel_opened_get_status(packet)) { if (rfcomm_event_channel_opened_get_status(packet)) {
log_info("RFCOMM channel open failed, status %u\n", rfcomm_event_channel_opened_get_status(packet)); printf("RFCOMM channel open failed, status %u\n", rfcomm_event_channel_opened_get_status(packet));
} else { } else {
rfcomm_channel_id = rfcomm_event_channel_opened_get_rfcomm_cid(packet); rfcomm_channel_id = rfcomm_event_channel_opened_get_rfcomm_cid(packet);
mtu = rfcomm_event_channel_opened_get_max_frame_size(packet);
printf("RFCOMM channel open succeeded. New RFCOMM Channel ID %u, max frame size %u\n", rfcomm_channel_id, mtu);
} }
break; break;
case RFCOMM_EVENT_CAN_SEND_NOW: case RFCOMM_EVENT_CAN_SEND_NOW:
rfcomm_send(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer)); rfcomm_send(rfcomm_channel_id, (uint8_t*) lineBuffer, (uint16_t) strlen(lineBuffer));
break; break;
/* LISTING_PAUSE */ /* LISTING_PAUSE */
case RFCOMM_EVENT_CHANNEL_CLOSED: case RFCOMM_EVENT_CHANNEL_CLOSED:
log_info("RFCOMM channel closed\n"); printf("RFCOMM channel closed\n");
rfcomm_channel_id = 0; rfcomm_channel_id = 0;
break; break;
@ -227,6 +238,11 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
break; break;
case RFCOMM_DATA_PACKET: case RFCOMM_DATA_PACKET:
printf("RCV: '");
for (i=0;i<size;i++){
putchar(packet[i]);
}
printf("'\n");
break; break;
default: default: