mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-13 15:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

rfcomm: move private events to implementation

Browse Source
This commit is contained in:
Matthias Ringwald 2016-02-19 14:01:30 +01:00
parent fc64f94a83
commit e628322d35
2 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/classic/rfcomm.c
View File

@ -44,15 +44,14 @@
#include <string.h> // memcpy #include <string.h> // memcpy
#include <stdint.h> #include <stdint.h>
#include "hci_cmd.h"
#include "btstack_util.h"
#include "btstack_util.h"
#include "btstack_memory.h"
#include "hci.h"
#include "hci_dump.h"
#include "btstack_debug.h" #include "btstack_debug.h"
#include "btstack_memory.h"
#include "btstack_util.h"
#include "classic/rfcomm.h" #include "classic/rfcomm.h"
#include "hci.h"
#include "hci_cmd.h"
#include "hci_dump.h"
#include "l2cap.h"
// workaround for missing PRIxPTR on mspgcc (16/20-bit MCU) // workaround for missing PRIxPTR on mspgcc (16/20-bit MCU)
#ifndef PRIxPTR #ifndef PRIxPTR
@ -72,7 +71,53 @@
#define BT_RFCOMM_CRC_CHECK_LEN 3 #define BT_RFCOMM_CRC_CHECK_LEN 3
#define BT_RFCOMM_UIHCRC_CHECK_LEN 2 #define BT_RFCOMM_UIHCRC_CHECK_LEN 2
#include "l2cap.h"
typedef enum {
CH_EVT_RCVD_SABM = 1,
CH_EVT_RCVD_UA,
CH_EVT_RCVD_PN,
CH_EVT_RCVD_PN_RSP,
CH_EVT_RCVD_DISC,
CH_EVT_RCVD_DM,
CH_EVT_RCVD_MSC_CMD,
CH_EVT_RCVD_MSC_RSP,
CH_EVT_RCVD_NSC_RSP,
CH_EVT_RCVD_RLS_CMD,
CH_EVT_RCVD_RLS_RSP,
CH_EVT_RCVD_RPN_CMD,
CH_EVT_RCVD_RPN_REQ,
CH_EVT_RCVD_CREDITS,
CH_EVT_MULTIPLEXER_READY,
CH_EVT_READY_TO_SEND,
} RFCOMM_CHANNEL_EVENT;
typedef struct rfcomm_channel_event {
RFCOMM_CHANNEL_EVENT type;
uint16_t dummy; // force rfcomm_channel_event to be 2-byte aligned -> avoid -Wcast-align warning
} rfcomm_channel_event_t;
typedef struct rfcomm_channel_event_pn {
rfcomm_channel_event_t super;
uint16_t max_frame_size;
uint8_t priority;
uint8_t credits_outgoing;
} rfcomm_channel_event_pn_t;
typedef struct rfcomm_channel_event_rpn {
rfcomm_channel_event_t super;
rfcomm_rpn_data_t data;
} rfcomm_channel_event_rpn_t;
typedef struct rfcomm_channel_event_rls {
rfcomm_channel_event_t super;
uint8_t line_status;
} rfcomm_channel_event_rls_t;
typedef struct rfcomm_channel_event_msc {
rfcomm_channel_event_t super;
uint8_t modem_status;
} rfcomm_channel_event_msc_t;
// global rfcomm data // global rfcomm data
static uint16_t rfcomm_client_cid_generator; // used for client channel IDs static uint16_t rfcomm_client_cid_generator; // used for client channel IDs

48
src/classic/rfcomm.h
View File

@ -71,7 +71,6 @@ typedef enum {
typedef enum { typedef enum {
MULT_EV_READY_TO_SEND = 1, MULT_EV_READY_TO_SEND = 1,
} RFCOMM_MULTIPLEXER_EVENT; } RFCOMM_MULTIPLEXER_EVENT;
typedef enum { typedef enum {
@ -88,7 +87,6 @@ typedef enum {
RFCOMM_CHANNEL_SEND_DISC, RFCOMM_CHANNEL_SEND_DISC,
RFCOMM_CHANNEL_W4_UA_AFTER_UA, RFCOMM_CHANNEL_W4_UA_AFTER_UA,
RFCOMM_CHANNEL_SEND_DM, RFCOMM_CHANNEL_SEND_DM,
} RFCOMM_CHANNEL_STATE; } RFCOMM_CHANNEL_STATE;
typedef enum { typedef enum {
@ -114,37 +112,6 @@ typedef enum {
RFCOMM_CHANNEL_STATE_VAR_SENT_CREDITS = 1 << 15, RFCOMM_CHANNEL_STATE_VAR_SENT_CREDITS = 1 << 15,
} RFCOMM_CHANNEL_STATE_VAR; } RFCOMM_CHANNEL_STATE_VAR;
typedef enum {
CH_EVT_RCVD_SABM = 1,
CH_EVT_RCVD_UA,
CH_EVT_RCVD_PN,
CH_EVT_RCVD_PN_RSP,
CH_EVT_RCVD_DISC,
CH_EVT_RCVD_DM,
CH_EVT_RCVD_MSC_CMD,
CH_EVT_RCVD_MSC_RSP,
CH_EVT_RCVD_NSC_RSP,
CH_EVT_RCVD_RLS_CMD,
CH_EVT_RCVD_RLS_RSP,
CH_EVT_RCVD_RPN_CMD,
CH_EVT_RCVD_RPN_REQ,
CH_EVT_RCVD_CREDITS,
CH_EVT_MULTIPLEXER_READY,
CH_EVT_READY_TO_SEND,
} RFCOMM_CHANNEL_EVENT;
typedef struct rfcomm_channel_event {
RFCOMM_CHANNEL_EVENT type;
uint16_t dummy; // force rfcomm_channel_event to be 2-byte aligned -> avoid -Wcast-align warning
} rfcomm_channel_event_t;
typedef struct rfcomm_channel_event_pn {
rfcomm_channel_event_t super;
uint16_t max_frame_size;
uint8_t priority;
uint8_t credits_outgoing;
} rfcomm_channel_event_pn_t;
typedef struct rfcomm_rpn_data { typedef struct rfcomm_rpn_data {
uint8_t baud_rate; uint8_t baud_rate;
uint8_t flags; uint8_t flags;
@ -155,21 +122,6 @@ typedef struct rfcomm_rpn_data {
uint8_t parameter_mask_1; // second byte uint8_t parameter_mask_1; // second byte
} rfcomm_rpn_data_t; } rfcomm_rpn_data_t;
typedef struct rfcomm_channel_event_rpn {
rfcomm_channel_event_t super;
rfcomm_rpn_data_t data;
} rfcomm_channel_event_rpn_t;
typedef struct rfcomm_channel_event_rls {
rfcomm_channel_event_t super;
uint8_t line_status;
} rfcomm_channel_event_rls_t;
typedef struct rfcomm_channel_event_msc {
rfcomm_channel_event_t super;
uint8_t modem_status;
} rfcomm_channel_event_msc_t;
// info regarding potential connections // info regarding potential connections
typedef struct { typedef struct {
// linked list - assert: first field // linked list - assert: first field