hcidump: Change includes to use local copy of Bluetooth library

tools/hcidump.c

@@ -39,19 +39,17 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-
 #include <arpa/inet.h>
-#include <netinet/in.h>
 #include <netdb.h>
 
 #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 {

tools/parser/att.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 #define GATT_PRIM_SVC_UUID		0x2800

tools/parser/avctp.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 #include "sdp.h"
 

tools/parser/avdtp.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 static char *si2str(uint8_t si)

tools/parser/avrcp.c

@@ -32,9 +32,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 /* ctype entries */

tools/parser/bnep.c

@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 
 #include <net/ethernet.h>
 

tools/parser/bpa.c

@@ -31,12 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-
 #include "parser.h"
 
 #define BPA_U8(frm)  (get_u8(frm))

tools/parser/capi.c

@@ -32,11 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
-#include <bluetooth/bluetooth.h>
-
 #include "parser.h"
 
 #define CAPI_U8(frm)  (get_u8(frm))

tools/parser/cmtp.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 #define TABLE_SIZE 10

tools/parser/csr.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 #define CSR_U8(frm)  (get_u8(frm))

tools/parser/hci.c

@@ -33,15 +33,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-
 #include "parser.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
 static uint16_t manufacturer = DEFAULT_COMPID;
 

tools/parser/hcrp.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 static char *pid2str(uint16_t pid)

tools/parser/hidp.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 static char *type2str(uint8_t head)

tools/parser/l2cap.c

@@ -32,16 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/l2cap.h>
-
 #include "parser.h"
 #include "sdp.h"
+#include "lib/hci.h"
+#include "lib/l2cap.h"
 
 typedef struct {
 	uint16_t handle;

tools/parser/lmp.c

@@ -30,11 +30,9 @@
 #include <ctype.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-
 #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))))

tools/parser/obex.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 static char *opcode2str(uint8_t opcode)

tools/parser/parser.c

@@ -33,9 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 #include "rfcomm.h"
 

tools/parser/parser.h

@@ -27,9 +27,10 @@
 
 #include <time.h>
 #include <sys/time.h>
-#include <bluetooth/bluetooth.h>
 #include <netinet/in.h>
 
+#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);
 

tools/parser/ppp.c

@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 
 #include "parser.h"
 

tools/parser/rfcomm.c

@@ -32,12 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <bluetooth/bluetooth.h>
-
 #include "parser.h"
 #include "rfcomm.h"
 #include "sdp.h"

tools/parser/sdp.c

@@ -33,9 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 #include "sdp.h"
 

tools/parser/smp.c

@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "parser.h"
 
 /* SMP command codes */

tools/parser/tcpip.c

@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 
 #include <net/ethernet.h>
 #include <netinet/in.h>