Changeset 374 for asp3_tinet_ecnl_arm/trunk/btstack/src/sdp_util.c

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

File:

• asp3_tinet_ecnl_arm/trunk/btstack/src/sdp_util.c (modified) (16 diffs)

asp3_tinet_ecnl_arm/trunk/btstack/src/sdp_util.c

@@ -98 +98 @@
             break;
         case DE_SIZE_VAR_16:
-            result = READ_NET_16(header,1);
+            result = big_endian_read_16(header,1);
             break;
         case DE_SIZE_VAR_32:
-            result = READ_NET_32(header,1);
+            result = big_endian_read_32(header,1);
             break;
         default:
@@ -122 +122 @@
 int de_element_get_uint16(uint8_t * element, uint16_t * value){
     if (de_get_size_type(element) != DE_SIZE_16) return 0;
-    *value = READ_NET_16(element, de_get_header_size(element));
+    *value = big_endian_read_16(element, de_get_header_size(element));
     return 1;
 }
@@ -134 +134 @@
     switch (uuidSize){
         case DE_SIZE_16:
-            shortUUID = READ_NET_16(element, 1);
+            shortUUID = big_endian_read_16(element, 1);
             break;
         case DE_SIZE_32:
-            shortUUID = READ_NET_32(element, 1);
+            shortUUID = big_endian_read_32(element, 1);
             break;
         case DE_SIZE_128:
@@ -157 +157 @@
     hasBlueoothBaseUuid = sdp_has_blueooth_base_uuid(uuid128);
     if (!hasBlueoothBaseUuid) return 0;
-    return READ_NET_32(uuid128, 0);
+    return big_endian_read_32(uuid128, 0);
 }
 
@@ -199 +199 @@
 void de_pop_sequence(uint8_t * parent, uint8_t * child){
     int child_len = de_get_len(child);
-    int data_size_parent = READ_NET_16(parent,1);
+    int data_size_parent = big_endian_read_16(parent,1);
     net_store_16(parent, 1, data_size_parent + child_len);
 }
@@ -205 +205 @@
 /* adds a single number value and 16+32 bit UUID to the sequence */
 void de_add_number(uint8_t *seq, de_type_t type, de_size_t size, uint32_t value){
-    int data_size   = READ_NET_16(seq,1);
+    int data_size   = big_endian_read_16(seq,1);
     int element_size = 1;   // e.g. for DE_TYPE_NIL
     de_store_descriptor(seq+3+data_size, type, size);
@@ -231 +231 @@
 /* add a single block of data, e.g. as DE_STRING, DE_URL */
 void de_add_data( uint8_t *seq, de_type_t type, uint16_t size, uint8_t *data){
-    int data_size   = READ_NET_16(seq,1);
+    int data_size   = big_endian_read_16(seq,1);
     if (size > 0xff) {
         // use 16-bit lengh information (3 byte header)
@@ -247 +247 @@
 
 void de_add_uuid128(uint8_t * seq, uint8_t * uuid){
-    int data_size   = READ_NET_16(seq,1);
+    int data_size   = big_endian_read_16(seq,1);
     de_store_descriptor(seq+3+data_size, DE_UUID, DE_SIZE_128);
     memcpy( seq + 4 + data_size, uuid, 16);
@@ -326 +326 @@
         uint8_t done;
         if (idType != DE_UINT || idSize != DE_SIZE_16) break; // wrong type
-        attribute_id = READ_NET_16(element, pos + 1);
+        attribute_id = big_endian_read_16(element, pos + 1);
         pos += 3;
         if (pos >= end_pos) break; // array out of bounds
@@ -349 +349 @@
     switch (size) {
         case DE_SIZE_16:
-            if (READ_NET_16(element, 1) == context->attributeID) {
+            if (big_endian_read_16(element, 1) == context->attributeID) {
                 context->result = 1;
                 return 1;
@@ -355 +355 @@
             break;
         case DE_SIZE_32:
-            if (READ_NET_16(element, 1) <= context->attributeID
-            &&  context->attributeID <= READ_NET_16(element, 3)) {
+            if (big_endian_read_16(element, 1) <= context->attributeID
+            &&  context->attributeID <= big_endian_read_16(element, 3)) {
                 context->result = 1;
                 return 1;
@@ -388 +388 @@
     if (sdp_attribute_list_constains_id(context->attributeIDList, attributeID)) {
         // DES_HEADER(3) + DES_DATA + (UINT16(3) + attribute)
-        uint16_t data_size = READ_NET_16(context->buffer, 1);
+        uint16_t data_size = big_endian_read_16(context->buffer, 1);
         int attribute_len = de_get_len(attributeValue);
         if (3 + data_size + (3 + attribute_len) <= context->maxBytes) {
@@ -662 +662 @@
                 break;
             case DE_SIZE_VAR_16:
-                len = READ_NET_16(element, 1);
+                len = big_endian_read_16(element, 1);
                 break;
             default:
@@ -678 +678 @@
                 break;
             case DE_SIZE_16:
-                                value = READ_NET_16(element,pos);
+                                value = big_endian_read_16(element,pos);
                 break;
             case DE_SIZE_32:
-                                value = READ_NET_32(element,pos);
+                                value = big_endian_read_32(element,pos);
                 break;
             default:
@@ -712 +712 @@
 
         // 0x0001 "Service Class ID List"
-        de_add_number(service,  DE_UINT, DE_SIZE_16, SDP_ServiceClassIDList);
+        de_add_number(service,  DE_UINT, DE_SIZE_16, BLUETOOTH_ATTRIBUTE_SERVICE_CLASS_ID_LIST);
         attribute = de_push_sequence(service);
         {
@@ -720 +720 @@
 
         // 0x0004 "Protocol Descriptor List"
-        de_add_number(service,  DE_UINT, DE_SIZE_16, SDP_ProtocolDescriptorList);
+        de_add_number(service,  DE_UINT, DE_SIZE_16, BLUETOOTH_ATTRIBUTE_PROTOCOL_DESCRIPTOR_LIST);
         attribute = de_push_sequence(service);
         {