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

* Adapting firmware based driver to the new firmware name mapping method.

Browse Source 
* 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
This commit is contained in:
Colin Günther 2010-01-19 17:49:45 +00:00
parent d3806c1b62
commit 396abf076f
16 changed files with 18 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/add-ons/kernel/drivers/network/wlan/broadcom43xx/broadcom43xx.settings
View File

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

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

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

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

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

13
src/add-ons/kernel/drivers/network/wlan/iprowifi2100/iprowifi2100.settings
View File

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

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

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

13
src/add-ons/kernel/drivers/network/wlan/iprowifi2200/iprowifi2200.settings
View File

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

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

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

11
src/add-ons/kernel/drivers/network/wlan/iprowifi3945/iprowifi3945.settings
View File

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

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

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

11
src/add-ons/kernel/drivers/network/wlan/iprowifi4965/iprowifi4965.settings
View File

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

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

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

12
src/add-ons/kernel/drivers/network/wlan/marvell88w8335/marvell88w8335.settings
View File

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

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

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

12
src/add-ons/kernel/drivers/network/wlan/marvell88w8363/marvell88w8363.settings
View File

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

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

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

14
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/ralinkwifi.settings
View File

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