hrev56209 adds 2 changesets to branch 'master'
old head: 01631912293e6b193ffe904ca0e39d70761fcb5a
new head: b071913066147f9ad821481679559bddbb40e835
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=b07191306614+%5E01631912293e
----------------------------------------------------------------------------
b4bf3ed0d59e: drivers/network: Adjust all HAIKU_DRIVER_REQUIREMENTS for
taskqueues.
Many of these did not need taskqueues at all. Others can hang off
the WLAN feature's implicit usage of taskqueues.
b07191306614: freebsd_network & drivers: Remove need to specify FBSD_TASKQUEUES.
Instead make FBSD_TASKQUEUES a combination flag of all taskqueues,
so that if even one is needed, the init_taskqueues function will
be invoked appropriately.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
28 files changed, 51 insertions(+), 57 deletions(-)
.../kernel/drivers/network/ether/3com/glue.c | 2 +-
.../drivers/network/ether/atheros813x/glue.c | 2 +-
.../drivers/network/ether/atheros81xx/glue.c | 8 +++-----
.../drivers/network/ether/attansic_l1/glue.c | 4 ++--
.../drivers/network/ether/attansic_l2/glue.c | 8 +++-----
.../drivers/network/ether/broadcom440x/glue.c | 8 +++-----
.../drivers/network/ether/broadcom570x/glue.c | 6 +++---
.../kernel/drivers/network/ether/dec21xxx/glue.c | 9 ++++-----
.../kernel/drivers/network/ether/ipro100/glue.c | 2 +-
.../drivers/network/ether/jmicron2x0/glue.c | 2 +-
.../drivers/network/ether/marvell_yukon/glue.c | 2 +-
.../kernel/drivers/network/ether/nforce/glue.c | 2 +-
.../kernel/drivers/network/ether/rdc/glue.c | 2 +-
.../kernel/drivers/network/ether/rtl81xx/glue.c | 2 +-
.../kernel/drivers/network/ether/sis19x/glue.c | 2 +-
.../kernel/drivers/network/ether/sis900/glue.c | 2 +-
.../kernel/drivers/network/ether/via_rhine/glue.c | 2 +-
.../kernel/drivers/network/ether/vt612x/glue.c | 2 +-
.../drivers/network/wlan/aironetwifi/glue.c | 2 +-
.../drivers/network/wlan/broadcom43xx/glue.c | 2 +-
.../drivers/network/wlan/iprowifi2100/glue.c | 2 +-
.../drivers/network/wlan/iprowifi2200/glue.c | 2 +-
.../drivers/network/wlan/iprowifi3945/glue.c | 6 ++++--
.../drivers/network/wlan/iprowifi4965/glue.c | 2 +-
.../drivers/network/wlan/marvell88w8335/glue.c | 2 +-
.../drivers/network/wlan/marvell88w8363/glue.c | 2 +-
.../kernel/drivers/network/wlan/ralinkwifi/glue.c | 2 +-
.../freebsd_network/compat/sys/haiku-module.h | 19 +++++++++----------
############################################################################
Commit: b4bf3ed0d59e3fcdb619380438a0d90929824616
URL: https://git.haiku-os.org/haiku/commit/?id=b4bf3ed0d59e
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Jun 21 21:12:29 2022 UTC
drivers/network: Adjust all HAIKU_DRIVER_REQUIREMENTS for taskqueues.
Many of these did not need taskqueues at all. Others can hang off
the WLAN feature's implicit usage of taskqueues.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
b/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
index a630a49f7f..f4d649f487 100644
--- a/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
@@ -3,6 +3,6 @@
HAIKU_FBSD_DRIVER_GLUE(atheros813x, alc, pci);
HAIKU_FBSD_MII_DRIVER(ukphy);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
index 0c34288f60..9e40fa80a9 100644
--- a/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
@@ -9,6 +9,9 @@
HAIKU_FBSD_DRIVER_GLUE(atheros81xx, ale, pci)
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
+NO_HAIKU_REENABLE_INTERRUPTS();
extern driver_t *DRIVER_MODULE_NAME(ukphy, miibus);
@@ -22,8 +25,3 @@ __haiku_select_miibus_driver(device_t dev)
return __haiku_probe_miibus(dev, drivers);
}
-
-NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
-NO_HAIKU_REENABLE_INTERRUPTS();
-
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE |
FBSD_SWI_TASKQUEUE);
diff --git a/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
b/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
index 7b8bced340..7ea3341f42 100644
--- a/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
@@ -8,7 +8,10 @@
#include <sys/bus.h>
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
HAIKU_FBSD_DRIVER_GLUE(attansic_l2, ae, pci)
+NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
+NO_HAIKU_REENABLE_INTERRUPTS();
extern driver_t *DRIVER_MODULE_NAME(ukphy, miibus);
@@ -22,8 +25,3 @@ __haiku_select_miibus_driver(device_t dev)
return __haiku_probe_miibus(dev, drivers);
}
-
-NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
-NO_HAIKU_REENABLE_INTERRUPTS();
-
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE |
FBSD_SWI_TASKQUEUE);
diff --git a/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
b/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
index d30dadfc51..b7f52eb9ef 100644
--- a/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
@@ -16,12 +16,10 @@
HAIKU_FBSD_DRIVER_GLUE(broadcom440x, bfe, pci);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
extern driver_t *DRIVER_MODULE_NAME(bmtphy, miibus);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
-//HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE |
FBSD_SWI_TASKQUEUE);
-
driver_t *
__haiku_select_miibus_driver(device_t dev)
{
@@ -40,7 +38,7 @@ __haiku_disable_interrupts(device_t dev)
struct bfe_softc *sc = device_get_softc(dev);
uint32 istat;
HAIKU_INTR_REGISTER_STATE;
-
+
HAIKU_INTR_REGISTER_ENTER();
istat = CSR_READ_4(sc, BFE_ISTAT);
@@ -48,7 +46,7 @@ __haiku_disable_interrupts(device_t dev)
HAIKU_INTR_REGISTER_LEAVE();
return 0;
}
-
+
CSR_WRITE_4(sc, BFE_IMASK, 0);
CSR_READ_4(sc, BFE_IMASK);
diff --git a/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
b/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
index 74e96ee89f..da9e9853d6 100644
--- a/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
@@ -18,7 +18,7 @@
HAIKU_FBSD_DRIVER_GLUE(broadcom570x, bge, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
extern driver_t *DRIVER_MODULE_NAME(brgphy, miibus);
@@ -44,8 +44,8 @@ __haiku_disable_interrupts(device_t dev)
struct bge_softc *sc = device_get_softc(dev);
uint32 notInterrupted = pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE,
4)
- & BGE_PCISTATE_INTR_STATE;
- // bit of a strange register name. a nonzero actually means
+ & BGE_PCISTATE_INTR_STATE;
+ // bit of a strange register name. a nonzero actually means
// it is _not_ interrupted by the network chip
if (notInterrupted)
diff --git a/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
index 3e267cbb5d..b93a5bdbf3 100644
--- a/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
@@ -17,6 +17,10 @@
#include "if_dcreg.h"
+HAIKU_FBSD_DRIVERS_GLUE(dec21xxx);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+
+
int check_disable_interrupts_dc(device_t dev);
void reenable_interrupts_dc(device_t dev);
@@ -24,11 +28,6 @@ extern int check_disable_interrupts_de(device_t dev);
extern void reenable_interrupts_de(device_t dev);
-HAIKU_FBSD_DRIVERS_GLUE(dec21xxx);
-
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE |
FBSD_SWI_TASKQUEUE);
-
-
extern driver_t *DRIVER_MODULE_NAME(dc, pci);
extern driver_t *DRIVER_MODULE_NAME(de, pci);
diff --git a/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
b/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
index 48e02ee204..8ee4d5a29b 100644
--- a/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
@@ -19,7 +19,7 @@
HAIKU_FBSD_DRIVER_GLUE(ipro100, fxp, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
HAIKU_FBSD_MII_DRIVER(inphy);
diff --git a/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
index a805fdc2a7..dae9b7170b 100644
--- a/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
@@ -9,6 +9,6 @@
HAIKU_FBSD_DRIVER_GLUE(jmicron2x0, jme, pci);
HAIKU_FBSD_MII_DRIVER(jmphy);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE |
FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
index 07b18e8b7b..5a47c661db 100644
--- a/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
@@ -17,7 +17,7 @@
#include <dev/msk/if_mskreg.h>
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE |
FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
HAIKU_FBSD_DRIVER_GLUE(marvell_yukon, mskc, pci)
extern driver_t *DRIVER_MODULE_NAME(e1000phy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
b/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
index 3748762828..a4b0373d8c 100644
--- a/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
@@ -9,7 +9,7 @@
HAIKU_FBSD_DRIVER_GLUE(nforce, nfe, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE |
FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
index 626c43f5ce..add5a19d62 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
@@ -23,7 +23,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis19x, sge, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
b/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
index 9d25d83063..e97035de00 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
@@ -17,7 +17,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis900, sis, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
b/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
index df1ae648d5..a1cfc3b815 100644
--- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
@@ -8,7 +8,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(marvell8335, malo, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(0);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
index bea3bbcd9e..f0291978e1 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
@@ -26,7 +26,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(ralinkwifi, ral, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(0);
HAIKU_FIRMWARE_NAME_MAP({
{"rt2561fw", "rt2561.ucode"},
############################################################################
Revision: hrev56209
Commit: b071913066147f9ad821481679559bddbb40e835
URL: https://git.haiku-os.org/haiku/commit/?id=b07191306614
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Jun 21 21:22:37 2022 UTC
freebsd_network & drivers: Remove need to specify FBSD_TASKQUEUES.
Instead make FBSD_TASKQUEUES a combination flag of all taskqueues,
so that if even one is needed, the init_taskqueues function will
be invoked appropriately.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/network/ether/3com/glue.c
b/src/add-ons/kernel/drivers/network/ether/3com/glue.c
index 2b29453185..40983bb22c 100644
--- a/src/add-ons/kernel/drivers/network/ether/3com/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/3com/glue.c
@@ -16,7 +16,7 @@
HAIKU_FBSD_DRIVER_GLUE(3com, xl, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE);
extern driver_t *DRIVER_MODULE_NAME(bmtphy, miibus);
extern driver_t *DRIVER_MODULE_NAME(ukphy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
b/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
index f4d649f487..a1d14e2911 100644
--- a/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
@@ -3,6 +3,6 @@
HAIKU_FBSD_DRIVER_GLUE(atheros813x, alc, pci);
HAIKU_FBSD_MII_DRIVER(ukphy);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
index 9e40fa80a9..5989c837e7 100644
--- a/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
@@ -9,7 +9,7 @@
HAIKU_FBSD_DRIVER_GLUE(atheros81xx, ale, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/attansic_l1/glue.c
b/src/add-ons/kernel/drivers/network/ether/attansic_l1/glue.c
index 9ea581a145..45528ceb06 100644
--- a/src/add-ons/kernel/drivers/network/ether/attansic_l1/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/attansic_l1/glue.c
@@ -3,12 +3,12 @@
* Copyright 2007, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
-
+
#include <sys/bus.h>
HAIKU_FBSD_DRIVER_GLUE(attansic_l1, age, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE);
extern driver_t *DRIVER_MODULE_NAME(atphy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
b/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
index 7ea3341f42..29133a4023 100644
--- a/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
@@ -8,7 +8,7 @@
#include <sys/bus.h>
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE);
HAIKU_FBSD_DRIVER_GLUE(attansic_l2, ae, pci)
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
b/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
index b7f52eb9ef..cc12585520 100644
--- a/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
@@ -16,7 +16,7 @@
HAIKU_FBSD_DRIVER_GLUE(broadcom440x, bfe, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
extern driver_t *DRIVER_MODULE_NAME(bmtphy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
b/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
index da9e9853d6..c85868f316 100644
--- a/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
@@ -18,7 +18,7 @@
HAIKU_FBSD_DRIVER_GLUE(broadcom570x, bge, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
extern driver_t *DRIVER_MODULE_NAME(brgphy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
index b93a5bdbf3..1cff1e8c38 100644
--- a/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
@@ -18,7 +18,7 @@
HAIKU_FBSD_DRIVERS_GLUE(dec21xxx);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
int check_disable_interrupts_dc(device_t dev);
diff --git a/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
b/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
index 8ee4d5a29b..be81c40b2e 100644
--- a/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
@@ -19,7 +19,7 @@
HAIKU_FBSD_DRIVER_GLUE(ipro100, fxp, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
HAIKU_FBSD_MII_DRIVER(inphy);
diff --git a/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
index dae9b7170b..6246a74438 100644
--- a/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
@@ -7,8 +7,8 @@
#include <sys/bus.h>
HAIKU_FBSD_DRIVER_GLUE(jmicron2x0, jme, pci);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE);
HAIKU_FBSD_MII_DRIVER(jmphy);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
index 5a47c661db..5c4af06129 100644
--- a/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
@@ -17,8 +17,8 @@
#include <dev/msk/if_mskreg.h>
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
HAIKU_FBSD_DRIVER_GLUE(marvell_yukon, mskc, pci)
+HAIKU_DRIVER_REQUIREMENTS(0);
extern driver_t *DRIVER_MODULE_NAME(e1000phy, miibus);
extern driver_t *DRIVER_MODULE_NAME(ukphy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
b/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
index a4b0373d8c..daf24340e2 100644
--- a/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
@@ -9,7 +9,7 @@
HAIKU_FBSD_DRIVER_GLUE(nforce, nfe, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/rdc/glue.c
b/src/add-ons/kernel/drivers/network/ether/rdc/glue.c
index bc725a5d0c..11d0a4ab42 100644
--- a/src/add-ons/kernel/drivers/network/ether/rdc/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/rdc/glue.c
@@ -16,7 +16,7 @@
HAIKU_FBSD_DRIVER_GLUE(rdc, vte, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/rtl81xx/glue.c
b/src/add-ons/kernel/drivers/network/ether/rtl81xx/glue.c
index db52139dc6..03f66c7a46 100644
--- a/src/add-ons/kernel/drivers/network/ether/rtl81xx/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/rtl81xx/glue.c
@@ -19,7 +19,7 @@ extern driver_t *DRIVER_MODULE_NAME(rlphy, miibus);
HAIKU_FBSD_DRIVER_GLUE(rtl81xx, re, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_FAST_TASKQUEUE);
driver_t *
diff --git a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
index add5a19d62..6c53a1083c 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
@@ -23,7 +23,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis19x, sge, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
b/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
index e97035de00..027952ac3b 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
@@ -17,7 +17,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis900, sis, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/via_rhine/glue.c
b/src/add-ons/kernel/drivers/network/ether/via_rhine/glue.c
index 6fb8bb280c..ad22dfe604 100644
--- a/src/add-ons/kernel/drivers/network/ether/via_rhine/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/via_rhine/glue.c
@@ -8,7 +8,7 @@
HAIKU_FBSD_DRIVER_GLUE(via_rhine, vr, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_FAST_TASKQUEUE);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/vt612x/glue.c
b/src/add-ons/kernel/drivers/network/ether/vt612x/glue.c
index 80e058bf03..7cf17145e4 100644
--- a/src/add-ons/kernel/drivers/network/ether/vt612x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/vt612x/glue.c
@@ -16,7 +16,7 @@
HAIKU_FBSD_DRIVER_GLUE(vt612x, vge, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE);
extern driver_t *DRIVER_MODULE_NAME(ciphy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c
b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c
index 9acdafa949..fb60148c62 100644
--- a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c
@@ -28,7 +28,7 @@ void (*ng_ether_detach_p)(struct ifnet *ifp) = NULL;
HAIKU_FBSD_WLAN_DRIVER_GLUE(aironetwifi, an, pci)
NO_HAIKU_FBSD_MII_DRIVER();
NO_HAIKU_REENABLE_INTERRUPTS();
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+HAIKU_DRIVER_REQUIREMENTS(0);
int
diff --git a/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c
b/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c
index 03015362fa..ba7d306342 100644
--- a/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c
@@ -23,7 +23,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(broadcom43xx, bwi, pci)
NO_HAIKU_FBSD_MII_DRIVER();
NO_HAIKU_REENABLE_INTERRUPTS();
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(0);
NO_HAIKU_FIRMWARE_NAME_MAP();
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
index e324a7f93a..b1dad30083 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
@@ -21,7 +21,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi2100, ipw, pci)
NO_HAIKU_FBSD_MII_DRIVER();
NO_HAIKU_REENABLE_INTERRUPTS();
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_SWI_TASKQUEUE | FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(130);
HAIKU_FIRMWARE_NAME_MAP({
{"ipw_bss", "ipw2100-1.3.fw"},
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
index 02cbf47f6b..0464cce3a6 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
@@ -20,7 +20,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi2200, iwi, pci)
NO_HAIKU_FBSD_MII_DRIVER();
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(300);
HAIKU_FIRMWARE_NAME_MAP({
{"iwi_bss", "ipw2200-bss.fw"},
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
index 7cd2e1294a..8941f0aa4c 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
@@ -23,9 +23,11 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi3945, wpi, pci)
NO_HAIKU_FBSD_MII_DRIVER();
NO_HAIKU_REENABLE_INTERRUPTS();
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(2144);
-HAIKU_FIRMWARE_NAME_MAP({{"wpifw", "iwlwifi-3945-15.ucode"}});
+HAIKU_FIRMWARE_NAME_MAP({
+ {"wpifw", "iwlwifi-3945-15.ucode"}
+});
int
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
index 60c4cdc9a9..0e33bd15c7 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
@@ -24,7 +24,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi4965, iwn, pci)
NO_HAIKU_FBSD_MII_DRIVER();
NO_HAIKU_REENABLE_INTERRUPTS();
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(44417);
HAIKU_FIRMWARE_NAME_MAP({
{"iwn100fw", "iwlwifi-100-39.ucode"},
diff --git a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c
b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c
index be6602a067..eec3d44c19 100644
--- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c
@@ -18,7 +18,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(marvell88w8363, mwl, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(0);
NO_HAIKU_FBSD_MII_DRIVER();
diff --git a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
index f0291978e1..925c0dd850 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
@@ -26,7 +26,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(ralinkwifi, ral, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(0);
HAIKU_FIRMWARE_NAME_MAP({
{"rt2561fw", "rt2561.ucode"},
diff --git a/src/libs/compat/freebsd_network/compat/sys/haiku-module.h
b/src/libs/compat/freebsd_network/compat/sys/haiku-module.h
index 7f6164ebca..75f3999161 100644
--- a/src/libs/compat/freebsd_network/compat/sys/haiku-module.h
+++ b/src/libs/compat/freebsd_network/compat/sys/haiku-module.h
@@ -202,16 +202,15 @@ extern void __haiku_reenable_interrupts(device_t dev);
extern int __haiku_driver_requirements;
enum {
- FBSD_TASKQUEUES = 1 << 0,
- FBSD_FAST_TASKQUEUE = 1 << 1,
- FBSD_SWI_TASKQUEUE = 1 << 2,
- FBSD_THREAD_TASKQUEUE = 1 << 3,
- FBSD_WLAN_FEATURE = 1 << 4,
-
- FBSD_WLAN = FBSD_WLAN_FEATURE |
FBSD_TASKQUEUES
- |
FBSD_THREAD_TASKQUEUE,
- OBSD_WLAN = FBSD_WLAN_FEATURE |
FBSD_TASKQUEUES
- |
FBSD_FAST_TASKQUEUE,
+ FBSD_FAST_TASKQUEUE = 1 << 0,
+ FBSD_SWI_TASKQUEUE = 1 << 1,
+ FBSD_THREAD_TASKQUEUE = 1 << 2,
+ FBSD_WLAN_FEATURE = 1 << 3,
+
+ FBSD_WLAN = FBSD_WLAN_FEATURE |
FBSD_THREAD_TASKQUEUE,
+ OBSD_WLAN = FBSD_WLAN_FEATURE |
FBSD_FAST_TASKQUEUE,
+
+ FBSD_TASKQUEUES = FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE |
FBSD_THREAD_TASKQUEUE,
};
#define HAIKU_DRIVER_REQUIREMENTS(flags) \
