diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-06-15 10:09:42 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-06-15 10:09:42 +0000 |
| commit | 1511248394624e564a2742f370849fa6b08ae804 (patch) | |
| tree | b82fe74406288981b8711aec26e08f20a1738829 /Demos/Host/Incomplete/BluetoothHost/Lib | |
| parent | 224f6038e1ed49c68b8380f1f80619bf117aae7a (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1339 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Host/Incomplete/BluetoothHost/Lib')
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c | 10 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h | 23 |
2 files changed, 24 insertions, 9 deletions
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c index 0af592e9..c6dee663 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c @@ -75,15 +75,15 @@ const struct */ const struct { - uint8_t Header; - uint8_t Size; + uint8_t Header; + uint8_t Size; - ItemProtocol_t L2CAP; - ItemProtocolChannel_t RFCOMM; + ItemProtocol_t L2CAP; + ItemProtocol_8BitParam_t RFCOMM; } PROGMEM SerialPort_Attribute_ProtocolDescriptor = { (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), sizeof(ItemUUID_t), diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h index cc3ae32e..dd8af6ec 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h @@ -145,8 +145,8 @@ } Protocol; } ItemProtocol_t; - /** Structure for a list of Data Elements Sequences containing UUID Data Elements and 8-bit channel values, for service - * attributes requiring extended protocol lists. + /** 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 containing an 8-bit value. */ typedef struct { @@ -156,10 +156,25 @@ struct { 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; - } 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 * Attribute base offset. */ |