i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/network: Adjust all HAIKU_DRIVER_REQUIREMENTS for taskqueues.

Browse Source 
Many of these did not need taskqueues at all. Others can hang off
the WLAN feature's implicit usage of taskqueues.
This commit is contained in:
Augustin Cavalier
2022-06-21 17:12:29 -04:00
parent 0163191229
commit b4bf3ed0d5
14 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
+1 -1
View File
@@ -3,6 +3,6 @@
HAIKU_FBSD_DRIVER_GLUE(atheros813x, alc, pci); HAIKU_FBSD_DRIVER_GLUE(atheros813x, alc, pci);
HAIKU_FBSD_MII_DRIVER(ukphy); 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_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS();
src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
+3 -5
View File
@@ -9,6 +9,9 @@
HAIKU_FBSD_DRIVER_GLUE(atheros81xx, ale, pci) 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); 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); 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);
src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
+3 -5
View File
@@ -8,7 +8,10 @@
#include <sys/bus.h> #include <sys/bus.h>
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
HAIKU_FBSD_DRIVER_GLUE(attansic_l2, ae, pci) 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); 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); 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);
src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
+1 -3
View File
@@ -16,12 +16,10 @@
HAIKU_FBSD_DRIVER_GLUE(broadcom440x, bfe, pci); HAIKU_FBSD_DRIVER_GLUE(broadcom440x, bfe, pci);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
extern driver_t *DRIVER_MODULE_NAME(bmtphy, miibus); 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 * driver_t *
__haiku_select_miibus_driver(device_t dev) __haiku_select_miibus_driver(device_t dev)
{ {
src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
+1 -1
View File
@@ -18,7 +18,7 @@
HAIKU_FBSD_DRIVER_GLUE(broadcom570x, bge, pci); 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); extern driver_t *DRIVER_MODULE_NAME(brgphy, miibus);
src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
+4 -5
View File
@@ -17,6 +17,10 @@
#include "if_dcreg.h" #include "if_dcreg.h"
HAIKU_FBSD_DRIVERS_GLUE(dec21xxx);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
int check_disable_interrupts_dc(device_t dev); int check_disable_interrupts_dc(device_t dev);
void reenable_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); 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(dc, pci);
extern driver_t *DRIVER_MODULE_NAME(de, pci); extern driver_t *DRIVER_MODULE_NAME(de, pci);
src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
+1 -1
View File
@@ -19,7 +19,7 @@
HAIKU_FBSD_DRIVER_GLUE(ipro100, fxp, pci) 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); HAIKU_FBSD_MII_DRIVER(inphy);
src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
+1 -1
View File
@@ -9,6 +9,6 @@
HAIKU_FBSD_DRIVER_GLUE(jmicron2x0, jme, pci); HAIKU_FBSD_DRIVER_GLUE(jmicron2x0, jme, pci);
HAIKU_FBSD_MII_DRIVER(jmphy); 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_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS();
src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
+1 -1
View File
@@ -17,7 +17,7 @@
#include <dev/msk/if_mskreg.h> #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) HAIKU_FBSD_DRIVER_GLUE(marvell_yukon, mskc, pci)
extern driver_t *DRIVER_MODULE_NAME(e1000phy, miibus); extern driver_t *DRIVER_MODULE_NAME(e1000phy, miibus);
src/add-ons/kernel/drivers/network/ether/nforce/glue.c
+1 -1
View File
@@ -9,7 +9,7 @@
HAIKU_FBSD_DRIVER_GLUE(nforce, nfe, pci) 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_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS();
src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
+1 -1
View File
@@ -23,7 +23,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis19x, sge, pci); HAIKU_FBSD_DRIVER_GLUE(sis19x, sge, pci);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
NO_HAIKU_REENABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS();
src/add-ons/kernel/drivers/network/ether/sis900/glue.c
+1 -1
View File
@@ -17,7 +17,7 @@
HAIKU_FBSD_DRIVER_GLUE(sis900, sis, pci); HAIKU_FBSD_DRIVER_GLUE(sis900, sis, pci);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
NO_HAIKU_REENABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS();
src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
+1 -1
View File
@@ -8,7 +8,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(marvell8335, malo, pci) 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); HAIKU_FIRMWARE_VERSION(0);
NO_HAIKU_CHECK_DISABLE_INTERRUPTS(); NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
+1 -1
View File
@@ -26,7 +26,7 @@
HAIKU_FBSD_WLAN_DRIVER_GLUE(ralinkwifi, ral, pci) 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_VERSION(0);
HAIKU_FIRMWARE_NAME_MAP({ HAIKU_FIRMWARE_NAME_MAP({
{"rt2561fw", "rt2561.ucode"}, {"rt2561fw", "rt2561.ucode"},