Mode few Bluetooth defines into system include files

Reviewed by:	imp

6 files changed, 6 insertions, 22 deletions

diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 1cb0c4b..3ed472e 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -145,6 +145,7 @@ product 3COM 3CRWE737A		0x0001 3Com AirConnect Wireless LAN
 product 3COM 3CXM056BNW		0x002f 3Com/NoteWorthy 3CXM056-BNW 56K Modem
 product 3COM 3CXEM556		0x0035 3Com/Megahertz 3CXEM556 Ethernet/Modem
 product 3COM 3CXEM556INT	0x003d 3Com/Megahertz 3CXEM556-INT Ethernet/Modem
+product 3COM 3CRWB609		0x0400 3Com Bluetooth PC Card 3CRWB60-A
 product 3COM 3CCFEM556BI	0x0556 3Com/Megahertz 3CCFEM556BI Ethernet/Modem
 product 3COM 3C562		0x0562 3Com 3c562 33.6 Modem/10Mbps Ethernet
 product 3COM 3C589		0x0589 3Com 3c589 10Mbps Ethernet
diff --git a/sys/netgraph/bluetooth/include/ng_bt3c.h b/sys/netgraph/bluetooth/include/ng_bt3c.h
index 88084a2..2af1837 100644
--- a/sys/netgraph/bluetooth/include/ng_bt3c.h
+++ b/sys/netgraph/bluetooth/include/ng_bt3c.h
@@ -40,11 +40,6 @@
 #ifndef _NG_BT3C_H_
 #define _NG_BT3C_H_
 
-/* XXX FIME: does not belong here. Move to pccarddevs.h later */
-#define PCMCIA_PRODUCT_3COM_3CRWB609	0x0040
-#define PCMCIA_STR_3COM_3CRWB609	"3Com Bluetooth PC Card 3CRWB60-A"
-#define PCMCIA_CIS_3COM_3CRWB609	{ NULL, NULL, NULL, NULL }
-
 /**************************************************************************
  **************************************************************************
  **     Netgraph node hook name, type name and type cookie and commands 
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket.h b/sys/netgraph/bluetooth/include/ng_btsocket.h
index 1e351d0..d13c650 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -33,14 +33,7 @@
 #define _NETGRAPH_BTSOCKET_H_
 
 /*
- * XXX FIXME: does not belong here, move to sys/socket.h later and fix AF_MAX
- */
-
-#define AF_BLUETOOTH	36		/* Address family */
-#define PF_BLUETOOTH	AF_BLUETOOTH	/* Protocol family */
-
-/*
- * XXX FIXME: does not belong here, move to other places later
+ * Bluetooth protocols
  */
 
 #define BLUETOOTH_PROTO_HCI	134	/* HCI protocol number */
@@ -48,7 +41,6 @@
 #define BLUETOOTH_PROTO_RFCOMM	136	/* RFCOMM protocol number */
 
 /*
- * XXX FIXME: probably does not belong here
  * Bluetooth version of struct sockaddr for raw HCI sockets
  *
  * XXX: sizeof(hci_node) was NG_NODELEN + 1, but NG_NODESIZ (the equivalent
diff --git a/sys/netgraph/bluetooth/include/ng_h4.h b/sys/netgraph/bluetooth/include/ng_h4.h
index 08f14f2..b191029 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -46,13 +46,6 @@
 #ifndef _NETGRAPH_H4_H_
 #define _NETGRAPH_H4_H_
 
-/*
- * H4 line discipline 
- * XXX FIXME: does not belong here. Move to "ttycom.h" later
- */
-
-#define H4DISC			7
-
 /**************************************************************************
  **************************************************************************
  **     Netgraph node hook name, type name and type cookie and commands
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 8f3c53a..de96518 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -204,7 +204,8 @@ struct accept_filter_arg {
 #define	AF_SLOW		33		/* 802.3ad slow protocol */
 #define	AF_SCLUSTER	34		/* Sitara cluster protocol */
 #define	AF_ARP		35
-#define	AF_MAX		36
+#define	AF_BLUETOOTH	36		/* Bluetooth sockets */
+#define	AF_MAX		37
 #endif
 
 /*
@@ -288,6 +289,7 @@ struct sockaddr_storage {
 #define	PF_SLOW		AF_SLOW
 #define PF_SCLUSTER	AF_SCLUSTER
 #define	PF_ARP		AF_ARP
+#define	PF_BLUETOOTH	AF_BLUETOOTH
 
 #define	PF_MAX		AF_MAX
 
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index af09d2e..cfdc9d5 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -142,5 +142,6 @@ struct winsize {
 #define	SLIPDISC	4		/* serial IP discipline */
 #define	PPPDISC		5		/* PPP discipline */
 #define	NETGRAPHDISC	6		/* Netgraph tty node discipline */
+#define	H4DISC		7		/* Netgraph Bluetooth H4 discipline */
 
 #endif /* !_SYS_TTYCOM_H_ */