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

Fix the build of the pcnet driver. It should probably be updated to the current

Browse Source 
FreeBSD version though.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42294 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2011-06-24 15:19:05 +00:00
parent 8a26696cbf
commit 80ad7275a9
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile
+4 -4
View File
@@ -1,11 +1,12 @@
SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev le ; SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev le ;
UsePrivateHeaders kernel net ;
UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
SubDirCcFlags [ FDefines _KERNEL=1 LEDEBUG=128 ] ; UsePrivateHeaders net system ;
UsePrivateKernelHeaders ;
SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
KernelAddon pcnet : KernelAddon pcnet :
am7990.c am7990.c
@@ -15,4 +16,3 @@ KernelAddon pcnet :
glue.c glue.c
: libfreebsd_network.a : libfreebsd_network.a
; ;
src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c
+5
View File
@@ -1,6 +1,11 @@
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/mutex.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/if.h>
#include <net/if_media.h>
#include <machine/bus.h>
#include <dev/le/lancereg.h> #include <dev/le/lancereg.h>
#include <dev/le/lancevar.h> #include <dev/le/lancevar.h>
src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c
+1 -1
View File
@@ -455,7 +455,7 @@ le_pci_attach(device_t dev)
} }
error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE, error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE,
am79900_intr, sc, &lesc->sc_ih); NULL, am79900_intr, sc, &lesc->sc_ih);
if (error != 0) { if (error != 0) {
device_printf(dev, "cannot set up interrupt\n"); device_printf(dev, "cannot set up interrupt\n");
goto fail_am79900; goto fail_am79900;