Changeset 374 for asp3_tinet_ecnl_arm/trunk/btstack/src/sdp.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.c (modified) (9 diffs)

asp3_tinet_ecnl_arm/trunk/btstack/src/sdp.c

@@ -90 +90 @@
     if (de_get_element_type(serviceRecordHandleAttribute) != DE_UINT) return 0;
     if (de_get_size_type(serviceRecordHandleAttribute) != DE_SIZE_32) return 0;
-    return READ_NET_32(serviceRecordHandleAttribute, 1);
+    return big_endian_read_32(serviceRecordHandleAttribute, 1);
 }
 
@@ -100 +100 @@
     event[1] = sizeof(event) - 2;
     event[2] = status;
-    bt_store_32(event, 3, handle);
+    little_endian_store_32(event, 3, handle);
     hci_dump_packet(HCI_EVENT_PACKET, 0, event, sizeof(event));
     (*app_packet_handler)(connection, HCI_EVENT_PACKET, 0, (uint8_t *) event, sizeof(event));
@@ -275 +275 @@
 
     // get request details
-    uint16_t  transaction_id = READ_NET_16(packet, 1);
-    // not used yet - uint16_t  param_len = READ_NET_16(packet, 3);
+    uint16_t  transaction_id = big_endian_read_16(packet, 1);
+    // not used yet - uint16_t  param_len = big_endian_read_16(packet, 3);
     uint8_t * serviceSearchPattern = &packet[5];
     uint16_t  serviceSearchPatternLen = de_get_len(serviceSearchPattern);
-    uint16_t  maximumServiceRecordCount = READ_NET_16(packet, 5 + serviceSearchPatternLen);
+    uint16_t  maximumServiceRecordCount = big_endian_read_16(packet, 5 + serviceSearchPatternLen);
     uint8_t * continuationState = &packet[5+serviceSearchPatternLen+2];
 
@@ -297 +297 @@
     continuation_index = 0;
     if (continuationState[0] == 2){
-        continuation_index = READ_NET_16(continuationState, 1);
+        continuation_index = big_endian_read_16(continuationState, 1);
     }
 
@@ -359 +359 @@
 
     // get request details
-    uint16_t  transaction_id = READ_NET_16(packet, 1);
-    // not used yet - uint16_t  param_len = READ_NET_16(packet, 3);
-    uint32_t  serviceRecordHandle = READ_NET_32(packet, 5);
-    uint16_t  maximumAttributeByteCount = READ_NET_16(packet, 9);
+    uint16_t  transaction_id = big_endian_read_16(packet, 1);
+    // not used yet - uint16_t  param_len = big_endian_read_16(packet, 3);
+    uint32_t  serviceRecordHandle = big_endian_read_32(packet, 5);
+    uint16_t  maximumAttributeByteCount = big_endian_read_16(packet, 9);
     uint8_t * attributeIDList = &packet[11];
     uint16_t  attributeIDListLen = de_get_len(attributeIDList);
@@ -383 +383 @@
     continuation_offset = 0;
     if (continuationState[0] == 2){
-        continuation_offset = READ_NET_16(continuationState, 1);
+        continuation_offset = big_endian_read_16(continuationState, 1);
     }
 
@@ -452 +452 @@
 
     // get request details
-    uint16_t  transaction_id = READ_NET_16(packet, 1);
-    // not used yet - uint16_t  param_len = READ_NET_16(packet, 3);
+    uint16_t  transaction_id = big_endian_read_16(packet, 1);
+    // not used yet - uint16_t  param_len = big_endian_read_16(packet, 3);
     uint8_t * serviceSearchPattern = &packet[5];
     uint16_t  serviceSearchPatternLen = de_get_len(serviceSearchPattern);
-    uint16_t  maximumAttributeByteCount = READ_NET_16(packet, 5 + serviceSearchPatternLen);
+    uint16_t  maximumAttributeByteCount = big_endian_read_16(packet, 5 + serviceSearchPatternLen);
     uint8_t * attributeIDList = &packet[5+serviceSearchPatternLen+2];
     uint16_t  attributeIDListLen = de_get_len(attributeIDList);
@@ -481 +481 @@
     continuation_offset = 0;
     if (continuationState[0] == 4){
-        continuation_service_index = READ_NET_16(continuationState, 1);
-        continuation_offset = READ_NET_16(continuationState, 3);
+        continuation_service_index = big_endian_read_16(continuationState, 1);
+        continuation_offset = big_endian_read_16(continuationState, 3);
     }
 
@@ -593 +593 @@
         case L2CAP_DATA_PACKET:
             pdu_id = (SDP_PDU_ID_t) packet[0];
-            transaction_id = READ_NET_16(packet, 1);
-            // param_len = READ_NET_16(packet, 3);
+            transaction_id = big_endian_read_16(packet, 1);
+            // param_len = big_endian_read_16(packet, 3);
             remote_mtu = l2cap_get_remote_mtu_for_local_cid(channel);
             // account for our buffer