From 132fbb280e5213675600791b720a4d91ec8dd359 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 20 Aug 2013 15:52:20 -0700 Subject: [PATCH] monitor: Set default index filter in control handler --- monitor/btsnoop.c | 11 ----------- monitor/control.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/monitor/btsnoop.c b/monitor/btsnoop.c index bcff31757..9cd5282d4 100644 --- a/monitor/btsnoop.c +++ b/monitor/btsnoop.c @@ -205,17 +205,6 @@ int btsnoop_open(const char *path, uint32_t *type) btsnoop_type = ntohl(hdr.type); - switch (btsnoop_type) { - case BTSNOOP_TYPE_HCI: - case BTSNOOP_TYPE_UART: - packet_del_filter(PACKET_FILTER_SHOW_INDEX); - break; - - case BTSNOOP_TYPE_EXTENDED_HCI: - packet_add_filter(PACKET_FILTER_SHOW_INDEX); - break; - } - if (type) *type = btsnoop_type; diff --git a/monitor/control.c b/monitor/control.c index 8db33d685..bd67a0e98 100644 --- a/monitor/control.c +++ b/monitor/control.c @@ -816,6 +816,17 @@ void control_reader(const char *path) if (btsnoop_open(path, &type) < 0) return; + switch (type) { + case BTSNOOP_TYPE_HCI: + case BTSNOOP_TYPE_UART: + packet_del_filter(PACKET_FILTER_SHOW_INDEX); + break; + + case BTSNOOP_TYPE_EXTENDED_HCI: + packet_add_filter(PACKET_FILTER_SHOW_INDEX); + break; + } + open_pager(); while (1) { -- 2.47.3