Changeset 374 for asp3_tinet_ecnl_rx/trunk/btstack/include/btstack/utils.h

Timestamp:

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

Author:

coas-nagasima

Message:

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

File:

• asp3_tinet_ecnl_rx/trunk/btstack/include/btstack/utils.h (modified) (3 diffs)

asp3_tinet_ecnl_rx/trunk/btstack/include/btstack/utils.h

@@ -90 +90 @@
 
 // helper for BT little endian format
-#define READ_BT_16( buffer, pos) ( ((uint16_t) buffer[pos]) | (((uint16_t)buffer[pos+1]) << 8))
-#define READ_BT_24( buffer, pos) ( ((uint32_t) buffer[pos]) | (((uint32_t)buffer[pos+1]) << 8) | (((uint32_t)buffer[pos+2]) << 16))
-#define READ_BT_32( buffer, pos) ( ((uint32_t) buffer[pos]) | (((uint32_t)buffer[pos+1]) << 8) | (((uint32_t)buffer[pos+2]) << 16) | (((uint32_t) buffer[pos+3])) << 24)
+#define little_endian_read_16( buffer, pos) ( ((uint16_t) buffer[pos]) | (((uint16_t)buffer[pos+1]) << 8))
+#define little_endian_read_24( buffer, pos) ( ((uint32_t) buffer[pos]) | (((uint32_t)buffer[pos+1]) << 8) | (((uint32_t)buffer[pos+2]) << 16))
+#define little_endian_read_32( buffer, pos) ( ((uint32_t) buffer[pos]) | (((uint32_t)buffer[pos+1]) << 8) | (((uint32_t)buffer[pos+2]) << 16) | (((uint32_t) buffer[pos+3])) << 24)
 
 // helper for SDP big endian format
-#define READ_NET_16( buffer, pos) ( ((uint16_t) buffer[pos+1]) | (((uint16_t)buffer[pos  ]) << 8))
-#define READ_NET_32( buffer, pos) ( ((uint32_t) buffer[pos+3]) | (((uint32_t)buffer[pos+2]) << 8) | (((uint32_t)buffer[pos+1]) << 16) | (((uint32_t) buffer[pos])) << 24)
+#define big_endian_read_16( buffer, pos) ( ((uint16_t) buffer[pos+1]) | (((uint16_t)buffer[pos  ]) << 8))
+#define big_endian_read_32( buffer, pos) ( ((uint32_t) buffer[pos+3]) | (((uint32_t)buffer[pos+2]) << 8) | (((uint32_t)buffer[pos+1]) << 16) | (((uint32_t) buffer[pos])) << 24)
 
 // HCI CMD OGF/OCF
@@ -103 +103 @@
 
 // check if command complete event for given command
-#define COMMAND_COMPLETE_EVENT(event,cmd) ( event[0] == HCI_EVENT_COMMAND_COMPLETE && READ_BT_16(event,3) == cmd.opcode)
-#define COMMAND_STATUS_EVENT(event,cmd) ( event[0] == HCI_EVENT_COMMAND_STATUS && READ_BT_16(event,4) == cmd.opcode)
+#define HCI_EVENT_IS_COMMAND_COMPLETE(event,cmd) ( event[0] == HCI_EVENT_COMMAND_COMPLETE && little_endian_read_16(event,3) == cmd.opcode)
+#define COMMAND_STATUS_EVENT(event,cmd) ( event[0] == HCI_EVENT_COMMAND_STATUS && little_endian_read_16(event,4) == cmd.opcode)
 
 // Code+Len=2, Pkts+Opcode=3; total=5
@@ -110 +110 @@
 
 // ACL Packet
-#define READ_ACL_CONNECTION_HANDLE( buffer ) ( READ_BT_16(buffer,0) & 0x0fff)
+#define READ_ACL_CONNECTION_HANDLE( buffer ) ( little_endian_read_16(buffer,0) & 0x0fff)
 #define READ_ACL_FLAGS( buffer )      ( buffer[1] >> 4 )
-#define READ_ACL_LENGTH( buffer )     (READ_BT_16(buffer, 2))
+#define READ_ACL_LENGTH( buffer )     (little_endian_read_16(buffer, 2))
 
 // L2CAP Packet
-#define READ_L2CAP_LENGTH(buffer)     ( READ_BT_16(buffer, 4))
-#define READ_L2CAP_CHANNEL_ID(buffer) ( READ_BT_16(buffer, 6))
+#define READ_L2CAP_LENGTH(buffer)     ( little_endian_read_16(buffer, 4))
+#define READ_L2CAP_CHANNEL_ID(buffer) ( little_endian_read_16(buffer, 6))
 
-void bt_store_16(uint8_t *buffer, uint16_t pos, uint16_t value);
-void bt_store_32(uint8_t *buffer, uint16_t pos, uint32_t value);
-void bt_flip_addr(bd_addr_t dest, bd_addr_t src);
+void little_endian_store_16(uint8_t *buffer, uint16_t pos, uint16_t value);
+void little_endian_store_32(uint8_t *buffer, uint16_t pos, uint32_t value);
+void reverse_bd_addr(bd_addr_t src, bd_addr_t dest);
 
 void net_store_16(uint8_t *buffer, uint16_t pos, uint16_t value);