monitor: Fix HCI command naming from Bluetooth 4.1 specification

diff --git a/monitor/bt.h b/monitor/bt.h
index 9e88dff..2d2684b 100644 (file)
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -290,8 +290,8 @@ struct bt_hci_cmd_setup_sync_conn {
        uint16_t pkt_type;
 } __attribute__ ((packed));
 
-#define BT_HCI_CMD_ACCEPT_SYNC_CONN            0x0429
-struct bt_hci_cmd_accept_sync_conn {
+#define BT_HCI_CMD_ACCEPT_SYNC_CONN_REQUEST    0x0429
+struct bt_hci_cmd_accept_sync_conn_request {
        uint8_t  bdaddr[6];
        uint32_t tx_bandwidth;
        uint32_t rx_bandwidth;
@@ -301,8 +301,8 @@ struct bt_hci_cmd_accept_sync_conn {
        uint16_t pkt_type;
 } __attribute__ ((packed));
 
-#define BT_HCI_CMD_REJECT_SYNC_CONN            0x042a
-struct bt_hci_cmd_reject_sync_conn {
+#define BT_HCI_CMD_REJECT_SYNC_CONN_REQUEST    0x042a
+struct bt_hci_cmd_reject_sync_conn_request {
        uint8_t  bdaddr[6];
        uint8_t  reason;
 } __attribute__ ((packed));

diff --git a/monitor/packet.c b/monitor/packet.c
index 3345065..76fa9f1 100644 (file)
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -3107,9 +3107,9 @@ static void setup_sync_conn_cmd(const void *data, uint8_t size)
        print_pkt_type(cmd->pkt_type);
 }
 
-static void accept_sync_conn_cmd(const void *data, uint8_t size)
+static void accept_sync_conn_request_cmd(const void *data, uint8_t size)
 {
-       const struct bt_hci_cmd_accept_sync_conn *cmd = data;
+       const struct bt_hci_cmd_accept_sync_conn_request *cmd = data;
 
        print_bdaddr(cmd->bdaddr);
        print_field("Transmit bandwidth: %d", btohl(cmd->tx_bandwidth));
@@ -3120,9 +3120,9 @@ static void accept_sync_conn_cmd(const void *data, uint8_t size)
        print_pkt_type(cmd->pkt_type);
 }
 
-static void reject_sync_conn_cmd(const void *data, uint8_t size)
+static void reject_sync_conn_request_cmd(const void *data, uint8_t size)
 {
-       const struct bt_hci_cmd_reject_sync_conn *cmd = data;
+       const struct bt_hci_cmd_reject_sync_conn_request *cmd = data;
 
        print_bdaddr(cmd->bdaddr);
        print_reason(cmd->reason);
@@ -5048,10 +5048,10 @@ static const struct opcode_data opcode_table[] = {
                                read_lmp_handle_rsp, 8, true },
        { 0x0428, 131, "Setup Synchronous Connection",
                                setup_sync_conn_cmd, 17, true },
-       { 0x0429, 132, "Accept Synchronous Connection",
-                               accept_sync_conn_cmd, 21, true },
-       { 0x042a, 133, "Reject Synchronous Connection",
-                               reject_sync_conn_cmd, 7, true },
+       { 0x0429, 132, "Accept Synchronous Connection Request",
+                               accept_sync_conn_request_cmd, 21, true },
+       { 0x042a, 133, "Reject Synchronous Connection Request",
+                               reject_sync_conn_request_cmd, 7, true },
        { 0x042b, 151, "IO Capability Request Reply",
                                io_capability_request_reply_cmd, 9, true,
                                status_bdaddr_rsp, 7, true },
@@ -5094,7 +5094,7 @@ static const struct opcode_data opcode_table[] = {
        { 0x043c, 175, "Flow Specifcation Modify",
                                flow_spec_modify_cmd, 34, true },
        { 0x043d, 235, "Enhanced Setup Synchronous Connection" },
-       { 0x043e, 236, "Enhanced Accept Synchronous Connection" },
+       { 0x043e, 236, "Enhanced Accept Synchronous Connection Request" },
        { 0x043f, 246, "Truncated Page" },
        { 0x0440, 247, "Truncated Page Cancel" },
        { 0x0441, 248, "Set Connectionless Slave Broadcast" },