From 5536ea10186732c97d0de25ea26fd1d40fe70a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 1 Dec 2007 13:18:09 +0000 Subject: [PATCH] The Marvell Yukon driver needs the SWI task queues as well. The driver is now working, but it does not yet work reliably here - it encounters a "PCI Express protocol violation", at least that's what it says. Will look into that later. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23039 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/network/marvell_yukon/dev/msk/Jamfile | 2 +- .../kernel/drivers/network/marvell_yukon/dev/msk/glue.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile index 622ed22e36..ad18d600ac 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile @@ -5,7 +5,7 @@ UsePrivateHeaders kernel net ; UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; -SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 EM_FAST_INTR=1 ] ; +SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelAddon marvell_yukon : if_msk.c diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/glue.c b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/glue.c index 815aa6104c..f89bfd65a1 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/glue.c +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/glue.c @@ -29,8 +29,4 @@ __haiku_select_miibus_driver(device_t dev) NO_HAIKU_CHECK_DISABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS(); -#ifdef EM_FAST_INTR - HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE); -#else - HAIKU_DRIVER_REQUIREMENTS(0); -#endif +HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);