diff options
23 files changed, 150 insertions, 163 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index d69cd31..1d99f5d 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -410,6 +410,15 @@ options LIBMCHAIN options NETGRAPH #netgraph(4) system options NETGRAPH_ASYNC options NETGRAPH_ATMLLC +options NETGRAPH_ATM_ATMPIF +options NETGRAPH_BLUETOOTH # ng_bluetooth(4) +options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) +options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) +options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) +options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) +options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) +options NETGRAPH_BLUETOOTH_UBT # ng_ubt(4) +options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4) options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CISCO @@ -439,17 +448,6 @@ options NETGRAPH_TEE options NETGRAPH_TTY options NETGRAPH_UI options NETGRAPH_VJC -options NETGRAPH_ATM_ATMPIF - -# NgBluetooth - Netgraph Bluetooth -options NETGRAPH_BLUETOOTH # Common parts -options NETGRAPH_BLUETOOTH_BT3C # 3COM Bluetooth PCCARD -options NETGRAPH_BLUETOOTH_H4 # H4 line discipline -options NETGRAPH_BLUETOOTH_UBT # Bluetooth USB dongle -options NETGRAPH_BLUETOOTH_UBTBCMFW # Firmware driver for BCM2033 -options NETGRAPH_BLUETOOTH_HCI # Bluetooth HCI layer -options NETGRAPH_BLUETOOTH_L2CAP # Bluetooth L2CAP layer -options NETGRAPH_BLUETOOTH_SOCKET # Bluetooth sockets layer # NgATM - Netgraph ATM options NGATM_ATM diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index fddeca1..83afd1e 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -63,15 +63,6 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm -# ... and the same for the NgBluetooth stuff -INCLUDES+= -I$S/netgraph/bluetooth/include -INCLUDES+= -I$S/netgraph/bluetooth/drivers/bt3c -INCLUDES+= -I$S/netgraph/bluetooth/drivers/h4 -INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubt -INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubtbcmfw -INCLUDES+= -I$S/netgraph/bluetooth/hci -INCLUDES+= -I$S/netgraph/bluetooth/l2cap - COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} .if ${CC} != "icc" diff --git a/sys/conf/options b/sys/conf/options index 0c157dc..2191fe7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -351,6 +351,15 @@ XBONEHACK NETGRAPH NETGRAPH_ASYNC opt_netgraph.h NETGRAPH_ATMLLC opt_netgraph.h +NETGRAPH_ATM_ATMPIF opt_netgraph.h +NETGRAPH_BLUETOOTH opt_netgraph.h +NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h +NETGRAPH_BLUETOOTH_H4 opt_netgraph.h +NETGRAPH_BLUETOOTH_HCI opt_netgraph.h +NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h +NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h +NETGRAPH_BLUETOOTH_UBT opt_netgraph.h +NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h NETGRAPH_BPF opt_netgraph.h NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h @@ -380,17 +389,6 @@ NETGRAPH_TEE opt_netgraph.h NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h -NETGRAPH_ATM_ATMPIF opt_netgraph.h - -# NgBluetooth options -NETGRAPH_BLUETOOTH opt_netgraph.h -NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h -NETGRAPH_BLUETOOTH_H4 opt_netgraph.h -NETGRAPH_BLUETOOTH_UBT opt_netgraph.h -NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h -NETGRAPH_BLUETOOTH_HCI opt_netgraph.h -NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h -NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h # NgATM options NGATM_ATM opt_netgraph.h diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c index bf4b066..73f8266 100644 --- a/sys/netgraph/bluetooth/common/ng_bluetooth.c +++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c @@ -35,7 +35,7 @@ #include <sys/kernel.h> #include <sys/sysctl.h> -#include "ng_bluetooth.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> /* * Bluetooth stack sysctl globals diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c index 674b4a7..656d20c 100644 --- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c +++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c @@ -64,10 +64,10 @@ #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> #include <netgraph/ng_parse.h> -#include <ng_bluetooth.h> -#include <ng_hci.h> -#include "ng_bt3c.h" -#include "ng_bt3c_var.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_bt3c.h> +#include <netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h> /* Netgraph methods */ static ng_constructor_t ng_bt3c_constructor; diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c index 8ea68ed..41c713e 100644 --- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c +++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c @@ -51,11 +51,11 @@ #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> #include <netgraph/ng_parse.h> -#include <ng_bluetooth.h> -#include <ng_hci.h> -#include "ng_h4.h" -#include "ng_h4_var.h" -#include "ng_h4_prse.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_h4.h> +#include <netgraph/bluetooth/drivers/h4/ng_h4_var.h> +#include <netgraph/bluetooth/drivers/h4/ng_h4_prse.h> /***************************************************************************** ***************************************************************************** diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index 6763980..0f730d0 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -52,10 +52,10 @@ #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> #include <netgraph/ng_parse.h> -#include <ng_bluetooth.h> -#include <ng_hci.h> -#include "ng_ubt.h" -#include "ng_ubt_var.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_ubt.h> +#include <netgraph/bluetooth/drivers/ubt/ng_ubt_var.h> /* * USB methods diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c index 57a9c9d..90c0859 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c @@ -38,13 +38,13 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_hci_var.h" -#include "ng_hci_cmds.h" -#include "ng_hci_evnt.h" -#include "ng_hci_ulpi.h" -#include "ng_hci_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/hci/ng_hci_var.h> +#include <netgraph/bluetooth/hci/ng_hci_cmds.h> +#include <netgraph/bluetooth/hci/ng_hci_evnt.h> +#include <netgraph/bluetooth/hci/ng_hci_ulpi.h> +#include <netgraph/bluetooth/hci/ng_hci_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c index 32c99ff..5fe192a 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c @@ -38,13 +38,13 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_hci_var.h" -#include "ng_hci_cmds.h" -#include "ng_hci_evnt.h" -#include "ng_hci_ulpi.h" -#include "ng_hci_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/hci/ng_hci_var.h> +#include <netgraph/bluetooth/hci/ng_hci_cmds.h> +#include <netgraph/bluetooth/hci/ng_hci_evnt.h> +#include <netgraph/bluetooth/hci/ng_hci_ulpi.h> +#include <netgraph/bluetooth/hci/ng_hci_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c index 4a6a62d..67eaac8 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_main.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c @@ -39,14 +39,14 @@ #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> #include <netgraph/ng_parse.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_hci_var.h" -#include "ng_hci_prse.h" -#include "ng_hci_cmds.h" -#include "ng_hci_evnt.h" -#include "ng_hci_ulpi.h" -#include "ng_hci_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/hci/ng_hci_var.h> +#include <netgraph/bluetooth/hci/ng_hci_prse.h> +#include <netgraph/bluetooth/hci/ng_hci_cmds.h> +#include <netgraph/bluetooth/hci/ng_hci_evnt.h> +#include <netgraph/bluetooth/hci/ng_hci_ulpi.h> +#include <netgraph/bluetooth/hci/ng_hci_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c index e0ac39c..6d0977a 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c @@ -37,13 +37,13 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_hci_var.h" -#include "ng_hci_cmds.h" -#include "ng_hci_evnt.h" -#include "ng_hci_ulpi.h" -#include "ng_hci_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/hci/ng_hci_var.h> +#include <netgraph/bluetooth/hci/ng_hci_cmds.h> +#include <netgraph/bluetooth/hci/ng_hci_evnt.h> +#include <netgraph/bluetooth/hci/ng_hci_ulpi.h> +#include <netgraph/bluetooth/hci/ng_hci_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c index 1950043..8d50884 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c @@ -38,13 +38,13 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_hci_var.h" -#include "ng_hci_cmds.h" -#include "ng_hci_evnt.h" -#include "ng_hci_ulpi.h" -#include "ng_hci_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/hci/ng_hci_var.h> +#include <netgraph/bluetooth/hci/ng_hci_cmds.h> +#include <netgraph/bluetooth/hci/ng_hci_evnt.h> +#include <netgraph/bluetooth/hci/ng_hci_ulpi.h> +#include <netgraph/bluetooth/hci/ng_hci_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c index 68e57ef..e708990 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c @@ -38,15 +38,15 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_l2cap_var.h" -#include "ng_l2cap_cmds.h" -#include "ng_l2cap_evnt.h" -#include "ng_l2cap_llpi.h" -#include "ng_l2cap_ulpi.h" -#include "ng_l2cap_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_var.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_cmds.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_evnt.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_llpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c index ba74a16..9a40d26 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c @@ -38,15 +38,15 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_l2cap_var.h" -#include "ng_l2cap_cmds.h" -#include "ng_l2cap_evnt.h" -#include "ng_l2cap_llpi.h" -#include "ng_l2cap_ulpi.h" -#include "ng_l2cap_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_var.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_cmds.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_evnt.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_llpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c index db64202..8f9e506 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c @@ -38,15 +38,15 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_l2cap_var.h" -#include "ng_l2cap_cmds.h" -#include "ng_l2cap_evnt.h" -#include "ng_l2cap_llpi.h" -#include "ng_l2cap_ulpi.h" -#include "ng_l2cap_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_var.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_cmds.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_evnt.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_llpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c index 3117c29..3124247 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c @@ -38,16 +38,16 @@ #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> #include <netgraph/ng_parse.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_l2cap_var.h" -#include "ng_l2cap_cmds.h" -#include "ng_l2cap_evnt.h" -#include "ng_l2cap_llpi.h" -#include "ng_l2cap_ulpi.h" -#include "ng_l2cap_misc.h" -#include "ng_l2cap_prse.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_var.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_cmds.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_evnt.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_llpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_misc.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_prse.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c index d292f84..075df7d 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c @@ -37,15 +37,15 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_l2cap_var.h" -#include "ng_l2cap_cmds.h" -#include "ng_l2cap_evnt.h" -#include "ng_l2cap_llpi.h" -#include "ng_l2cap_ulpi.h" -#include "ng_l2cap_misc.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_var.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_cmds.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_evnt.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_llpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_misc.h> static u_int16_t ng_l2cap_get_cid (ng_l2cap_p); diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c index 4dd1e6f..ffce0f3 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c @@ -38,14 +38,14 @@ #include <sys/queue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_l2cap_var.h" -#include "ng_l2cap_cmds.h" -#include "ng_l2cap_evnt.h" -#include "ng_l2cap_llpi.h" -#include "ng_l2cap_ulpi.h" -#include "ng_l2cap_misc.h" +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_var.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_cmds.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_evnt.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_llpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h> +#include <netgraph/bluetooth/l2cap/ng_l2cap_misc.h> /****************************************************************************** ****************************************************************************** diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c index 383a063..823925a 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c @@ -44,13 +44,13 @@ #include <sys/taskqueue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_btsocket.h" -#include "ng_btsocket_hci_raw.h" -#include "ng_btsocket_l2cap.h" -#include "ng_btsocket_rfcomm.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/include/ng_btsocket.h> +#include <netgraph/bluetooth/include/ng_btsocket_hci_raw.h> +#include <netgraph/bluetooth/include/ng_btsocket_l2cap.h> +#include <netgraph/bluetooth/include/ng_btsocket_rfcomm.h> static int ng_btsocket_modevent (module_t, int, void *); extern struct domain ng_btsocket_domain; diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c index 25495ba..ff4930d 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c @@ -50,11 +50,11 @@ #include <sys/taskqueue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_btsocket.h" -#include "ng_btsocket_hci_raw.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/include/ng_btsocket.h> +#include <netgraph/bluetooth/include/ng_btsocket_hci_raw.h> /* MALLOC define */ #ifdef NG_SEPARATE_MALLOC diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c index 380094a..6e23004 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c @@ -50,11 +50,11 @@ #include <sys/taskqueue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_btsocket.h" -#include "ng_btsocket_l2cap.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/include/ng_btsocket.h> +#include <netgraph/bluetooth/include/ng_btsocket_l2cap.h> /* MALLOC define */ #ifdef NG_SEPARATE_MALLOC diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c index 3bbfe4ba..d630f86 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c @@ -49,11 +49,11 @@ #include <sys/taskqueue.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_btsocket.h" -#include "ng_btsocket_l2cap.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/include/ng_btsocket.h> +#include <netgraph/bluetooth/include/ng_btsocket_l2cap.h> /* MALLOC define */ #ifdef NG_SEPARATE_MALLOC diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index 5b53312..437b604 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -52,12 +52,12 @@ #include <sys/uio.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> -#include "ng_bluetooth.h" -#include "ng_hci.h" -#include "ng_l2cap.h" -#include "ng_btsocket.h" -#include "ng_btsocket_l2cap.h" -#include "ng_btsocket_rfcomm.h" +#include <netgraph/bluetooth/include/ng_bluetooth.h> +#include <netgraph/bluetooth/include/ng_hci.h> +#include <netgraph/bluetooth/include/ng_l2cap.h> +#include <netgraph/bluetooth/include/ng_btsocket.h> +#include <netgraph/bluetooth/include/ng_btsocket_l2cap.h> +#include <netgraph/bluetooth/include/ng_btsocket_rfcomm.h> /* MALLOC define */ #ifdef NG_SEPARATE_MALLOC |
