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

asp3_tinet_ecnl_arm/trunk/btstack/src/sdp_client.c

@@ -151 +151 @@
 static void parse_service_search_attribute_response(uint8_t* packet){
     uint16_t offset = 3;
-    uint16_t parameterLength = READ_NET_16(packet,offset);
+    uint16_t parameterLength = big_endian_read_16(packet,offset);
     uint16_t attributeListByteCount;
     offset+=2;
     // AttributeListByteCount <= mtu
-    attributeListByteCount = READ_NET_16(packet,offset);
+    attributeListByteCount = big_endian_read_16(packet,offset);
     offset+=2;
 
@@ -185 +185 @@
     // uint16_t handle;
     if (packet_type == L2CAP_DATA_PACKET){
-        uint16_t responseTransactionID = READ_NET_16(packet,1);
+        uint16_t responseTransactionID = big_endian_read_16(packet,1);
         if ( responseTransactionID != transactionID){
             log_error("Missmatching transaction ID, expected %u, found %u.", transactionID, responseTransactionID);
@@ -247 +247 @@
             }
             sdp_cid = channel;
-            mtu = READ_BT_16(packet, 17);
-            // handle = READ_BT_16(packet, 9);
+            mtu = little_endian_read_16(packet, 17);
+            // handle = little_endian_read_16(packet, 9);
             log_info("SDP Client Connected, cid %x, mtu %u.", sdp_cid, mtu);
 
@@ -261 +261 @@
         case L2CAP_EVENT_CHANNEL_CLOSED: {
             uint8_t status;
-            if (sdp_cid != READ_BT_16(packet, 2)) {
-                // log_info("Received L2CAP_EVENT_CHANNEL_CLOSED for cid %x, current cid %x\n",  READ_BT_16(packet, 2),sdp_cid);
+            if (sdp_cid != little_endian_read_16(packet, 2)) {
+                // log_info("Received L2CAP_EVENT_CHANNEL_CLOSED for cid %x, current cid %x\n",  little_endian_read_16(packet, 2),sdp_cid);
                 break;
             }
@@ -402 +402 @@
 static void parse_service_search_response(uint8_t* packet){
     uint16_t offset = 3;
-    uint16_t parameterLength = READ_NET_16(packet,offset);
+    uint16_t parameterLength = big_endian_read_16(packet,offset);
     uint16_t totalServiceRecordCount;
     uint16_t currentServiceRecordCount;
     offset+=2;
 
-    totalServiceRecordCount = READ_NET_16(packet,offset);
-    offset+=2;
-
-    currentServiceRecordCount = READ_NET_16(packet,offset);
+    totalServiceRecordCount = big_endian_read_16(packet,offset);
+    offset+=2;
+
+    currentServiceRecordCount = big_endian_read_16(packet,offset);
     offset+=2;
     if (currentServiceRecordCount > totalServiceRecordCount){
@@ -436 +436 @@
 static void parse_service_attribute_response(uint8_t* packet){
     uint16_t offset = 3;
-    uint16_t parameterLength = READ_NET_16(packet,offset);
+    uint16_t parameterLength = big_endian_read_16(packet,offset);
         uint16_t attributeListByteCount;
     offset+=2;
 
     // AttributeListByteCount <= mtu
-    attributeListByteCount = READ_NET_16(packet,offset);
+    attributeListByteCount = big_endian_read_16(packet,offset);
     offset+=2;