[haiku-commits] r34833 - in haiku/trunk: build/jam src/add-ons/kernel/drivers/network/wlan/ipw2100
- From: coling@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 31 Dec 2009 21:39:27 +0100 (CET)
Author: colin
Date: 2009-12-31 21:39:27 +0100 (Thu, 31 Dec 2009)
New Revision: 34833
Changeset: http://dev.haiku-os.org/changeset/34833/haiku
Modified:
haiku/trunk/build/jam/OptionalPackages
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ipw2100/ipw2100.cpp
Log:
* Adjusting firmware path of Haiku's native Intel PRO/Wireless 2100 driver,
so that it can make use of the firmware installed by the OptionalPackage
Wifi-ipw2100+fw.
* Updating OptionalPackages to use the latest Wifi-ipw2100+fw package.
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2009-12-31 17:21:17 UTC (rev
34832)
+++ haiku/trunk/build/jam/OptionalPackages 2009-12-31 20:39:27 UTC (rev
34833)
@@ -1012,27 +1012,29 @@
: /boot/system/documentation/userguide/en/contents.html : User\
Guide ;
}
+
# Wifi-ipw2100+fw
if [ IsOptionalHaikuImagePackageAdded Wifi-ipw2100+fw ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Wifi-ipw2100+fw available for
$(TARGET_ARCH)" ;
} else {
- AddDriversToHaikuImage net : ipw2100 ;
- InstallOptionalHaikuImagePackage
ipw2100-firmware-installer-2009-12-26
- : $(baseURL)/ipw2100-firmware-installer-2009-12-26.zip
+ AddDriversToHaikuImage net : ipw2100 ;
+ InstallOptionalHaikuImagePackage
ipw2100-firmware-installer-2009-12-26b
+ : $(baseURL)/ipw2100-firmware-installer-2009-12-26b.zip
:
;
AddSymlinkToHaikuImage home config boot launch
- : /boot/common/bin/install_firmware_iprowifi2100 ;
+ : /boot/common/bin/install_firmware_ipw2100 ;
}
}
+
# Wifi-iprowifi2200+fw
if [ IsOptionalHaikuImagePackageAdded Wifi-iprowifi2200+fw ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Wifi-iprowifi2200+fw available for
$(TARGET_ARCH)" ;
} else {
- AddDriversToHaikuImage net : iprowifi2200 ;
+ AddDriversToHaikuImage net : iprowifi2200 ;
InstallOptionalHaikuImagePackage
iprowifi2200-firmware-installer-2009-12-26
:
$(baseURL)/iprowifi2200-firmware-installer-2009-12-26.zip
:
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ipw2100/ipw2100.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ipw2100/ipw2100.cpp
2009-12-31 17:21:17 UTC (rev 34832)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ipw2100/ipw2100.cpp
2009-12-31 20:39:27 UTC (rev 34833)
@@ -1160,10 +1160,20 @@
{
const char *firmware;
switch (fMode) {
- case IPW_MODE_BSS: firmware =
"/etc/firmware/ipw2100/ipw2100-1.3.fw"; break;
- case IPW_MODE_IBSS: firmware =
"/etc/firmware/ipw2100/ipw2100-1.3-i.fw"; break;
- case IPW_MODE_MONITOR: firmware =
"/etc/firmware/ipw2100/ipw2100-1.3-p.fw"; break;
- default: return B_BAD_VALUE;
+ case IPW_MODE_BSS:
+ firmware = "/system/data/firmware/ipw2100/ipw_bss";
+ break;
+
+ case IPW_MODE_IBSS:
+ firmware = "/system/data/firmware/ipw2100/ipw_ibss";
+ break;
+
+ case IPW_MODE_MONITOR:
+ firmware = "/system/data/firmware/ipw2100/ipw_monitor";
+ break;
+
+ default:
+ return B_BAD_VALUE;
}
TRACE_ALWAYS(("IPW2100: loading firmware %s\n", firmware));
Other related posts:
- » [haiku-commits] r34833 - in haiku/trunk: build/jam src/add-ons/kernel/drivers/network/wlan/ipw2100 - coling
