From 3db9c5194230d8ecfb954ab81c6276b8666a0c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20G=C3=BCnther?= Date: Fri, 23 Oct 2009 01:01:14 +0000 Subject: [PATCH] * fixing the broken build the network drivers needed to be adjusted to the header reordering, too sorry git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33740 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile | 5 +++-- src/add-ons/kernel/drivers/network/3com/pci/Jamfile | 5 +++-- src/add-ons/kernel/drivers/network/3com/pci/glue.c | 7 ++++++- .../kernel/drivers/network/ar81xx/dev/ale/Jamfile | 5 +++-- .../kernel/drivers/network/ar81xx/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/attansic_l1/dev/age/Jamfile | 5 +++-- .../kernel/drivers/network/attansic_l1/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/attansic_l2/dev/ae/Jamfile | 5 +++-- .../kernel/drivers/network/attansic_l2/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/broadcom440x/dev/bfe/Jamfile | 9 ++++++--- .../kernel/drivers/network/broadcom440x/dev/bfe/glue.c | 8 +++++++- .../kernel/drivers/network/broadcom440x/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/broadcom570x/dev/bge/Jamfile | 5 +++-- .../kernel/drivers/network/broadcom570x/dev/bge/glue.c | 9 ++++++++- .../kernel/drivers/network/broadcom570x/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/ipro100/dev/fxp/Jamfile | 5 +++-- .../kernel/drivers/network/ipro100/dev/fxp/glue.c | 7 +++++++ .../kernel/drivers/network/ipro1000/dev/e1000/Jamfile | 6 ++++-- .../kernel/drivers/network/marvell_yukon/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/marvell_yukon/dev/msk/Jamfile | 5 +++-- .../kernel/drivers/network/nforce/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/nforce/dev/nfe/Jamfile | 5 +++-- .../kernel/drivers/network/rtl8139/dev/mii/Jamfile | 5 +++-- src/add-ons/kernel/drivers/network/rtl8139/pci/Jamfile | 5 +++-- src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c | 5 +++++ src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile | 5 +++-- src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c | 6 ++++++ .../kernel/drivers/network/syskonnect/dev/mii/Jamfile | 5 +++-- .../kernel/drivers/network/syskonnect/dev/sk/Jamfile | 5 +++-- .../kernel/drivers/network/syskonnect/dev/sk/glue.c | 5 +++++ .../kernel/drivers/network/via_rhine/dev/mii/Jamfile | 5 +++-- src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile | 5 +++-- 32 files changed, 123 insertions(+), 54 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile index a2b8d7ec8f..59df4673de 100644 --- a/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network 3com dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary 3com_mii.a diff --git a/src/add-ons/kernel/drivers/network/3com/pci/Jamfile b/src/add-ons/kernel/drivers/network/3com/pci/Jamfile index e2151a64c9..50c12d59cf 100644 --- a/src/add-ons/kernel/drivers/network/3com/pci/Jamfile +++ b/src/add-ons/kernel/drivers/network/3com/pci/Jamfile @@ -2,11 +2,12 @@ SubDir HAIKU_TOP src add-ons kernel drivers network 3com pci ; SubDirCcFlags -Wall ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon 3com : diff --git a/src/add-ons/kernel/drivers/network/3com/pci/glue.c b/src/add-ons/kernel/drivers/network/3com/pci/glue.c index d414b7d033..8f2f726962 100644 --- a/src/add-ons/kernel/drivers/network/3com/pci/glue.c +++ b/src/add-ons/kernel/drivers/network/3com/pci/glue.c @@ -4,8 +4,13 @@ * Distributed under the terms of the MIT License. */ - #include +#include + +#include + +#include +#include #include "if_xlreg.h" diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile b/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile index b198fcc720..ef6745815a 100644 --- a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile +++ b/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx dev ale ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon ar81xx : diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile index 60ee5de96f..896c8b79e7 100644 --- a/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary ar81xx_mii.a diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile index 1b692d32d9..1d658268b7 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile +++ b/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev age ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon attansic_l1 : diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile index a1752cb354..7144dc1985 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary atl1_mii.a diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile index 2d3e44c9b9..7dbc931ab5 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile +++ b/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 dev ae ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon attansic_l2 : diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile index 1f0a297c93..6e97f55755 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary attansic_l2_mii.a diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile b/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile index d407b082da..a8ed2c4766 100644 --- a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile @@ -2,13 +2,16 @@ SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev bfe ; SubDirCcFlags -Wall ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; -SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + +SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] + -Wno-format + ; KernelAddon broadcom440x : if_bfe.c diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/glue.c b/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/glue.c index 3174470717..d30dadfc51 100644 --- a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/glue.c +++ b/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/glue.c @@ -3,12 +3,18 @@ * Distributed under the terms of the MIT License. */ - #include +#include #include +#include + +#include + +#include #include "if_bfereg.h" + HAIKU_FBSD_DRIVER_GLUE(broadcom440x, bfe, pci); extern driver_t *DRIVER_MODULE_NAME(bmtphy, miibus); diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile index 550825ec89..5d7d9b646f 100644 --- a/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary broadcom440x_mii.a diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile index 960b2a3463..341e4ecf69 100644 --- a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile @@ -2,12 +2,13 @@ SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev bge ; SubDirCcFlags -Wall ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon broadcom570x : diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c index c5a5ff7cae..74e96ee89f 100644 --- a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c +++ b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c @@ -3,13 +3,20 @@ * Distributed under the terms of the MIT License. */ - #include #include +#include #include +#include + +#include + +#include +#include #include "if_bgereg.h" + HAIKU_FBSD_DRIVER_GLUE(broadcom570x, bge, pci); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE); diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile index e854cae01a..e05edf1cf0 100644 --- a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary broadcom570x_mii.a diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile index 909f241ba7..d1f3f648a5 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile @@ -2,11 +2,12 @@ SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 dev fxp ; SubDirCcFlags -Wall ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 ] ; KernelAddon ipro100 : diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c index 9ad0d47d0a..a61dacd39e 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c @@ -5,7 +5,14 @@ #include +#include #include +#include + +#include + +#include +#include #include "if_fxpreg.h" #include "if_fxpvar.h" diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile b/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile index bffd8e30c8..5d3e9adb24 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile +++ b/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile @@ -1,9 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network ipro1000 dev e1000 ; -UsePrivateHeaders kernel net ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; + +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 EM_FAST_INTR=1 ] ; diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile index e98f1bd1a7..1f0a4a7bee 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary marvell_yukon_mii.a diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile index ad18d600ac..d007cfaf5b 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev msk ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon marvell_yukon : diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile index 69a633f894..3f15e778c2 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary nforce_mii.a diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile index 3cdf9d36ab..84e51d8a44 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile +++ b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev nfe ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon nforce : diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile index 2781d64e32..b0633fec57 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary rtl8139_mii.a diff --git a/src/add-ons/kernel/drivers/network/rtl8139/pci/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/pci/Jamfile index 4fc37046d8..a02c6397aa 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/pci/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl8139/pci/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 pci ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon rtl8139 : diff --git a/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c b/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c index d1bd10cb55..97cc47e219 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c +++ b/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c @@ -1,4 +1,9 @@ #include +#include +#include +#include + +#include #include diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile b/src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile index c7cc08f98c..7ad9aabaf7 100644 --- a/src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile @@ -1,11 +1,12 @@ SubDir HAIKU_TOP src add-ons kernel drivers network rtl81xx pci ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel drivers network rtl8139 ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon rtl81xx : diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c b/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c index a0ea201635..ada62eda50 100644 --- a/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c +++ b/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c @@ -1,4 +1,10 @@ #include +#include +#include +#include + +#include + #include HAIKU_FBSD_DRIVER_GLUE(rtl81xx, re, pci); diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile index 05f6916518..97ac691520 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary syskonnect_mii.a diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile index 76abcba2fa..171a33a2e8 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev sk ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon syskonnect : diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/glue.c b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/glue.c index 37ee317502..39bd383d48 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/glue.c +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/glue.c @@ -6,7 +6,12 @@ #include +#include #include +#include + +#include + #include "if_skreg.h" #include "xmaciireg.h" diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile index c0b8ca2bbc..523901a739 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile @@ -1,10 +1,11 @@ SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine dev mii ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary via_rhine_mii.a diff --git a/src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile index a31861b452..9f01bc6dda 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile +++ b/src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile @@ -2,11 +2,12 @@ SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine pci ; SubDirCcFlags -Wall ; -UsePrivateHeaders kernel net ; - UseHeaders [ FDirName $(SUBDIR) .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon via_rhine :