spp_streamer/spp_streamer_client: optionally use L2CAP ERTM for RFCOMM with a single ERTM buffer

This commit is contained in:
Matthias Ringwald 2019-01-09 09:08:52 +01:00
parent b8261b65d9
commit 8cef84f359
2 changed files with 71 additions and 0 deletions

View File

@ -82,6 +82,37 @@ static uint16_t rfcomm_mtu;
static uint16_t rfcomm_cid = 0;
// static uint32_t data_to_send = DATA_VOLUME;
/**
* RFCOMM can make use for ERTM. Due to the need to re-transmit packets,
* a large buffer is needed to still get high throughput
*/
#if defined(ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE) && defined (ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE_FOR_RFCOMM)
static uint8_t ertm_buffer[20000];
static l2cap_ertm_config_t ertm_config = {
0, // ertm mandatory
8, // max transmit
2000,
12000,
1000, // l2cap ertm mtu
8,
8,
0, // No FCS
};
static int ertm_buffer_in_use;
static void rfcomm_ertm_request_handler(rfcomm_ertm_request_t * ertm_request){
printf("ERTM Buffer requested, buffer in use %u\n", ertm_buffer_in_use);
if (ertm_buffer_in_use) return;
ertm_buffer_in_use = 1;
ertm_request->ertm_config = &ertm_config;
ertm_request->ertm_buffer = ertm_buffer;
ertm_request->ertm_buffer_size = sizeof(ertm_buffer);
}
static void rfcomm_ertm_released_handler(uint16_t ertm_id){
printf("ERTM Buffer released, buffer in use %u, ertm_id %x\n", ertm_buffer_in_use, ertm_id);
ertm_buffer_in_use = 0;
}
#endif
/*
* @section Track throughput
* @text We calculate the throughput by setting a start time and measuring the amount of
@ -256,6 +287,11 @@ int btstack_main(int argc, const char * argv[])
rfcomm_init();
rfcomm_register_service(packet_handler, RFCOMM_SERVER_CHANNEL, 0xffff);
#if defined(ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE) && defined (ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE_FOR_RFCOMM)
// setup ERTM management
rfcomm_enable_l2cap_ertm(&rfcomm_ertm_request_handler, &rfcomm_ertm_released_handler);
#endif
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));

View File

@ -82,6 +82,36 @@ static uint16_t rfcomm_mtu;
static uint16_t rfcomm_cid = 0;
// static uint32_t data_to_send = DATA_VOLUME;
/**
* RFCOMM can make use for ERTM. Due to the need to re-transmit packets,
* a large buffer is needed to still get high throughput
*/
#if defined(ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE) && defined (ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE_FOR_RFCOMM)
static uint8_t ertm_buffer[20000];
static l2cap_ertm_config_t ertm_config = {
0, // ertm mandatory
8, // max transmit
2000,
12000,
1000, // l2cap ertm mtu
8,
8,
0, // No FCS
};
static int ertm_buffer_in_use;
static void rfcomm_ertm_request_handler(rfcomm_ertm_request_t * ertm_request){
printf("ERTM Buffer requested, buffer in use %u\n", ertm_buffer_in_use);
if (ertm_buffer_in_use) return;
ertm_buffer_in_use = 1;
ertm_request->ertm_config = &ertm_config;
ertm_request->ertm_buffer = ertm_buffer;
ertm_request->ertm_buffer_size = sizeof(ertm_buffer);
}
static void rfcomm_ertm_released_handler(uint16_t ertm_id){
printf("ERTM Buffer released, buffer in use %u, ertm_id %x\n", ertm_buffer_in_use, ertm_id);
ertm_buffer_in_use = 0;
}
#endif
/**
* Find remote peer by COD
@ -271,6 +301,11 @@ int btstack_main(int argc, const char * argv[]){
rfcomm_init();
rfcomm_register_service(packet_handler, RFCOMM_SERVER_CHANNEL, 0xffff);
#if defined(ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE) && defined (ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE_FOR_RFCOMM)
// setup ERTM management
rfcomm_enable_l2cap_ertm(&rfcomm_ertm_request_handler, &rfcomm_ertm_released_handler);
#endif
// register for HCI events
hci_event_callback_registration.callback = &packet_handler;
hci_add_event_handler(&hci_event_callback_registration);