[haiku-commits] r42294 - haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le

  • From: mmlr@xxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 24 Jun 2011 17:19:06 +0200 (CEST)

Author: mmlr
Date: 2011-06-24 17:19:05 +0200 (Fri, 24 Jun 2011)
New Revision: 42294
Changeset: https://dev.haiku-os.org/changeset/42294

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile
   haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c
Log:
Fix the build of the pcnet driver. It should probably be updated to the current
FreeBSD version though.


Modified: haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile 
2011-06-23 19:59:00 UTC (rev 42293)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile 
2011-06-24 15:19:05 UTC (rev 42294)
@@ -1,12 +1,13 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev le ;
 
-UsePrivateHeaders kernel net ;
-
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : 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 :
        am7990.c
        am79900.c
@@ -15,4 +16,3 @@
        glue.c
        : libfreebsd_network.a
        ;
-

Modified: haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c  
2011-06-23 19:59:00 UTC (rev 42293)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c  
2011-06-24 15:19:05 UTC (rev 42294)
@@ -1,7 +1,12 @@
 #include <sys/bus.h>
+#include <sys/mutex.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/lancevar.h>
 #include <dev/le/am79900var.h>

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c     
2011-06-23 19:59:00 UTC (rev 42293)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c     
2011-06-24 15:19:05 UTC (rev 42294)
@@ -455,7 +455,7 @@
        }
 
        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) {
                device_printf(dev, "cannot set up interrupt\n");
                goto fail_am79900;


Other related posts:

  • » [haiku-commits] r42294 - haiku/trunk/src/add-ons/kernel/drivers/network/pcnet/dev/le - mmlr