Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd_network & drivers: Remove need to specify FBSD_TASKQUEUES.

Browse Source 
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.
This commit is contained in:
Augustin Cavalier 2022-06-21 17:22:37 -04:00
parent b4bf3ed0d5
commit b071913066
27 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/drivers/network/ether/3com/glue.c
View File

@ -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);

2
src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
View File

@ -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();

4
src/add-ons/kernel/drivers/network/ether/attansic_l1/glue.c
View File

@ -3,12 +3,12 @@
* Copyright 2007, Axel Dörfler, axeld@pinc-software.de. 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);

2
src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
View File

@ -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);

2
src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
View File

@ -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);

2
src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
View File

@ -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);

2
src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
View File

@ -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);

2
src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
View File

@ -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);

2
src/add-ons/kernel/drivers/network/ether/nforce/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/ether/rdc/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/ether/rtl81xx/glue.c
View File

@ -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 *

2
src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
View File

@ -23,7 +23,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis19x, sge, pci);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
HAIKU_DRIVER_REQUIREMENTS(0);
NO_HAIKU_REENABLE_INTERRUPTS();

2
src/add-ons/kernel/drivers/network/ether/sis900/glue.c
View File

@ -17,7 +17,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis900, sis, pci);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
HAIKU_DRIVER_REQUIREMENTS(0);
NO_HAIKU_REENABLE_INTERRUPTS();

2
src/add-ons/kernel/drivers/network/ether/via_rhine/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/ether/vt612x/glue.c
View File

@ -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);

2
src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c
View File

@ -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

2
src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
View File

@ -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"},

2
src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
View File

@ -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"},

6
src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
View File

@ -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

2
src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
View File

@ -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"},

2
src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c
View File

@ -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();

2
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
View File

@ -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"},

17
src/libs/compat/freebsd_network/compat/sys/haiku-module.h
View File

@ -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_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_TASKQUEUES
| FBSD_THREAD_TASKQUEUE,
OBSD_WLAN = FBSD_WLAN_FEATURE | FBSD_TASKQUEUES
| FBSD_FAST_TASKQUEUE,
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) \