Mode few Bluetooth defines into system include files

Reviewed by:	imp
This commit is contained in:
emax 2004-05-10 02:24:56 +00:00
parent 8bd7d01673
commit 7cd8d7675e
6 changed files with 6 additions and 22 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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_ */