Diff: BTstack/rfcomm.h

Revision:

1:6078e430af82

Parent:

0:1ed23ab1345f

--- a/BTstack/rfcomm.h	Tue Jun 26 14:27:45 2012 +0000
+++ b/BTstack/rfcomm.h	Thu Feb 07 14:01:01 2013 +0000
@@ -102,7 +102,6 @@
     
 } RFCOMM_CHANNEL_STATE;
 
-/*
 typedef enum {
     RFCOMM_CHANNEL_STATE_VAR_NONE            = 0,
     RFCOMM_CHANNEL_STATE_VAR_CLIENT_ACCEPTED = 1 << 0,
@@ -125,31 +124,6 @@
     RFCOMM_CHANNEL_STATE_VAR_SENT_MSC_RSP    = 1 << 14,
     RFCOMM_CHANNEL_STATE_VAR_SENT_CREDITS    = 1 << 15,
 } RFCOMM_CHANNEL_STATE_VAR;
-*/
-
-enum {
-    RFCOMM_CHANNEL_STATE_VAR_NONE            = 0,
-    RFCOMM_CHANNEL_STATE_VAR_CLIENT_ACCEPTED = 1 << 0,
-    RFCOMM_CHANNEL_STATE_VAR_RCVD_PN         = 1 << 1,
-    RFCOMM_CHANNEL_STATE_VAR_RCVD_RPN        = 1 << 2,
-    RFCOMM_CHANNEL_STATE_VAR_RCVD_SABM       = 1 << 3,
-    
-    RFCOMM_CHANNEL_STATE_VAR_RCVD_MSC_CMD    = 1 << 4,
-    RFCOMM_CHANNEL_STATE_VAR_RCVD_MSC_RSP    = 1 << 5,
-    RFCOMM_CHANNEL_STATE_VAR_SEND_PN_RSP     = 1 << 6,
-    RFCOMM_CHANNEL_STATE_VAR_SEND_RPN_INFO   = 1 << 7,
-    
-    RFCOMM_CHANNEL_STATE_VAR_SEND_RPN_RSP    = 1 << 8,
-    RFCOMM_CHANNEL_STATE_VAR_SEND_UA         = 1 << 9,
-    RFCOMM_CHANNEL_STATE_VAR_SEND_MSC_CMD    = 1 << 10,
-    RFCOMM_CHANNEL_STATE_VAR_SEND_MSC_RSP    = 1 << 11,
-    
-    RFCOMM_CHANNEL_STATE_VAR_SEND_CREDITS    = 1 << 12,
-    RFCOMM_CHANNEL_STATE_VAR_SENT_MSC_CMD    = 1 << 13,
-    RFCOMM_CHANNEL_STATE_VAR_SENT_MSC_RSP    = 1 << 14,
-    RFCOMM_CHANNEL_STATE_VAR_SENT_CREDITS    = 1 << 15,
-};
-typedef uint16_t RFCOMM_CHANNEL_STATE_VAR;
 
 typedef enum {
     CH_EVT_RCVD_SABM = 1,
@@ -227,7 +201,7 @@
     timer_source_t   timer;
     int              timer_active;
     
-    RFCOMM_MULTIPLEXER_STATE state;    
+    RFCOMM_MULTIPLEXER_STATE state; 
     
     uint16_t  l2cap_cid;
     uint8_t   l2cap_credits;