From dc2bd913f773a8b3a54ebaa2c549c6da318e0c05 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 31 Aug 2011 00:57:30 -0700 Subject: [PATCH] hcidump: Change includes to use local copy of Bluetooth library --- tools/hcidump.c | 12 +++++------- tools/parser/att.c | 3 --- tools/parser/avctp.c | 3 --- tools/parser/avdtp.c | 3 --- tools/parser/avrcp.c | 3 --- tools/parser/bnep.c | 1 - tools/parser/bpa.c | 6 ------ tools/parser/capi.c | 5 ----- tools/parser/cmtp.c | 3 --- tools/parser/csr.c | 3 --- tools/parser/hci.c | 10 ++-------- tools/parser/hcrp.c | 3 --- tools/parser/hidp.c | 3 --- tools/parser/l2cap.c | 10 ++-------- tools/parser/lmp.c | 6 ++---- tools/parser/obex.c | 3 --- tools/parser/parser.c | 3 --- tools/parser/parser.h | 5 +++-- tools/parser/ppp.c | 1 - tools/parser/rfcomm.c | 6 ------ tools/parser/sdp.c | 3 --- tools/parser/smp.c | 3 --- tools/parser/tcpip.c | 1 - 23 files changed, 14 insertions(+), 85 deletions(-) diff --git a/tools/hcidump.c b/tools/hcidump.c index 089d05c42..7c05926cd 100644 --- a/tools/hcidump.c +++ b/tools/hcidump.c @@ -39,19 +39,17 @@ #include #include -#include -#include -#include - #include -#include #include #include "parser.h" #include "sdp.h" -#define SNAP_LEN HCI_MAX_FRAME_SIZE -#define DEFAULT_PORT "10839"; +#include "lib/hci.h" +#include "lib/hci_lib.h" + +#define SNAP_LEN HCI_MAX_FRAME_SIZE +#define DEFAULT_PORT "10839" /* Modes */ enum { diff --git a/tools/parser/att.c b/tools/parser/att.c index d9cb335bc..4f24b6f03 100644 --- a/tools/parser/att.c +++ b/tools/parser/att.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" #define GATT_PRIM_SVC_UUID 0x2800 diff --git a/tools/parser/avctp.c b/tools/parser/avctp.c index fc6f79641..2da4c095c 100644 --- a/tools/parser/avctp.c +++ b/tools/parser/avctp.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" #include "sdp.h" diff --git a/tools/parser/avdtp.c b/tools/parser/avdtp.c index 6836058bb..5a2ee559c 100644 --- a/tools/parser/avdtp.c +++ b/tools/parser/avdtp.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" static char *si2str(uint8_t si) diff --git a/tools/parser/avrcp.c b/tools/parser/avrcp.c index f8e44433c..df9da3827 100644 --- a/tools/parser/avrcp.c +++ b/tools/parser/avrcp.c @@ -32,9 +32,6 @@ #include #include -#include -#include - #include "parser.h" /* ctype entries */ diff --git a/tools/parser/bnep.c b/tools/parser/bnep.c index d9048a9fd..d9e958d77 100644 --- a/tools/parser/bnep.c +++ b/tools/parser/bnep.c @@ -31,7 +31,6 @@ #include #include #include -#include #include diff --git a/tools/parser/bpa.c b/tools/parser/bpa.c index 016f1bd41..207397f49 100644 --- a/tools/parser/bpa.c +++ b/tools/parser/bpa.c @@ -31,12 +31,6 @@ #include #include -#include -#include - -#include -#include - #include "parser.h" #define BPA_U8(frm) (get_u8(frm)) diff --git a/tools/parser/capi.c b/tools/parser/capi.c index f8cba3eb3..97abc4c12 100644 --- a/tools/parser/capi.c +++ b/tools/parser/capi.c @@ -32,11 +32,6 @@ #include #include -#include -#include - -#include - #include "parser.h" #define CAPI_U8(frm) (get_u8(frm)) diff --git a/tools/parser/cmtp.c b/tools/parser/cmtp.c index 7c4eb0816..ac5cf8406 100644 --- a/tools/parser/cmtp.c +++ b/tools/parser/cmtp.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" #define TABLE_SIZE 10 diff --git a/tools/parser/csr.c b/tools/parser/csr.c index 47954e2c2..1a63ae095 100644 --- a/tools/parser/csr.c +++ b/tools/parser/csr.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" #define CSR_U8(frm) (get_u8(frm)) diff --git a/tools/parser/hci.c b/tools/parser/hci.c index f41eec222..634dbc520 100644 --- a/tools/parser/hci.c +++ b/tools/parser/hci.c @@ -33,15 +33,9 @@ #include #include -#include -#include -#include - -#include -#include -#include - #include "parser.h" +#include "lib/hci.h" +#include "lib/hci_lib.h" static uint16_t manufacturer = DEFAULT_COMPID; diff --git a/tools/parser/hcrp.c b/tools/parser/hcrp.c index 45afc254e..0a16a226c 100644 --- a/tools/parser/hcrp.c +++ b/tools/parser/hcrp.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" static char *pid2str(uint16_t pid) diff --git a/tools/parser/hidp.c b/tools/parser/hidp.c index 0d72f3e3d..6039eb9b5 100644 --- a/tools/parser/hidp.c +++ b/tools/parser/hidp.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" static char *type2str(uint8_t head) diff --git a/tools/parser/l2cap.c b/tools/parser/l2cap.c index 65a997930..82b2e9ba6 100644 --- a/tools/parser/l2cap.c +++ b/tools/parser/l2cap.c @@ -32,16 +32,10 @@ #include #include -#include -#include -#include - -#include -#include -#include - #include "parser.h" #include "sdp.h" +#include "lib/hci.h" +#include "lib/l2cap.h" typedef struct { uint16_t handle; diff --git a/tools/parser/lmp.c b/tools/parser/lmp.c index ed2ff5c93..c303c1b98 100644 --- a/tools/parser/lmp.c +++ b/tools/parser/lmp.c @@ -30,11 +30,9 @@ #include #include -#include -#include -#include - #include "parser.h" +#include "lib/hci.h" +#include "lib/hci_lib.h" #define LMP_U8(frm) (get_u8(frm)) #define LMP_U16(frm) (btohs(htons(get_u16(frm)))) diff --git a/tools/parser/obex.c b/tools/parser/obex.c index 9cc08288e..66b7eff91 100644 --- a/tools/parser/obex.c +++ b/tools/parser/obex.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" static char *opcode2str(uint8_t opcode) diff --git a/tools/parser/parser.c b/tools/parser/parser.c index f91b63b13..de8dbe870 100644 --- a/tools/parser/parser.c +++ b/tools/parser/parser.c @@ -33,9 +33,6 @@ #include #include -#include -#include - #include "parser.h" #include "rfcomm.h" diff --git a/tools/parser/parser.h b/tools/parser/parser.h index cf4003478..e975808be 100644 --- a/tools/parser/parser.h +++ b/tools/parser/parser.h @@ -27,9 +27,10 @@ #include #include -#include #include +#include "lib/bluetooth.h" + struct frame { void *data; uint32_t data_len; @@ -107,7 +108,7 @@ struct parser_t { extern struct parser_t parser; -void init_parser(unsigned long flags, unsigned long filter, +void init_parser(unsigned long flags, unsigned long filter, unsigned short defpsm, unsigned short defcompid, int pppdump_fd, int audio_fd); diff --git a/tools/parser/ppp.c b/tools/parser/ppp.c index 99165c4b7..947ca564c 100644 --- a/tools/parser/ppp.c +++ b/tools/parser/ppp.c @@ -30,7 +30,6 @@ #include #include #include -#include #include "parser.h" diff --git a/tools/parser/rfcomm.c b/tools/parser/rfcomm.c index 25e7ae156..f0e53257d 100644 --- a/tools/parser/rfcomm.c +++ b/tools/parser/rfcomm.c @@ -32,12 +32,6 @@ #include #include -#include -#include -#include - -#include - #include "parser.h" #include "rfcomm.h" #include "sdp.h" diff --git a/tools/parser/sdp.c b/tools/parser/sdp.c index e3a65e3ac..b48e3ff10 100644 --- a/tools/parser/sdp.c +++ b/tools/parser/sdp.c @@ -33,9 +33,6 @@ #include #include -#include -#include - #include "parser.h" #include "sdp.h" diff --git a/tools/parser/smp.c b/tools/parser/smp.c index 4fa8dd128..c81b585eb 100644 --- a/tools/parser/smp.c +++ b/tools/parser/smp.c @@ -31,9 +31,6 @@ #include #include -#include -#include - #include "parser.h" /* SMP command codes */ diff --git a/tools/parser/tcpip.c b/tools/parser/tcpip.c index 906200893..6f2c3cba1 100644 --- a/tools/parser/tcpip.c +++ b/tools/parser/tcpip.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include -- 2.47.3