From f5bf07f4994fb23f71e0dff9d082c0b6ff825a1e Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 11 Feb 2014 11:13:59 -0800
Subject: [PATCH] monitor: Use shared btsnoop code wherever possible

---
 monitor/analyze.c |  4 ++--
 monitor/btsnoop.c |  8 ++++----
 monitor/btsnoop.h |  5 ++---
 monitor/control.c | 12 ++++++------
 monitor/ellisys.c |  2 +-
 monitor/packet.c  |  2 +-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/monitor/analyze.c b/monitor/analyze.c
index 93a2978e2..afb6dee13 100644
--- a/monitor/analyze.c
+++ b/monitor/analyze.c
@@ -31,8 +31,8 @@
 
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
+#include "monitor/btsnoop.h"
 #include "monitor/bt.h"
-#include "btsnoop.h"
 #include "analyze.h"
 
 #define MAX_PACKET_SIZE		(1486 + 4)
@@ -264,7 +264,7 @@ void analyze_trace(const char *path)
 	switch (type) {
 	case BTSNOOP_TYPE_HCI:
 	case BTSNOOP_TYPE_UART:
-	case BTSNOOP_TYPE_EXTENDED_HCI:
+	case BTSNOOP_TYPE_MONITOR:
 		break;
 	default:
 		fprintf(stderr, "Unsupported packet format\n");
diff --git a/monitor/btsnoop.c b/monitor/btsnoop.c
index afc19aa4f..fafeff8b5 100644
--- a/monitor/btsnoop.c
+++ b/monitor/btsnoop.c
@@ -165,7 +165,7 @@ void btsnoop_write_hci(struct timeval *tv, uint16_t index, uint16_t opcode,
 			return;
 		break;
 
-	case BTSNOOP_TYPE_EXTENDED_HCI:
+	case BTSNOOP_TYPE_MONITOR:
 		flags = (index << 16) | opcode;
 		break;
 
@@ -188,7 +188,7 @@ void btsnoop_write_phy(struct timeval *tv, uint16_t frequency,
 		return;
 
 	switch (btsnoop_type) {
-	case BTSNOOP_TYPE_EXTENDED_PHY:
+	case BTSNOOP_TYPE_SIMULATOR:
 		flags = (1 << 16) | frequency;
 		break;
 
@@ -330,7 +330,7 @@ int btsnoop_read_hci(struct timeval *tv, uint16_t *index, uint16_t *opcode,
 		*opcode = get_opcode_from_flags(pkt_type, flags);
 		break;
 
-	case BTSNOOP_TYPE_EXTENDED_HCI:
+	case BTSNOOP_TYPE_MONITOR:
 		*index = flags >> 16;
 		*opcode = flags & 0xffff;
 		break;
@@ -385,7 +385,7 @@ int btsnoop_read_phy(struct timeval *tv, uint16_t *frequency,
 	tv->tv_usec = ts % 1000000ll;
 
 	switch (btsnoop_type) {
-	case BTSNOOP_TYPE_EXTENDED_PHY:
+	case BTSNOOP_TYPE_SIMULATOR:
 		if ((flags >> 16) != 1)
 			break;
 		*frequency = flags & 0xffff;
diff --git a/monitor/btsnoop.h b/monitor/btsnoop.h
index b15e30a0f..be4e2ed2f 100644
--- a/monitor/btsnoop.h
+++ b/monitor/btsnoop.h
@@ -29,9 +29,8 @@
 #define BTSNOOP_TYPE_UART		1002
 #define BTSNOOP_TYPE_BCSP		1003
 #define BTSNOOP_TYPE_3WIRE		1004
-
-#define BTSNOOP_TYPE_EXTENDED_HCI	2001
-#define BTSNOOP_TYPE_EXTENDED_PHY	2002
+#define BTSNOOP_TYPE_MONITOR		2001
+#define BTSNOOP_TYPE_SIMULATOR		2002
 
 #define BTSNOOP_OPCODE_NEW_INDEX	0
 #define BTSNOOP_OPCODE_DEL_INDEX	1
diff --git a/monitor/control.c b/monitor/control.c
index 64c697ba7..c132b41b0 100644
--- a/monitor/control.c
+++ b/monitor/control.c
@@ -41,10 +41,10 @@
 #include "lib/mgmt.h"
 
 #include "src/shared/util.h"
+#include "monitor/btsnoop.h"
 #include "mainloop.h"
 #include "display.h"
 #include "packet.h"
-#include "btsnoop.h"
 #include "hcidump.h"
 #include "ellisys.h"
 #include "control.h"
@@ -813,7 +813,7 @@ void control_server(const char *path)
 
 void control_writer(const char *path)
 {
-	btsnoop_create(path, BTSNOOP_TYPE_EXTENDED_HCI);
+	btsnoop_create(path, BTSNOOP_TYPE_MONITOR);
 }
 
 void control_reader(const char *path)
@@ -829,11 +829,11 @@ void control_reader(const char *path)
 	switch (type) {
 	case BTSNOOP_TYPE_HCI:
 	case BTSNOOP_TYPE_UART:
-	case BTSNOOP_TYPE_EXTENDED_PHY:
+	case BTSNOOP_TYPE_SIMULATOR:
 		packet_del_filter(PACKET_FILTER_SHOW_INDEX);
 		break;
 
-	case BTSNOOP_TYPE_EXTENDED_HCI:
+	case BTSNOOP_TYPE_MONITOR:
 		packet_add_filter(PACKET_FILTER_SHOW_INDEX);
 		break;
 	}
@@ -843,7 +843,7 @@ void control_reader(const char *path)
 	switch (type) {
 	case BTSNOOP_TYPE_HCI:
 	case BTSNOOP_TYPE_UART:
-	case BTSNOOP_TYPE_EXTENDED_HCI:
+	case BTSNOOP_TYPE_MONITOR:
 		while (1) {
 			uint16_t index, opcode;
 
@@ -856,7 +856,7 @@ void control_reader(const char *path)
 		}
 		break;
 
-	case BTSNOOP_TYPE_EXTENDED_PHY:
+	case BTSNOOP_TYPE_SIMULATOR:
 		while (1) {
 			uint16_t frequency;
 
diff --git a/monitor/ellisys.c b/monitor/ellisys.c
index 92df447e2..bafbb5d08 100644
--- a/monitor/ellisys.c
+++ b/monitor/ellisys.c
@@ -37,7 +37,7 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 
-#include "btsnoop.h"
+#include "src/shared/btsnoop.h"
 #include "ellisys.h"
 
 static int ellisys_fd = -1;
diff --git a/monitor/packet.c b/monitor/packet.c
index 5c21ba118..6dfeb23e8 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -42,6 +42,7 @@
 #include <bluetooth/hci_lib.h>
 
 #include "src/shared/util.h"
+#include "src/shared/btsnoop.h"
 #include "display.h"
 #include "bt.h"
 #include "ll.h"
@@ -49,7 +50,6 @@
 #include "uuid.h"
 #include "l2cap.h"
 #include "control.h"
-#include "btsnoop.h"
 #include "vendor.h"
 #include "packet.h"
 
-- 
2.47.3