(apple/iOS/bluetooth/btstack) Cleanups

This commit is contained in:
twinaphex 2015-04-02 19:20:36 +02:00
parent 8bd0253c27
commit b9ae190e4c
6 changed files with 277 additions and 286 deletions

View File

@ -29,15 +29,6 @@
*
*/
/*
* btstack.h
*
* Created by Matthias Ringwald on 7/1/09.
*
* BTstack client API
*
*/
#ifndef _BTSTACK_HEADER_H
#define _BTSTACK_HEADER_H
@ -89,6 +80,7 @@ btstack_packet_handler_t bt_register_packet_handler(
void bt_send_acl(uint8_t * data, uint16_t len);
void bt_send_l2cap(uint16_t local_cid, uint8_t *data, uint16_t len);
void bt_send_rfcomm(uint16_t rfcom_cid, uint8_t *data, uint16_t len);
#if defined __cplusplus

View File

@ -29,13 +29,8 @@
*
*/
/*
* hci_cmds.h
*
* Created by Matthias Ringwald on 7/23/09.
*/
#pragma once
#ifndef _BTSTACK_HCI_CMDS_H
#define _BTSTACK_HCI_CMDS_H
#include <stdint.h>
@ -51,32 +46,31 @@ extern "C" {
#define HCI_SCO_DATA_PACKET 0x03
#define HCI_EVENT_PACKET 0x04
// extension for client/server communication
/* extension for client/server communication */
#define DAEMON_EVENT_PACKET 0x05
// L2CAP data
/* L2CAP data */
#define L2CAP_DATA_PACKET 0x06
// RFCOMM data
/* RFCOMM data */
#define RFCOMM_DATA_PACKET 0x07
// Attribute protocol data
/* Attribute protocol data */
#define ATT_DATA_PACKET 0x08
// Security Manager protocol data
/* Security Manager protocol data */
#define SM_DATA_PACKET 0x09
// debug log messages
#define LOG_MESSAGE_PACKET 0xfc
/* debug log messages */
#define LOG_MESSAGE_PACKET 0xFC
// Fixed PSM numbers
/* Fixed PSM numbers */
#define PSM_SDP 0x01
#define PSM_RFCOMM 0x03
#define PSM_HID_CONTROL 0x11
#define PSM_HID_INTERRUPT 0x13
// Events from host controller to host
/* Events from host controller to host */
#define HCI_EVENT_INQUIRY_COMPLETE 0x01
#define HCI_EVENT_INQUIRY_RESULT 0x02
#define HCI_EVENT_CONNECTION_COMPLETE 0x03
@ -116,55 +110,54 @@ extern "C" {
#define HCI_SUBEVENT_LE_READ_REMOTE_USED_FEATURES_COMPLETE 0x04
#define HCI_SUBEVENT_LE_LONG_TERM_KEY_REQUEST 0x05
// last used HCI_EVENT in 2.1 is 0x3d
/* last used HCI_EVENT in 2.1 is 0x3d */
// events 0x50-0x5f are used internally
/* events 0x50-0x5f are used internally */
// BTSTACK DAEMON EVENTS
/* BTSTACK DAEMON EVENTS */
// events from BTstack for application/client lib
/* events from BTstack for application/client lib */
#define BTSTACK_EVENT_STATE 0x60
// data: event(8), len(8), nr hci connections
/* data: event(8), len(8), nr hci connections */
#define BTSTACK_EVENT_NR_CONNECTIONS_CHANGED 0x61
// data: none
/* data: none */
#define BTSTACK_EVENT_POWERON_FAILED 0x62
// data: majot (8), minor (8), revision(16)
/* data: major (8), minor (8), revision(16) */
#define BTSTACK_EVENT_VERSION 0x63
// data: system bluetooth on/off (bool)
/* data: system bluetooth on/off (bool) */
#define BTSTACK_EVENT_SYSTEM_BLUETOOTH_ENABLED 0x64
// data: event (8), len(8), status (8) == 0, address (48), name (1984 bits = 248 bytes)
/* data: event (8), len(8), status (8) == 0, address (48), name (1984 bits = 248 bytes) */
#define BTSTACK_EVENT_REMOTE_NAME_CACHED 0x65
// data: discoverable enabled (bool)
/* data: discoverable enabled (bool) */
#define BTSTACK_EVENT_DISCOVERABLE_ENABLED 0x66
// L2CAP EVENTS
/* L2CAP EVENTS */
// data: event (8), len(8), status (8), address(48), handle (16), psm (16), local_cid(16), remote_cid (16), local_mtu(16), remote_mtu(16)
/* data: event (8), len(8), status (8), address(48), handle (16), psm (16), local_cid(16), remote_cid (16), local_mtu(16), remote_mtu(16) */
#define L2CAP_EVENT_CHANNEL_OPENED 0x70
// data: event (8), len(8), channel (16)
/* data: event (8), len(8), channel (16) */
#define L2CAP_EVENT_CHANNEL_CLOSED 0x71
// data: event (8), len(8), address(48), handle (16), psm (16), local_cid(16), remote_cid (16)
/* data: event (8), len(8), address(48), handle (16), psm (16), local_cid(16), remote_cid (16) */
#define L2CAP_EVENT_INCOMING_CONNECTION 0x72
// data: event(8), len(8), handle(16)
/* data: event(8), len(8), handle(16) */
#define L2CAP_EVENT_TIMEOUT_CHECK 0x73
// data: event(8), len(8), local_cid(16), credits(8)
/* data: event(8), len(8), local_cid(16), credits(8) */
#define L2CAP_EVENT_CREDITS 0x74
// data: event(8), len(8), status (8), psm (16)
/* data: event(8), len(8), status (8), psm (16) */
#define L2CAP_EVENT_SERVICE_REGISTERED 0x75
// RFCOMM EVENTS
/* RFCOMM EVENTS */
// data: event(8), len(8), status (8), address (48), handle (16), server channel(8), rfcomm_cid(16), max frame size(16)
#define RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE 0x80
@ -178,21 +171,19 @@ extern "C" {
// data: event (8), len(8), rfcommid (16), ...
#define RFCOMM_EVENT_REMOTE_LINE_STATUS 0x83
// data: event(8), len(8), rfcomm_cid(16), credits(8)
/* data: event(8), len(8), rfcomm_cid(16), credits(8) */
#define RFCOMM_EVENT_CREDITS 0x84
// data: event(8), len(8), status (8), rfcomm server channel id (8)
/* data: event(8), len(8), status (8), rfcomm server channel id (8) */
#define RFCOMM_EVENT_SERVICE_REGISTERED 0x85
// data: event(8), len(8), status (8), rfcomm server channel id (8)
/* data: event(8), len(8), status (8), rfcomm server channel id (8) */
#define RFCOMM_EVENT_PERSISTENT_CHANNEL 0x86
// data: event(8), len(8), status(8), service_record_handle(32)
/* data: event(8), len(8), status(8), service_record_handle(32) */
#define SDP_SERVICE_REGISTERED 0x90
// last error code in 2.1 is 0x38 - we start with 0x50 for BTstack errors
/* last error code in 2.1 is 0x38 - we start with 0x50 for BTstack errors */
#define BTSTACK_CONNECTION_TO_BTDAEMON_FAILED 0x50
#define BTSTACK_ACTIVATION_FAILED_SYSTEM_BLUETOOTH 0x51
@ -203,7 +194,7 @@ extern "C" {
#define BTSTACK_MEMORY_ALLOC_FAILED 0x56
#define BTSTACK_ACL_BUFFERS_FULL 0x57
// l2cap errors - enumeration by the command that created them
/* L2CAP errors - enumeration by the command that created them */
#define L2CAP_COMMAND_REJECT_REASON_COMMAND_NOT_UNDERSTOOD 0x60
#define L2CAP_COMMAND_REJECT_REASON_SIGNALING_MTU_EXCEEDED 0x61
#define L2CAP_COMMAND_REJECT_REASON_INVALID_CID_IN_REQUEST 0x62
@ -226,23 +217,22 @@ extern "C" {
#define SDP_HANDLE_ALREADY_REGISTERED 0x80
/**
* Default INQ Mode
*/
#define HCI_INQUIRY_LAP 0x9E8B33L // 0x9E8B33: General/Unlimited Inquiry Access Code (GIAC)
/**
* Hardware state of Bluetooth controller
*/
typedef enum {
/* Default INQ Mode
* 0x9E8B33: General/Unlimited Inquiry Access Code (GIAC)
**/
#define HCI_INQUIRY_LAP 0x9E8B33L
/* Hardware state of Bluetooth controller */
typedef enum
{
HCI_POWER_OFF = 0,
HCI_POWER_ON,
HCI_POWER_SLEEP
} HCI_POWER_MODE;
/**
* State of BTstack
*/
typedef enum {
/* State of BTstack */
typedef enum
{
HCI_STATE_OFF = 0,
HCI_STATE_INITIALIZING,
HCI_STATE_WORKING,
@ -251,16 +241,14 @@ typedef enum {
HCI_STATE_FALLING_ASLEEP
} HCI_STATE;
/**
* compact HCI Command packet description
*/
typedef struct {
/* compact HCI Command packet description */
typedef struct
{
uint16_t opcode;
const char *format;
} hci_cmd_t;
// HCI Commands - see hci_cmds.c for info on parameters
/* HCI Commands - see hci_cmds.c for info on parameters */
extern const hci_cmd_t btstack_get_state;
extern const hci_cmd_t btstack_set_power_mode;
extern const hci_cmd_t btstack_set_acl_capture_mode;
@ -268,7 +256,7 @@ extern const hci_cmd_t btstack_get_version;
extern const hci_cmd_t btstack_get_system_bluetooth_enabled;
extern const hci_cmd_t btstack_set_system_bluetooth_enabled;
extern const hci_cmd_t btstack_set_discoverable;
extern const hci_cmd_t btstack_set_bluetooth_enabled; // only used by btstack config
extern const hci_cmd_t btstack_set_bluetooth_enabled; /* only used by btstack config */
extern const hci_cmd_t hci_accept_connection_request;
extern const hci_cmd_t hci_authentication_requested;
@ -356,25 +344,27 @@ extern const hci_cmd_t l2cap_unregister_service;
extern const hci_cmd_t sdp_register_service_record;
extern const hci_cmd_t sdp_unregister_service_record;
// accept connection @param bd_addr(48), rfcomm_cid (16)
/* accept connection @param bd_addr(48), rfcomm_cid (16) */
extern const hci_cmd_t rfcomm_accept_connection;
// create rfcomm channel: @param bd_addr(48), channel (8)
/* create rfcomm channel: @param bd_addr(48), channel (8) */
extern const hci_cmd_t rfcomm_create_channel;
// create rfcomm channel: @param bd_addr(48), channel (8), mtu (16), credits (8)
/* create rfcomm channel: @param bd_addr(48), channel (8), mtu (16), credits (8) */
extern const hci_cmd_t rfcomm_create_channel_with_initial_credits;
// decline rfcomm disconnect,@param bd_addr(48), rfcomm cid (16), reason(8)
/* decline rfcomm disconnect,@param bd_addr(48), rfcomm cid (16), reason(8) */
extern const hci_cmd_t rfcomm_decline_connection;
// disconnect rfcomm disconnect, @param rfcomm_cid(8), reason(8)
/* disconnect rfcomm disconnect, @param rfcomm_cid(8), reason(8) */
extern const hci_cmd_t rfcomm_disconnect;
// register rfcomm service: @param channel(8), mtu (16)
/* register rfcomm service: @param channel(8), mtu (16) */
extern const hci_cmd_t rfcomm_register_service;
// register rfcomm service: @param channel(8), mtu (16), initial credits (8)
/* register rfcomm service: @param channel(8), mtu (16), initial credits (8) */
extern const hci_cmd_t rfcomm_register_service_with_initial_credits;
// unregister rfcomm service, @param service_channel(16)
/* unregister rfcomm service, @param service_channel(16) */
extern const hci_cmd_t rfcomm_unregister_service;
// request persisten rfcomm channel for service name: serive name (char*)
/* request persisten rfcomm channel for service name: serive name (char*) */
extern const hci_cmd_t rfcomm_persistent_channel_for_service;
#if defined __cplusplus
}
#endif
#endif

View File

@ -29,12 +29,6 @@
*
*/
/*
* linked_list.h
*
* Created by Matthias Ringwald on 7/13/09.
*/
#ifndef _BTSTACK_LINKED_LIST_H
#define _BTSTACK_LINKED_LIST_H

View File

@ -35,7 +35,8 @@
* Created by Matthias Ringwald on 6/6/09.
*/
#pragma once
#ifndef _BTSTACK_RUNLOOP_H
#define _BTSTACK_RUNLOOP_H
#include "linked_list.h"
#define HAVE_TIME
@ -137,3 +138,4 @@ void embedded_trigger(void);
}
#endif
#endif

View File

@ -29,10 +29,6 @@
*
*/
/*
* sdp_util.h
*/
#ifndef _BTSTACK_SDP_UTIL_H
#define _BTSTACK_SDP_UTIL_H
@ -42,7 +38,8 @@
extern "C" {
#endif
typedef enum {
typedef enum
{
DE_NIL = 0,
DE_UINT,
DE_INT,
@ -54,7 +51,8 @@ typedef enum {
DE_URL
} de_type_t;
typedef enum {
typedef enum
{
DE_SIZE_8 = 0,
DE_SIZE_16,
DE_SIZE_32,
@ -65,7 +63,7 @@ typedef enum {
DE_SIZE_VAR_32
} de_size_t;
// UNIVERSAL ATTRIBUTE DEFINITIONS
/* UNIVERSAL ATTRIBUTE DEFINITIONS */
#define SDP_ServiceRecordHandle 0x0000
#define SDP_ServiceClassIDList 0x0001
#define SDP_ServiceRecordState 0x0002
@ -82,24 +80,24 @@ typedef enum {
#define SDP_AdditionalProtocolDescriptorList 0x000d
#define SDP_SupportedFormatsList 0x0303
// SERVICE CLASSES
/* SERVICE CLASSES */
#define SDP_OBEXObjectPush 0x1105
#define SDP_OBEXFileTransfer 0x1106
#define SDP_PublicBrowseGroup 0x1002
// PROTOCOLS
/* PROTOCOLS */
#define SDP_SDPProtocol 0x0001
#define SDP_UDPProtocol 0x0002
#define SDP_RFCOMMProtocol 0x0003
#define SDP_OBEXProtocol 0x0008
#define SDP_L2CAPProtocol 0x0100
// OFFSETS FOR LOCALIZED ATTRIBUTES - SDP_LanguageBaseAttributeIDList
/* OFFSETS FOR LOCALIZED ATTRIBUTES - SDP_LanguageBaseAttributeIDList */
#define SDP_Offest_ServiceName 0x0000
#define SDP_Offest_ServiceDescription 0x0001
#define SDP_Offest_ProviderName 0x0002
// OBEX
/* OBEX */
#define SDP_vCard_2_1 0x01
#define SDP_vCard_3_0 0x02
#define SDP_vCal_1_0 0x03
@ -108,29 +106,53 @@ typedef enum {
#define SDP_vMessage 0x06
#define SDP_OBEXFileTypeAny 0xFF
// MARK: DateElement
/* MARK: DateElement */
void de_dump_data_element(uint8_t * record);
int de_get_len(uint8_t *header);
de_size_t de_get_size_type(uint8_t *header);
de_type_t de_get_element_type(uint8_t *header);
int de_get_header_size(uint8_t * header);
void de_create_sequence(uint8_t *header);
void de_store_descriptor_with_len(uint8_t * header, de_type_t type, de_size_t size, uint32_t len);
uint8_t * de_push_sequence(uint8_t *header);
void de_store_descriptor_with_len(uint8_t * header,
de_type_t type, de_size_t size, uint32_t len);
uint8_t *de_push_sequence(uint8_t *header);
void de_pop_sequence(uint8_t * parent, uint8_t * child);
void de_add_number(uint8_t *seq, de_type_t type, de_size_t size, uint32_t value);
void de_add_data( uint8_t *seq, de_type_t type, uint16_t size, uint8_t *data);
int de_get_data_size(uint8_t * header);
void de_add_uuid128(uint8_t * seq, uint8_t * uuid);
// MARK: SDP
uint16_t sdp_append_attributes_in_attributeIDList(uint8_t *record, uint8_t *attributeIDList, uint16_t startOffset, uint16_t maxBytes, uint8_t *buffer);
uint8_t * sdp_get_attribute_value_for_attribute_id(uint8_t * record, uint16_t attributeID);
uint8_t sdp_set_attribute_value_for_attribute_id(uint8_t * record, uint16_t attributeID, uint32_t value);
int sdp_record_matches_service_search_pattern(uint8_t *record, uint8_t *serviceSearchPattern);
/* MARK: SDP */
uint16_t sdp_append_attributes_in_attributeIDList(uint8_t *record,
uint8_t *attributeIDList, uint16_t startOffset,
uint16_t maxBytes, uint8_t *buffer);
uint8_t *sdp_get_attribute_value_for_attribute_id(uint8_t * record,
uint16_t attributeID);
uint8_t sdp_set_attribute_value_for_attribute_id(uint8_t * record,
uint16_t attributeID, uint32_t value);
int sdp_record_matches_service_search_pattern(uint8_t *record,
uint8_t *serviceSearchPattern);
int spd_get_filtered_size(uint8_t *record, uint8_t *attributeIDList);
int sdp_filter_attributes_in_attributeIDList(uint8_t *record, uint8_t *attributeIDList, uint16_t startOffset, uint16_t maxBytes, uint16_t *usedBytes, uint8_t *buffer);
int sdp_filter_attributes_in_attributeIDList(uint8_t *record,
uint8_t *attributeIDList, uint16_t startOffset, uint16_t maxBytes,
uint16_t *usedBytes, uint8_t *buffer);
void sdp_create_spp_service(uint8_t *service, int service_id, const char *name);

View File

@ -29,14 +29,6 @@
*
*/
/*
* utils.h
*
* General utility functions
*
* Created by Matthias Ringwald on 7/23/09.
*/
#ifndef _BT_UTILS_H
#define _BT_UTILS_H
@ -52,15 +44,14 @@ typedef uint16_t hci_con_handle_t;
/* Length of a Bluetooth device address. */
#define BD_ADDR_LEN 6
typedef uint8_t bd_addr_t[BD_ADDR_LEN];
/* The link key type. */
#define LINK_KEY_LEN 16
typedef uint8_t link_key_t[LINK_KEY_LEN];
/* The device name type. */
#define DEVICE_NAME_LEN 248
typedef uint8_t bd_addr_t[BD_ADDR_LEN];
typedef uint8_t link_key_t[LINK_KEY_LEN];
typedef uint8_t device_name_t[DEVICE_NAME_LEN+1];
/* helper for BT little endian format. */
@ -92,6 +83,9 @@ typedef uint8_t device_name_t[DEVICE_NAME_LEN+1];
#define READ_L2CAP_LENGTH(buffer) ( READ_BT_16(buffer, 4))
#define READ_L2CAP_CHANNEL_ID(buffer) ( READ_BT_16(buffer, 6))
#define BD_ADDR_CMP(a,b) memcmp(a,b, BD_ADDR_LEN)
#define BD_ADDR_COPY(dest,src) memcpy(dest,src,BD_ADDR_LEN)
void bt_store_16(uint8_t *buffer, uint16_t pos, uint16_t value);
void bt_store_32(uint8_t *buffer, uint16_t pos, uint32_t value);
@ -117,9 +111,6 @@ uint8_t crc8_check(uint8_t *data, uint16_t len, uint8_t check_sum);
uint8_t crc8_calc(uint8_t *data, uint16_t len);
#define BD_ADDR_CMP(a,b) memcmp(a,b, BD_ADDR_LEN)
#define BD_ADDR_COPY(dest,src) memcpy(dest,src,BD_ADDR_LEN)
#if defined __cplusplus
}
#endif