Commit f5d07946 authored by Dean Camera's avatar Dean Camera
Browse files

Changed the RFCOMM-specific ItemProtocolChannel_t type to a more generic...

Changed the RFCOMM-specific ItemProtocolChannel_t type to a more generic ItemProtocol_8BitParam_t name, and added a new ItemProtocol_16BitParam_t to the SDP protocol type defines.
parent 3125fd5f
...@@ -75,15 +75,15 @@ const struct ...@@ -75,15 +75,15 @@ const struct
*/ */
const struct const struct
{ {
uint8_t Header; uint8_t Header;
uint8_t Size; uint8_t Size;
ItemProtocol_t L2CAP; ItemProtocol_t L2CAP;
ItemProtocolChannel_t RFCOMM; ItemProtocol_8BitParam_t RFCOMM;
} PROGMEM SerialPort_Attribute_ProtocolDescriptor = } PROGMEM SerialPort_Attribute_ProtocolDescriptor =
{ {
(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit), (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
(sizeof(ItemProtocol_t) + sizeof(ItemProtocolChannel_t)), (sizeof(ItemProtocol_t) + sizeof(ItemProtocol_8BitParam_t)),
{ {
(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit), (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
sizeof(ItemUUID_t), sizeof(ItemUUID_t),
......
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
} Protocol; } Protocol;
} ItemProtocol_t; } ItemProtocol_t;
/** Structure for a list of Data Elements Sequences containing UUID Data Elements and 8-bit channel values, for service /** Structure for a list of Data Elements Sequences containing UUID Data Elements and an 8-bit param value, for service
* attributes requiring extended protocol lists. * attributes requiring extended protocol lists containing an 8-bit value.
*/ */
typedef struct typedef struct
{ {
...@@ -156,10 +156,25 @@ ...@@ -156,10 +156,25 @@
struct struct
{ {
ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */ ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
Item8Bit_t Channel; /**< Channel that is to be used to access the service */ Item8Bit_t Param; /**< 8-Bit Parameter associated with the service */
} Protocol; } Protocol;
} ItemProtocolChannel_t; } ItemProtocol_8BitParam_t;
/** Structure for a list of Data Elements Sequences containing UUID Data Elements and an 16-bit param value, for service
* attributes requiring extended protocol lists containing an 16-bit value.
*/
typedef struct
{
uint8_t Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
uint8_t Size; /**< Size of the inner Data Element sequence */
struct
{
ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
Item16Bit_t Channel; /**< 8-Bit Parameter associated with the service */
} Protocol;
} ItemProtocol_16BitParam_t;
/** Structure for a list of Data Elements containing language encodings, including the language ID, Encoding ID and /** Structure for a list of Data Elements containing language encodings, including the language ID, Encoding ID and
* Attribute base offset. * Attribute base offset.
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment