mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-05 21:59:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed internal functions from hci_cmds.h, more clean ups

Browse Source
This commit is contained in:
matthias.ringwald 2009-09-29 20:10:24 +00:00
parent 733146222d
commit 945627e442
5 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/btstack/hci_cmds.h
View File

@ -8,21 +8,10 @@
#include <stdint.h>
#include <stdarg.h>
#include <string.h>
// calculate combined ogf/ocf value
#define OPCODE(ogf, ocf) (ocf | ogf << 10)
// check if command complete event for given command
#define COMMAND_COMPLETE_EVENT(event,cmd) ( event[0] == HCI_EVENT_COMMAND_COMPLETE && READ_BT_16(event,3) == cmd.opcode)
// OGFs
#define OGF_LINK_CONTROL 0x01
#define OGF_CONTROLLER_BASEBAND 0x03
#define OGF_INFORMATIONAL_PARAMETERS 0x04
#define OGF_BTSTACK 0x3d
#define OGF_VENDOR 0x3f
// Events from host controller to host
#define HCI_EVENT_INQUIRY_COMPLETE 0x01
#define HCI_EVENT_INQUIRY_RESULT 0x02
@ -58,6 +47,8 @@
// last used HCI_EVENT in 2.1 is 0x3d
// events 0x50-0x5f are used internally
// events from BTstack for application/client lib
#define BTSTACK_EVENT_WORKING 0x60
#define BTSTACK_EVENT_STATE 0x61
@ -68,21 +59,14 @@
// data: none
#define BTSTACK_EVENT_POWERON_FAILED 0x63
// data: event(8)
#define DAEMON_CONNECTION_CLOSED 0x70
// data: event(8), nr_connections(8)
#define DAEMON_NR_CONNECTIONS_CHANGED 0x71
// data: event (8), len(8), address(48), handle (16), psm (16), source_cid(16), dest_cid (16)
#define L2CAP_EVENT_CHANNEL_OPENED 0x80
#define L2CAP_EVENT_CHANNEL_OPENED 0x70
// data: event (8), len(8), channel (16)
#define L2CAP_EVENT_CHANNEL_CLOSED 0x81
#define L2CAP_EVENT_CHANNEL_CLOSED 0x71
// data: event(8), len(8), handle(16)
#define L2CAP_EVENT_TIMEOUT_CHECK 0x82
#define L2CAP_EVENT_TIMEOUT_CHECK 0x72
/**
* Default INQ Mode
@ -114,10 +98,6 @@ typedef enum {
const char *format;
} hci_cmd_t;
// create and send hci command packets based on a template and a list of parameters
uint16_t hci_create_cmd(uint8_t *hci_cmd_buffer, hci_cmd_t *cmd, ...);
uint16_t hci_create_cmd_internal(uint8_t *hci_cmd_buffer, hci_cmd_t *cmd, va_list argptr);
// HCI Commands - see hci_cmds.c for info on parameters
extern hci_cmd_t hci_inquiry;
@ -147,5 +127,6 @@ extern hci_cmd_t hci_write_simple_pairing_mode;
extern hci_cmd_t btstack_get_state;
extern hci_cmd_t btstack_set_power_mode;
extern hci_cmd_t btstack_set_acl_capture_mode;
// L2CAP client/server commands - see l2cap.c for info on parameters
extern hci_cmd_t l2cap_create_channel;
extern hci_cmd_t l2cap_disconnect;

2
src/daemon.c
View File

@ -122,7 +122,7 @@ static int daemon_client_handler(connection_t *connection, uint16_t packet_type,
break;
case DAEMON_EVENT_PACKET:
switch (data[0]) {
case DAEMON_CONNECTION_CLOSED:
case DAEMON_EVENT_CONNECTION_CLOSED:
l2cap_close_channels_for_connection(connection);
break;
case DAEMON_NR_CONNECTIONS_CHANGED:

17
src/hci.h
View File

@ -22,6 +22,12 @@
#define HCI_SCO_DATA_PKT_HDR 0x03
#define HCI_EVENT_PKT_HDR 0x02
// OGFs
#define OGF_LINK_CONTROL 0x01
#define OGF_CONTROLLER_BASEBAND 0x03
#define OGF_INFORMATIONAL_PARAMETERS 0x04
#define OGF_BTSTACK 0x3d
#define OGF_VENDOR 0x3f
// cmds for BTstack
// get state: @returns HCI_STATE
@ -42,6 +48,13 @@
//
#define IS_COMMAND(packet, command) (READ_BT_16(packet,0) == command.opcode)
// data: event(8)
#define DAEMON_EVENT_CONNECTION_CLOSED 0x70
// data: event(8), nr_connections(8)
#define DAEMON_NR_CONNECTIONS_CHANGED 0x71
/**
* Connection State
*/
@ -119,6 +132,10 @@ typedef struct {
} hci_stack_t;
// create and send hci command packets based on a template and a list of parameters
uint16_t hci_create_cmd(uint8_t *hci_cmd_buffer, hci_cmd_t *cmd, ...);
uint16_t hci_create_cmd_internal(uint8_t *hci_cmd_buffer, hci_cmd_t *cmd, va_list argptr);
// set up HCI
void hci_init(hci_transport_t *transport, void *config, bt_control_t *control);

4
src/hci_cmds.c
View File

@ -6,6 +6,10 @@
#include <btstack/hci_cmds.h>
#include "hci.h"
#include <string.h>
// calculate combined ogf/ocf value
#define OPCODE(ogf, ocf) (ocf | ogf << 10)
/**
* construct HCI Command based on template

2
src/socket_connection.c
View File

@ -138,7 +138,7 @@ int socket_connection_hci_process(struct data_source *ds) {
if (bytes_read <= 0){
// connection broken (no particular channel, no date yet)
uint8_t event[1];
event[0] = DAEMON_CONNECTION_CLOSED;
event[0] = DAEMON_EVENT_CONNECTION_CLOSED;
(*socket_connection_packet_callback)(conn, DAEMON_EVENT_PACKET, 0, (uint8_t *) &event, 1);
// free connection