From 396abf076f733d6ddd2469fe7cfcb898dd3b49fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20G=C3=BCnther?= Date: Tue, 19 Jan 2010 17:49:45 +0000 Subject: [PATCH] * Adapting firmware based driver to the new firmware name mapping method. * Removing the respective settings files, as they are no longer needed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35171 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../wlan/broadcom43xx/broadcom43xx.settings | 28 ------------------- .../drivers/network/wlan/broadcom43xx/glue.c | 1 + .../drivers/network/wlan/iprowifi2100/glue.c | 2 ++ .../wlan/iprowifi2100/iprowifi2100.settings | 13 --------- .../drivers/network/wlan/iprowifi2200/glue.c | 2 ++ .../wlan/iprowifi2200/iprowifi2200.settings | 13 --------- .../drivers/network/wlan/iprowifi3945/glue.c | 1 + .../wlan/iprowifi3945/iprowifi3945.settings | 11 -------- .../drivers/network/wlan/iprowifi4965/glue.c | 1 + .../wlan/iprowifi4965/iprowifi4965.settings | 11 -------- .../network/wlan/marvell88w8335/glue.c | 6 ++-- .../marvell88w8335/marvell88w8335.settings | 12 -------- .../network/wlan/marvell88w8363/glue.c | 4 ++- .../marvell88w8363/marvell88w8363.settings | 12 -------- .../drivers/network/wlan/ralinkwifi/glue.c | 7 +++-- .../wlan/ralinkwifi/ralinkwifi.settings | 14 ---------- 16 files changed, 18 insertions(+), 120 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/wlan/broadcom43xx/broadcom43xx.settings delete mode 100644 src/add-ons/kernel/drivers/network/wlan/iprowifi2100/iprowifi2100.settings delete mode 100644 src/add-ons/kernel/drivers/network/wlan/iprowifi2200/iprowifi2200.settings delete mode 100644 src/add-ons/kernel/drivers/network/wlan/iprowifi3945/iprowifi3945.settings delete mode 100644 src/add-ons/kernel/drivers/network/wlan/iprowifi4965/iprowifi4965.settings delete mode 100644 src/add-ons/kernel/drivers/network/wlan/marvell88w8335/marvell88w8335.settings delete mode 100644 src/add-ons/kernel/drivers/network/wlan/marvell88w8363/marvell88w8363.settings delete mode 100644 src/add-ons/kernel/drivers/network/wlan/ralinkwifi/ralinkwifi.settings diff --git a/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/broadcom43xx.settings b/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/broadcom43xx.settings deleted file mode 100644 index 9c7a5d79be..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/broadcom43xx.settings +++ /dev/null @@ -1,28 +0,0 @@ -# -# This is the configuration file for the broadcom43xx wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "broadcom43xx". -# - -# -# Mapping of the driver internal firmware names to the b43-fwcutter generated -# names. -# ----- -# internal b43-fwcutter -bwi_v3_a0g0bsinitvals2 bwi_v3_a0g0bsinitvals2 -bwi_v3_a0g0bsinitvals5 bwi_v3_a0g0bsinitvals5 -bwi_v3_a0g0initvals2 bwi_v3_a0g0initvals2 -bwi_v3_a0g0initvals5 bwi_v3_a0g0initvals5 -bwi_v3_a0g1bsinitvals5 bwi_v3_a0g1bsinitvals5 -bwi_v3_a0g1initvals5 bwi_v3_a0g1initvals5 -bwi_v3_b0g0bsinitvals2 bwi_v3_b0g0bsinitvals2 -bwi_v3_b0g0bsinitvals5 bwi_v3_b0g0bsinitvals5 -bwi_v3_b0g0initvals2 bwi_v3_b0g0initvals2 -bwi_v3_b0g0initvals5 bwi_v3_b0g0initvals5 -bwi_v3_pcm4 bwi_v3_pcm4 -bwi_v3_pcm5 bwi_v3_pcm5 -bwi_v3_ucode bwi_v3_ucode -bwi_v3_ucode11 bwi_v3_ucode11 -bwi_v3_ucode2 bwi_v3_ucode2 -bwi_v3_ucode4 bwi_v3_ucode4 -bwi_v3_ucode5 bwi_v3_ucode5 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 e71e0174e5..1771169c94 100644 --- a/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c @@ -25,6 +25,7 @@ NO_HAIKU_FBSD_MII_DRIVER(); NO_HAIKU_REENABLE_INTERRUPTS(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(0); +NO_HAIKU_FIRMWARE_NAME_MAP(); int 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 e98d75cd51..dbfc268e81 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c @@ -23,6 +23,8 @@ NO_HAIKU_FBSD_MII_DRIVER(); NO_HAIKU_REENABLE_INTERRUPTS(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(130); +HAIKU_FIRMWARE_NAME_MAP(3) = {{"ipw_bss", "ipw2100-1.3.fw"}, + {"ipw_ibss", "ipw2100-1.3-i.fw"}, {"ipw_monitor", "ipw2100-1.3-p.fw"}}; int diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/iprowifi2100.settings b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/iprowifi2100.settings deleted file mode 100644 index d9d779245d..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/iprowifi2100.settings +++ /dev/null @@ -1,13 +0,0 @@ -# -# This is the configuration file for the iprowwifi2100 wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "iprowwifi2100". -# - -# -# Mapping of the driver internal firmware names to the official Intel® names. -# ----- -# internal Intel® -ipw-bss ipw2100-1.3.fw -ipw-ibss ipw2100-1.3-i.fw -ipw-monitor ipw2100-1.3-p.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 65dbcc7ae7..8eca0d0851 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c @@ -22,6 +22,8 @@ HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi2200, iwi, pci) NO_HAIKU_FBSD_MII_DRIVER(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(300); +HAIKU_FIRMWARE_NAME_MAP(3) = {{"iwi_bss", "ipw2200-bss.fw"}, + {"iwi_ibss", "ipw2200-ibss.fw"}, {"iwi_monitor", "ipw2200-sniffer.fw"}}; int diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/iprowifi2200.settings b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/iprowifi2200.settings deleted file mode 100644 index 3c29a82b50..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/iprowifi2200.settings +++ /dev/null @@ -1,13 +0,0 @@ -# -# This is the configuration file for the iprowifi2200 wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "iprowifi2200". -# - -# -# Mapping of the driver internal firmware names to the official Intel® names. -# ----- -# internal Intel® -iwi_bss ipw2200-bss.fw -iwi_ibss ipw2200-ibss.fw -iwi_monitor ipw2200-sniffer.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 6fa30110cd..3df1b99e37 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c @@ -23,6 +23,7 @@ NO_HAIKU_FBSD_MII_DRIVER(); NO_HAIKU_REENABLE_INTERRUPTS(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(2144); +HAIKU_FIRMWARE_NAME_MAP(1) = {{"wpifw", "iwlwifi-3945-1.ucode"}}; int diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/iprowifi3945.settings b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/iprowifi3945.settings deleted file mode 100644 index 654941ee0e..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/iprowifi3945.settings +++ /dev/null @@ -1,11 +0,0 @@ -# -# This is the configuration file for the iprowifi3945 wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "iprowifi3945". -# - -# -# Mapping of the driver internal firmware names to the official Intel® names. -# ----- -# internal Intel® -wpifw iwlwifi-3945-1.ucode 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 511ef58f66..44b5372ed9 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c @@ -24,6 +24,7 @@ NO_HAIKU_FBSD_MII_DRIVER(); NO_HAIKU_REENABLE_INTERRUPTS(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(44417); +HAIKU_FIRMWARE_NAME_MAP(1) = {{"iwnfw", "iwlwifi-4965-1.ucode"}}; int diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/iprowifi4965.settings b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/iprowifi4965.settings deleted file mode 100644 index 43aa402b56..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/iprowifi4965.settings +++ /dev/null @@ -1,11 +0,0 @@ -# -# This is the configuration file for the iprowifi4965 wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "iprowifi4965". -# - -# -# Mapping of the driver internal firmware names to the official Intel® names. -# ----- -# internal Intel® -iwnfw iwlwifi-4965-1.ucode 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 52dc97f998..df1ae648d5 100644 --- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c @@ -8,10 +8,10 @@ HAIKU_FBSD_WLAN_DRIVER_GLUE(marvell8335, malo, pci) +HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_WLAN); +HAIKU_FIRMWARE_VERSION(0); NO_HAIKU_CHECK_DISABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS(); NO_HAIKU_FBSD_MII_DRIVER(); - -HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_WLAN); -HAIKU_FIRMWARE_VERSION(0); +NO_HAIKU_FIRMWARE_NAME_MAP(); diff --git a/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/marvell88w8335.settings b/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/marvell88w8335.settings deleted file mode 100644 index e48fdee503..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/marvell88w8335.settings +++ /dev/null @@ -1,12 +0,0 @@ -# -# This is the configuration file for the marvell88w8335 wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "marvell88w8335". -# - -# -# Mapping of the driver internal firmware names to respective archive names. -# ----- -# internal archive -malo8335-h malo8335-h -malo8335-m malo8335-m 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 3ae6d04514..be6602a067 100644 --- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c @@ -18,10 +18,12 @@ HAIKU_FBSD_WLAN_DRIVER_GLUE(marvell88w8363, mwl, pci) -NO_HAIKU_FBSD_MII_DRIVER(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(0); +NO_HAIKU_FBSD_MII_DRIVER(); +NO_HAIKU_FIRMWARE_NAME_MAP(); + int HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev) diff --git a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/marvell88w8363.settings b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/marvell88w8363.settings deleted file mode 100644 index 3ffd6b46f4..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/marvell88w8363.settings +++ /dev/null @@ -1,12 +0,0 @@ -# -# This is the configuration file for the marvell88w8363 wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "marvell88w8363". -# - -# -# Mapping of the driver internal firmware names to FreeBSD provided names. -# ----- -# internal FreeBSD -mw88W8363fw mw88W8363fw -mwlboot mwlboot 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 a56ef20a3e..53c58ef18f 100644 --- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c @@ -22,10 +22,13 @@ HAIKU_FBSD_WLAN_DRIVER_GLUE(ralinkwifi, ral, pci) -NO_HAIKU_FBSD_MII_DRIVER(); -NO_HAIKU_REENABLE_INTERRUPTS(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(0); +HAIKU_FIRMWARE_NAME_MAP(3) = {{"rt2561fw", "rt2561.bin"}, + {"rt2561sfw", "rt2561s.bin"}, {"rt2661fw", "rt2661.bin"}}; + +NO_HAIKU_FBSD_MII_DRIVER(); +NO_HAIKU_REENABLE_INTERRUPTS(); #define RT2661_INT_MASK_CSR 0x346c diff --git a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/ralinkwifi.settings b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/ralinkwifi.settings deleted file mode 100644 index a7c9ffa503..0000000000 --- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/ralinkwifi.settings +++ /dev/null @@ -1,14 +0,0 @@ -# -# This is the configuration file for the ralinkwifi wireless network driver. -# It should be located at "/boot/home/config/settings/kernel/drivers" and named -# "ralinkwifi". -# - -# -# Mapping of the driver internal firmware names to the official Ralink -# Technology® names. -# ----- -# internal Ralink Technology® -rt2561fw rt2561.bin -rt2561sfw rt2561s.bin -rt2661fw rt2661.bin