ipro1000: Restructure glue and Jamfiles to match other drivers.

src/add-ons/kernel/drivers/network/ipro1000/Jamfile

@@ -1,3 +1,37 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network ipro1000 ;
 
-SubInclude HAIKU_TOP src add-ons kernel drivers network ipro1000 dev ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+	: true ;
+UsePrivateHeaders net system ;
+UsePrivateKernelHeaders ;
+
+UseHeaders [ FDirName $(SUBDIR) ] : true ;
+
+SEARCH_SOURCE += [ FDirName $(SUBDIR) dev e1000 ] ;
+
+SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 _XOPEN_SOURCE ] ;
+
+KernelAddon ipro1000 :
+	e1000_80003es2lan.c
+	e1000_82540.c
+	e1000_82541.c
+	e1000_82542.c
+	e1000_82543.c
+	e1000_82571.c
+	e1000_82575.c
+	e1000_api.c
+	e1000_i210.c
+	e1000_ich8lan.c
+	e1000_mac.c
+	e1000_manage.c
+	e1000_mbx.c
+	e1000_nvm.c
+	e1000_osdep.c
+	e1000_phy.c
+	e1000_vf.c
+	if_lem.c
+	if_em.c
+
+	glue.c
+	: libfreebsd11_network.a
+	;

src/add-ons/kernel/drivers/network/ipro1000/dev/Jamfile

@@ -1,3 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network ipro1000 dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network ipro1000 dev e1000 ;

src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile

@@ -1,36 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network ipro1000 dev e1000 ;
-
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
-
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 EM_FAST_INTR=1 _XOPEN_SOURCE ] ;
-
-KernelAddon ipro1000 :
-	e1000_80003es2lan.c
-	e1000_82540.c
-	e1000_82541.c
-	e1000_82542.c
-	e1000_82543.c
-	e1000_82571.c
-	e1000_82575.c
-	e1000_api.c
-	e1000_i210.c
-	e1000_ich8lan.c
-	e1000_mac.c
-	e1000_manage.c
-	e1000_mbx.c
-	e1000_nvm.c
-	e1000_osdep.c
-	e1000_phy.c
-	e1000_vf.c
-	if_lem.c
-	if_em.c
-
-	glue.c
-	: libfreebsd11_network.a # ipro1000_led.a
-	;
-

src/add-ons/kernel/drivers/network/ipro1000/glue.c

@@ -1,13 +1,20 @@
+/*
+ * Copyright 2018, Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+
 #include <sys/bus.h>
 
 
-extern driver_t *DRIVER_MODULE_NAME(em, pci);
-extern driver_t *DRIVER_MODULE_NAME(lem, pci);
+extern driver_t* DRIVER_MODULE_NAME(em, pci);
+extern driver_t* DRIVER_MODULE_NAME(lem, pci);
+extern driver_t* DRIVER_MODULE_NAME(igb, pci);
 
 HAIKU_FBSD_DRIVERS_GLUE(ipro1000);
-
-NO_HAIKU_REENABLE_INTERRUPTS();
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
 NO_HAIKU_FBSD_MII_DRIVER();
+NO_HAIKU_REENABLE_INTERRUPTS();
 
 
 status_t
@@ -28,10 +35,3 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
 	// only MSI interrupts, legacy uses fast intr
 	return 1;
 }
-
-
-#ifdef EM_FAST_INTR
-	HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
-#else
-	HAIKU_DRIVER_REQUIREMENTS(0);
-#endif