From fd1101716371a91a6b21ceb8c3ff2918e739a91a Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 27 Oct 2018 15:31:14 -0400 Subject: [PATCH] ipro1000: Restructure glue and Jamfiles to match other drivers. --- .../kernel/drivers/network/ipro1000/Jamfile | 36 ++++++++++++++++++- .../drivers/network/ipro1000/dev/Jamfile | 3 -- .../network/ipro1000/dev/e1000/Jamfile | 36 ------------------- .../network/ipro1000/{dev/e1000 => }/glue.c | 22 ++++++------ 4 files changed, 46 insertions(+), 51 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/ipro1000/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile rename src/add-ons/kernel/drivers/network/ipro1000/{dev/e1000 => }/glue.c (58%) diff --git a/src/add-ons/kernel/drivers/network/ipro1000/Jamfile b/src/add-ons/kernel/drivers/network/ipro1000/Jamfile index f39212d533..2bf56d5f6c 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/Jamfile +++ b/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 + ; diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/Jamfile b/src/add-ons/kernel/drivers/network/ipro1000/dev/Jamfile deleted file mode 100644 index cdf4eea919..0000000000 --- a/src/add-ons/kernel/drivers/network/ipro1000/dev/Jamfile +++ /dev/null @@ -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 ; diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile b/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile deleted file mode 100644 index 4bcb5b0ebf..0000000000 --- a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/Jamfile +++ /dev/null @@ -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 - ; - diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/glue.c b/src/add-ons/kernel/drivers/network/ipro1000/glue.c similarity index 58% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/glue.c rename to src/add-ons/kernel/drivers/network/ipro1000/glue.c index 5a4b726652..2e036f06d6 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/glue.c +++ b/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 -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