Start implementation of RFCOMM decoding layer. Add new service initialize routines...

diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
index e300dd9..4aa1df5 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
+++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
@@ -213,6 +213,10 @@ void Bluetooth_StackInitialized(void)
        printf_P(PSTR("Stack initialized with local address %02X:%02X:%02X:%02X:%02X:%02X.\r\n"),
                 Bluetooth_State.LocalBDADDR[5], Bluetooth_State.LocalBDADDR[4], Bluetooth_State.LocalBDADDR[3],
                 Bluetooth_State.LocalBDADDR[2], Bluetooth_State.LocalBDADDR[1], Bluetooth_State.LocalBDADDR[0]);
+                        
+       /* Reinitialize the services placed on top of the bluetooth stack ready for new connections */
+       SDP_Initialize();
+       RFCOMM_Initialize();
 }
 
 /** Bluetooth stack callback event for a Bluetooth connection request. When this callback fires, the

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
index 052bf3f..2d88077 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
@@ -28,9 +28,76 @@
   this software.\r
 */\r
 \r
+#define  INCLUDE_FROM_RFCOMM_C\r
 #include "RFCOMM.h"\r
 \r
+/** 8-Bit CRC table used by the FCS field of each RFCOMM encoded frame, sourced from the ETSI TS 101 369 V7.2.0\r
+ *  specification document, upon which the RFCOMM specification is based.\r
+ */\r
+const uint8_t CRC8_Table[256] PROGMEM =\r
+       {\r
+               0x00, 0x91, 0xE3, 0x72, 0x07, 0x96, 0xE4, 0x75, 0x0E, 0x9F, 0xED, 0x7C, 0x09, 0x98, 0xEA, 0x7B,\r
+               0x1C, 0x8D, 0xFF, 0x6E, 0x1B, 0x8A, 0xF8, 0x69, 0x12, 0x83, 0xF1, 0x60, 0x15, 0x84, 0xF6, 0x67,\r
+               0x38, 0xA9, 0xDB, 0x4A, 0x3F, 0xAE, 0xDC, 0x4D, 0x36, 0xA7, 0xD5, 0x44, 0x31, 0xA0, 0xD2, 0x43,\r
+               0x24, 0xB5, 0xC7, 0x56, 0x23, 0xB2, 0xC0, 0x51, 0x2A, 0xBB, 0xC9, 0x58, 0x2D, 0xBC, 0xCE, 0x5F,\r
+               0x70, 0xE1, 0x93, 0x02, 0x77, 0xE6, 0x94, 0x05, 0x7E, 0xEF, 0x9D, 0x0C, 0x79, 0xE8, 0x9A, 0x0B,\r
+               0x6C, 0xFD, 0x8F, 0x1E, 0x6B, 0xFA, 0x88, 0x19, 0x62, 0xF3, 0x81, 0x10, 0x65, 0xF4, 0x86, 0x17,\r
+               0x48, 0xD9, 0xAB, 0x3A, 0x4F, 0xDE, 0xAC, 0x3D, 0x46, 0xD7, 0xA5, 0x34, 0x41, 0xD0, 0xA2, 0x33,\r
+               0x54, 0xC5, 0xB7, 0x26, 0x53, 0xC2, 0xB0, 0x21, 0x5A, 0xCB, 0xB9, 0x28, 0x5D, 0xCC, 0xBE, 0x2F,\r
+               0xE0, 0x71, 0x03, 0x92, 0xE7, 0x76, 0x04, 0x95, 0xEE, 0x7F, 0x0D, 0x9C, 0xE9, 0x78, 0x0A, 0x9B,\r
+               0xFC, 0x6D, 0x1F, 0x8E, 0xFB, 0x6A, 0x18, 0x89, 0xF2, 0x63, 0x11, 0x80, 0xF5, 0x64, 0x16, 0x87,\r
+               0xD8, 0x49, 0x3B, 0xAA, 0xDF, 0x4E, 0x3C, 0xAD, 0xD6, 0x47, 0x35, 0xA4, 0xD1, 0x40, 0x32, 0xA3,\r
+               0xC4, 0x55, 0x27, 0xB6, 0xC3, 0x52, 0x20, 0xB1, 0xCA, 0x5B, 0x29, 0xB8, 0xCD, 0x5C, 0x2E, 0xBF,\r
+               0x90, 0x01, 0x73, 0xE2, 0x97, 0x06, 0x74, 0xE5, 0x9E, 0x0F, 0x7D, 0xEC, 0x99, 0x08, 0x7A, 0xEB,\r
+               0x8C, 0x1D, 0x6F, 0xFE, 0x8B, 0x1A, 0x68, 0xF9, 0x82, 0x13, 0x61, 0xF0, 0x85, 0x14, 0x66, 0xF7,\r
+               0xA8, 0x39, 0x4B, 0xDA, 0xAF, 0x3E, 0x4C, 0xDD, 0xA6, 0x37, 0x45, 0xD4, 0xA1, 0x30, 0x42, 0xD3,\r
+               0xB4, 0x25, 0x57, 0xC6, 0xB3, 0x22, 0x50, 0xC1, 0xBA, 0x2B, 0x59, 0xC8, 0xBD, 0x2C, 0x5E, 0xCF\r
+       };\r
+\r
+/** Initializes the RFCOMM service, ready for new connections from a SDP client. */\r
+void RFCOMM_Initialize(void)\r
+{\r
+       /* Not currently used */\r
+}\r
+\r
 void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel)\r
 {\r
-       BT_RFCOMM_DEBUG(1, "PACKET RECEIVED");\r
+       RFCOMM_Header_t* FrameHeader = (RFCOMM_Header_t*)Data;\r
+       \r
+       /* Decode the RFCOMM frame type from the header */\r
+       switch (FrameHeader->FrameType & ~FRAME_POLL_FINAL)\r
+       {\r
+               case RFCOMM_Frame_SABM:\r
+                       BT_RFCOMM_DEBUG(1, "<< SABM Received");\r
+                       break;\r
+               case RFCOMM_Frame_UA:\r
+                       BT_RFCOMM_DEBUG(1, "<< UA Received");\r
+                       break;\r
+               case RFCOMM_Frame_DM:\r
+                       BT_RFCOMM_DEBUG(1, "<< DM Received");\r
+                       break;\r
+               case RFCOMM_Frame_DISC:\r
+                       BT_RFCOMM_DEBUG(1, "<< DISC Received");\r
+                       break;\r
+               case RFCOMM_Frame_UIH:\r
+                       BT_RFCOMM_DEBUG(1, "<< UIH Received");\r
+                       break;\r
+       }\r
 }\r
