[haiku-commits] r35171 - in haiku/trunk/src/add-ons/kernel/drivers/network/wlan: broadcom43xx iprowifi2100 iprowifi2200 iprowifi3945 iprowifi4965 ...

Author: colin
Date: 2010-01-19 18:49:45 +0100 (Tue, 19 Jan 2010)
New Revision: 35171
Changeset: http://dev.haiku-os.org/changeset/35171/haiku

Removed:
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/broadcom43xx.settings
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/iprowifi2100.settings
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/iprowifi2200.settings
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/iprowifi3945.settings
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/iprowifi4965.settings
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/marvell88w8335.settings
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/marvell88w8363.settings
   
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/ralinkwifi.settings
Modified:
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
Log:
* Adapting firmware based driver to the new firmware name mapping method.
* Removing the respective settings files, as they are no longer needed.


Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c     
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c     
2010-01-19 17:49:45 UTC (rev 35171)
@@ -25,6 +25,7 @@
 NO_HAIKU_REENABLE_INTERRUPTS();
 HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
 HAIKU_FIRMWARE_VERSION(0);
+NO_HAIKU_FIRMWARE_NAME_MAP();
 
 
 int

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c     
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c     
2010-01-19 17:49:45 UTC (rev 35171)
@@ -23,6 +23,8 @@
 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

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c     
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c     
2010-01-19 17:49:45 UTC (rev 35171)
@@ -22,6 +22,8 @@
 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

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c     
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c     
2010-01-19 17:49:45 UTC (rev 35171)
@@ -23,6 +23,7 @@
 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

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c     
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c     
2010-01-19 17:49:45 UTC (rev 35171)
@@ -24,6 +24,7 @@
 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

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c   
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c   
2010-01-19 17:49:45 UTC (rev 35171)
@@ -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();

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c   
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c   
2010-01-19 17:49:45 UTC (rev 35171)
@@ -18,11 +18,13 @@
 
 
 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)
 {

Modified: haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c       
2010-01-19 17:44:38 UTC (rev 35170)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c       
2010-01-19 17:49:45 UTC (rev 35171)
@@ -22,12 +22,15 @@
 
 
 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
 #define RT2661_MCU_INT_MASK_CSR                0x0018
 


Other related posts:

  • » [haiku-commits] r35171 - in haiku/trunk/src/add-ons/kernel/drivers/network/wlan: broadcom43xx iprowifi2100 iprowifi2200 iprowifi3945 iprowifi4965 ... - coling