i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fixing the broken build

Browse Source 
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
This commit is contained in:
Colin Günther
2009-10-23 01:01:14 +00:00
parent 14627e087b
commit 3db9c51942
32 changed files with 123 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/3com/pci/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/3com/pci/glue.c
+6 -1
View File
@@ -4,8 +4,13 @@
* Distributed under the terms of the MIT License.
*/
#include <sys/bus.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include <net/if.h>
#include <net/if_media.h>
#include "if_xlreg.h"
src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile
+6 -3
View File
@@ -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
src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/glue.c
+7 -1
View File
@@ -3,12 +3,18 @@
* Distributed under the terms of the MIT License.
*/
#include <sys/bus.h>
#include <sys/malloc.h>
#include <sys/rman.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include <net/if.h>
#include "if_bfereg.h"
HAIKU_FBSD_DRIVER_GLUE(broadcom440x, bfe, pci);
extern driver_t *DRIVER_MODULE_NAME(bmtphy, miibus);
src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c
+8 -1
View File
@@ -3,13 +3,20 @@
* Distributed under the terms of the MIT License.
*/
#include <dev/pci/pcivar.h>
#include <sys/bus.h>
#include <sys/malloc.h>
#include <sys/rman.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include <net/if.h>
#include <net/if_media.h>
#include "if_bgereg.h"
HAIKU_FBSD_DRIVER_GLUE(broadcom570x, bge, pci);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c
+7
View File
@@ -5,7 +5,14 @@
#include <sys/bus.h>
#include <sys/mutex.h>
#include <sys/rman.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include <net/if.h>
#include <net/if_media.h>
#include "if_fxpreg.h"
#include "if_fxpvar.h"
src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile
+4 -2
View File
@@ -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 ] ;
src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/rtl8139/pci/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c
+5
View File
@@ -1,4 +1,9 @@
#include <sys/bus.h>
#include <sys/mutex.h>
#include <sys/systm.h>
#include <sys/taskqueue.h>
#include <machine/bus.h>
#include <pci/if_rlreg.h>
src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c
+6
View File
@@ -1,4 +1,10 @@
#include <sys/bus.h>
#include <sys/mutex.h>
#include <sys/systm.h>
#include <sys/taskqueue.h>
#include <machine/bus.h>
#include <pci/if_rlreg.h>
HAIKU_FBSD_DRIVER_GLUE(rtl81xx, re, pci);
src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile
+3 -2
View File
@@ -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 :
src/add-ons/kernel/drivers/network/syskonnect/dev/sk/glue.c
+5
View File
@@ -6,7 +6,12 @@
#include <sys/bus.h>
#include <sys/mutex.h>
#include <sys/rman.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include "if_skreg.h"
#include "xmaciireg.h"
src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile
+3 -2
View File
@@ -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
src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile
+3 -2
View File
@@ -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 :