+\r
+static uint16_t RFCOMM_GetFrameDataLength(void** BufferPos)\r
+{\r
+       uint8_t FirstOctet = *((uint8_t*)*BufferPos);\r
+       (*BufferPos)++;\r
+\r
+       uint8_t SecondOctet = 0;\r
+       \r
+       if (!(FirstOctet & 0x01))\r
+       {\r
+               SecondOctet = *((uint8_t*)*BufferPos);\r
+               (*BufferPos)++;\r
+       }\r
+       \r
+       return (((uint16_t)SecondOctet << 7) | (FirstOctet >> 1));\r
+}\r
+\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h
index 7f1b626..ff04ed5 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h
@@ -38,6 +38,7 @@
 \r
        /* Includes: */\r
                #include <avr/io.h>\r
+               #include <avr/pgmspace.h>\r
                #include <string.h>\r
                #include <stdbool.h>\r
                #include <stdio.h>\r
@@ -50,8 +51,38 @@
        /* Macros: */\r
                #define BT_RFCOMM_DEBUG(l, s, ...)              do { if (RFCOMM_DEBUG_LEVEL >= l) printf_P(PSTR("(RFCOMM) " s "\r\n"), ##__VA_ARGS__); } while (0)\r
                #define RFCOMM_DEBUG_LEVEL                      2\r
+               \r
+               #define FRAME_POLL_FINAL                        (1 << 5)\r
+       \r
+       /* Enums: */\r
+               enum RFCOMM_Frame_Types_t\r
+               {\r
+                       RFCOMM_Frame_SABM  = 0x2F, /**< Set Asynchronous Balance Mode Field */\r
+                       RFCOMM_Frame_UA    = 0x63, /**< Unnumbered Acknowledgement Field */\r
+                       RFCOMM_Frame_DM    = 0x0F, /**< Disconnected Mode Field */\r
+                       RFCOMM_Frame_DISC  = 0x43, /**< Disconnect Field */\r
+                       RFCOMM_Frame_UIH   = 0xEF, /**< Unnumbered Information with Header check Field */\r
+               };\r
+       \r
+       /* Type Defines: */\r
+               typedef struct\r
+               {\r
+                       struct\r
+                       {\r
+                               unsigned char LogicalChannel   : 6;\r
+                               unsigned char CommandResponse  : 1;\r
+                               unsigned char LastAddressOctet : 1;\r
+                       } Header;\r
+                       \r
+                       uint8_t FrameType;\r
+               } RFCOMM_Header_t;\r
 \r
        /* Function Prototypes: */\r
+               void RFCOMM_Initialize(void);\r
                void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel);\r
                \r
+               #if defined(INCLUDE_FROM_RFCOMM_C)\r
+                       static uint16_t RFCOMM_GetFrameDataLength(void** BufferPos);\r
+               #endif\r
+               \r
 #endif\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
index 62d4c5e..c07718e 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
@@ -40,6 +40,12 @@ const ServiceAttributeTable_t* SDP_Services_Table[] PROGMEM =
 /** Base UUID value common to all standardized Bluetooth services */
 const UUID_t BaseUUID PROGMEM = {0x00000000, BASE_80BIT_UUID};
 
+/** Initializes the SDP service, ready for new connections from a SDP client. */
+void SDP_Initialize(void)
+{
+       /* Not currently used */
+}
+
 /** Main Service Discovery Protocol packet processing routine. This function processes incomming SDP packets from
  *  a connected Bluetooth device, and sends back appropriate responses to allow other devices to determine the
  *  services the local device exposes.

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h
index 0010cf1..18592ec 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h
@@ -38,6 +38,7 @@
 
        /* Includes: */
                #include <avr/io.h>
+               #include <avr/pgmspace.h>
                #include <string.h>
                #include <stdbool.h>
                #include <stdio.h>
@@ -210,6 +211,7 @@
                }
                
        /* Function Prototypes: */
+               void SDP_Initialize(void);
                void SDP_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel);
 
                #if defined(INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C)