From c3fb66e7b4b7cb5994ef8df1cf90d6759b21e415 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 20 Aug 2013 15:45:49 -0700 Subject: [PATCH] monitor: Use constants for btsnoop datalink types --- monitor/btsnoop.c | 18 +++++++++--------- monitor/btsnoop.h | 7 +++++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/monitor/btsnoop.c b/monitor/btsnoop.c index 79997c4e0..bcff31757 100644 --- a/monitor/btsnoop.c +++ b/monitor/btsnoop.c @@ -90,7 +90,7 @@ void btsnoop_create(const char *path) if (btsnoop_fd < 0) return; - btsnoop_type = 2001; + btsnoop_type = BTSNOOP_TYPE_EXTENDED_HCI; memcpy(hdr.id, btsnoop_id, sizeof(btsnoop_id)); hdr.version = htonl(btsnoop_version); @@ -142,7 +142,7 @@ void btsnoop_write(struct timeval *tv, uint16_t index, uint16_t opcode, return; switch (btsnoop_type) { - case 1001: + case BTSNOOP_TYPE_HCI: if (btsnoop_index == 0xffff) btsnoop_index = index; @@ -154,7 +154,7 @@ void btsnoop_write(struct timeval *tv, uint16_t index, uint16_t opcode, return; break; - case 2001: + case BTSNOOP_TYPE_EXTENDED_HCI: flags = (index << 16) | opcode; break; @@ -206,12 +206,12 @@ int btsnoop_open(const char *path, uint32_t *type) btsnoop_type = ntohl(hdr.type); switch (btsnoop_type) { - case 1001: - case 1002: + case BTSNOOP_TYPE_HCI: + case BTSNOOP_TYPE_UART: packet_del_filter(PACKET_FILTER_SHOW_INDEX); break; - case 2001: + case BTSNOOP_TYPE_EXTENDED_HCI: packet_add_filter(PACKET_FILTER_SHOW_INDEX); break; } @@ -253,12 +253,12 @@ int btsnoop_read(struct timeval *tv, uint16_t *index, uint16_t *opcode, tv->tv_usec = ts % 1000000ll; switch (btsnoop_type) { - case 1001: + case BTSNOOP_TYPE_HCI: *index = 0; *opcode = packet_get_opcode(0xff, flags); break; - case 1002: + case BTSNOOP_TYPE_UART: len = read(btsnoop_fd, &pkt_type, 1); if (len < 0) { perror("Failed to read packet type"); @@ -272,7 +272,7 @@ int btsnoop_read(struct timeval *tv, uint16_t *index, uint16_t *opcode, *opcode = packet_get_opcode(pkt_type, flags); break; - case 2001: + case BTSNOOP_TYPE_EXTENDED_HCI: *index = flags >> 16; *opcode = flags & 0xffff; break; diff --git a/monitor/btsnoop.h b/monitor/btsnoop.h index cec976158..de0bd9aac 100644 --- a/monitor/btsnoop.h +++ b/monitor/btsnoop.h @@ -24,6 +24,13 @@ #include +#define BTSNOOP_TYPE_HCI 1001 +#define BTSNOOP_TYPE_UART 1002 +#define BTSNOOP_TYPE_BCSP 1003 +#define BTSNOOP_TYPE_3WIRE 1004 + +#define BTSNOOP_TYPE_EXTENDED_HCI 2001 + void btsnoop_create(const char *path); void btsnoop_write(struct timeval *tv, uint16_t index, uint16_t opcode, const void *data, uint16_t size); -- 2.47.3