mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-20 18:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

streamline buffer size definitions throughtout the stack, use single HCI_PACKET_BUFFER_SIZE

Browse Source
This commit is contained in:
matthias.ringwald 2011-07-29 19:44:19 +00:00
parent db8946af91
commit 36a5e73594
5 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hci.h
View File

@ -38,6 +38,8 @@
#pragma once #pragma once
#include "../config.h"
#include <btstack/hci_cmds.h> #include <btstack/hci_cmds.h>
#include <btstack/utils.h> #include <btstack/utils.h>
#include "hci_transport.h" #include "hci_transport.h"
@ -52,11 +54,11 @@
extern "C" { extern "C" {
#endif #endif
// packet header lenghts // packet header sizes
#define HCI_CMD_DATA_PKT_HDR 0x03 #define HCI_CMD_HEADER_SIZE 3
#define HCI_ACL_DATA_PKT_HDR 0x04 #define HCI_ACL_HEADER_SIZE 4
#define HCI_SCO_DATA_PKT_HDR 0x03 #define HCI_SCO_HEADER_SIZE 3
#define HCI_EVENT_PKT_HDR 0x02 #define HCI_EVENT_HEADER_SIZE 2
// packet sizes (max payload) // packet sizes (max payload)
#define HCI_ACL_DM1_SIZE 17 #define HCI_ACL_DM1_SIZE 17
@ -72,7 +74,22 @@ extern "C" {
#define HCI_ACL_2DH5_SIZE 679 #define HCI_ACL_2DH5_SIZE 679
#define HCI_ACL_3DH5_SIZE 1021 #define HCI_ACL_3DH5_SIZE 1021
#define HCI_EVENT_PKT_SIZE 255 #define HCI_EVENT_PAYLOAD_SIZE 255
#define HCI_CMD_PAYLOAD_SIZE 255
// packet buffer sizes
// HCI_ACL_PAYLOAD_SIZE is configurable and defined in config.h
#define HCI_EVENT_BUFFER_SIZE (HCI_EVENT_HEADER_SIZE + HCI_EVENT_PAYLOAD_SIZE)
#define HCI_CMD_BUFFER_SIZE (HCI_CMD_HEADER_SIZE + HCI_CMD_PAYLOAD_SIZE)
#define HCI_ACL_BUFFER_SIZE (HCI_ACL_HEADER_SIZE + HCI_ACL_PAYLOAD_SIZE)
// size of hci buffers, big enough for command, event, or acl packet without H4 packet type
// @note cmd buffer is bigger than event buffer
#if HCI_ACL_BUFFER_SIZE > HCI_CMD_BUFFER_SIZE
#define HCI_PACKET_BUFFER_SIZE HCI_ACL_BUFFER_SIZE
#else
#define HCI_PACKET_BUFFER_SIZE HCI_EVENT_BUFFER_SIZE
#endif
// OGFs // OGFs
#define OGF_LINK_CONTROL 0x01 #define OGF_LINK_CONTROL 0x01
@ -243,6 +260,7 @@ typedef struct {
// single buffer for HCI Command assembly // single buffer for HCI Command assembly
uint8_t hci_cmd_buffer[3+255]; // opcode (16), len(8) uint8_t hci_cmd_buffer[3+255]; // opcode (16), len(8)
uint8_t hci_packet_buffer[HCI_PACKET_BUFFER_SIZE]; // opcode (16), len(8)
/* host to controller flow control */ /* host to controller flow control */
uint8_t num_cmd_packets; uint8_t num_cmd_packets;

9
src/hci_transport_h4.c
View File

@ -48,15 +48,6 @@
#include "hci_transport.h" #include "hci_transport.h"
#include "hci_dump.h" #include "hci_dump.h"
// determine size of receive buffer
// use one extra byte to guarantee zero terminated device name in remote name event
#if (HCI_ACL_DATA_PKT_HDR + HCI_ACL_BUFFER_SIZE) > (HCI_EVENT_PKT_HDR + HCI_EVENT_PKT_SIZE + 1)
#define HCI_PACKET_BUFFER_SIZE (HCI_ACL_DATA_PKT_HDR + HCI_ACL_BUFFER_SIZE)
#else
#define HCI_PACKET_BUFFER_SIZE (HCI_EVENT_PKT_HDR + HCI_EVENT_PKT_SIZE + 1)
#endif
// #define USE_HCI_READER_THREAD // #define USE_HCI_READER_THREAD
typedef enum { typedef enum {

12
src/hci_transport_h4_dma.c
View File

@ -47,14 +47,6 @@
#include <btstack/hal_uart_dma.h> #include <btstack/hal_uart_dma.h>
// determine size of receive buffer
// use one extra byte to guarantee zero terminated device name in remote name event
#if (HCI_ACL_DATA_PKT_HDR + HCI_ACL_BUFFER_SIZE) > (HCI_EVENT_PKT_HDR + HCI_EVENT_PKT_SIZE + 1)
#define HCI_PACKET_BUFFER_SIZE (HCI_ACL_DATA_PKT_HDR + HCI_ACL_BUFFER_SIZE)
#else
#define HCI_PACKET_BUFFER_SIZE (HCI_EVENT_PKT_HDR + HCI_EVENT_PKT_SIZE + 1)
#endif
typedef enum { typedef enum {
H4_W4_PACKET_TYPE = 1, H4_W4_PACKET_TYPE = 1,
H4_W4_EVENT_HEADER, H4_W4_EVENT_HEADER,
@ -150,11 +142,11 @@ static void h4_block_received(void){
switch (hci_packet[0]) { switch (hci_packet[0]) {
case HCI_ACL_DATA_PACKET: case HCI_ACL_DATA_PACKET:
h4_state = H4_W4_ACL_HEADER; h4_state = H4_W4_ACL_HEADER;
bytes_to_read = HCI_ACL_DATA_PKT_HDR; bytes_to_read = HCI_ACL_HEADER_SIZE;
break; break;
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
h4_state = H4_W4_EVENT_HEADER; h4_state = H4_W4_EVENT_HEADER;
bytes_to_read = HCI_EVENT_PKT_HDR; bytes_to_read = HCI_EVENT_HEADER_SIZE;
break; break;
default: default:
log_error("h4_process: invalid packet type 0x%02x\r\n", hci_packet[0]); log_error("h4_process: invalid packet type 0x%02x\r\n", hci_packet[0]);

6
src/l2cap.c
View File

@ -49,7 +49,7 @@
#include <stdio.h> #include <stdio.h>
// size of HCI ACL + L2CAP Header for regular data packets (8) // size of HCI ACL + L2CAP Header for regular data packets (8)
#define COMPLETE_L2CAP_HEADER (HCI_ACL_DATA_PKT_HDR + L2CAP_HEADER_SIZE) #define COMPLETE_L2CAP_HEADER (HCI_ACL_HEADER_SIZE + L2CAP_HEADER_SIZE)
// minimum signaling MTU // minimum signaling MTU
#define L2CAP_MINIMAL_MTU 48 #define L2CAP_MINIMAL_MTU 48
@ -57,9 +57,9 @@
// determine size of outgoing packet construction buffer - this includes ACL + L2CAP header // determine size of outgoing packet construction buffer - this includes ACL + L2CAP header
#if (L2CAP_MINIMAL_MTU + L2CAP_HEADER_SIZE) > (HCI_ACL_BUFFER_SIZE) #if (L2CAP_MINIMAL_MTU + L2CAP_HEADER_SIZE) > (HCI_ACL_BUFFER_SIZE)
#define L2CAP_PACKET_BUFFER_SIZE (HCI_ACL_DATA_PKT_HDR + L2CAP_HEADER_SIZE + L2CAP_MINIMAL_MTU) #define L2CAP_PACKET_BUFFER_SIZE (HCI_ACL_HEADER_SIZE + L2CAP_HEADER_SIZE + L2CAP_MINIMAL_MTU)
#else #else
#define L2CAP_PACKET_BUFFER_SIZE (HCI_ACL_DATA_PKT_HDR + HCI_ACL_BUFFER_SIZE) #define L2CAP_PACKET_BUFFER_SIZE (HCI_ACL_HEADER_SIZE + HCI_ACL_BUFFER_SIZE)
#endif #endif

2
src/sdp.c
View File

@ -50,7 +50,7 @@
#define maxReservedServiceRecordHandle 0xffff #define maxReservedServiceRecordHandle 0xffff
// max SDP response // max SDP response
#define SDP_RESPONSE_BUFFER_SIZE (HCI_ACL_BUFFER_SIZE-HCI_ACL_DATA_PKT_HDR) #define SDP_RESPONSE_BUFFER_SIZE (HCI_ACL_BUFFER_SIZE-HCI_ACL_HEADER_SIZE)
static void sdp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size); static void sdp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);