diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2015-11-08 07:16:52 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-11-08 07:16:52 +0100 |
commit | d433736ed51b19542ad7917df1f21e7e172ab173 (patch) | |
tree | db015bbca9bd53e7e7dc6f4a750dbb4aaadc6d75 /monitor/control.c | |
parent | 60824d67a2b7a8970ec8163b15fdd3448476b5b7 (diff) | |
download | bluez-d433736ed51b19542ad7917df1f21e7e172ab173.tar.gz |
btsnoop: Update file format identifiers for trace files
Diffstat (limited to 'monitor/control.c')
-rw-r--r-- | monitor/control.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/monitor/control.c b/monitor/control.c index 00a60bc2f..b3fc93d37 100644 --- a/monitor/control.c +++ b/monitor/control.c @@ -1159,7 +1159,7 @@ void control_server(const char *path) bool control_writer(const char *path) { - btsnoop_file = btsnoop_create(path, BTSNOOP_TYPE_MONITOR); + btsnoop_file = btsnoop_create(path, BTSNOOP_FORMAT_MONITOR); return !!btsnoop_file; } @@ -1168,33 +1168,33 @@ void control_reader(const char *path) { unsigned char buf[BTSNOOP_MAX_PACKET_SIZE]; uint16_t pktlen; - uint32_t type; + uint32_t format; struct timeval tv; btsnoop_file = btsnoop_open(path, BTSNOOP_FLAG_PKLG_SUPPORT); if (!btsnoop_file) return; - type = btsnoop_get_type(btsnoop_file); + format = btsnoop_get_format(btsnoop_file); - switch (type) { - case BTSNOOP_TYPE_HCI: - case BTSNOOP_TYPE_UART: - case BTSNOOP_TYPE_SIMULATOR: + switch (format) { + case BTSNOOP_FORMAT_HCI: + case BTSNOOP_FORMAT_UART: + case BTSNOOP_FORMAT_SIMULATOR: packet_del_filter(PACKET_FILTER_SHOW_INDEX); break; - case BTSNOOP_TYPE_MONITOR: + case BTSNOOP_FORMAT_MONITOR: packet_add_filter(PACKET_FILTER_SHOW_INDEX); break; } open_pager(); - switch (type) { - case BTSNOOP_TYPE_HCI: - case BTSNOOP_TYPE_UART: - case BTSNOOP_TYPE_MONITOR: + switch (format) { + case BTSNOOP_FORMAT_HCI: + case BTSNOOP_FORMAT_UART: + case BTSNOOP_FORMAT_MONITOR: while (1) { uint16_t index, opcode; @@ -1210,7 +1210,7 @@ void control_reader(const char *path) } break; - case BTSNOOP_TYPE_SIMULATOR: + case BTSNOOP_FORMAT_SIMULATOR: while (1) { uint16_t frequency; |