i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Adjusting firmware path of Haiku's native Intel PRO/Wireless 2100 driver,

Browse Source 
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.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34833 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Colin Günther
2009-12-31 20:39:27 +00:00
parent 4502d80d7e
commit 1e84402302
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+5 -3
View File
@@ -1012,21 +1012,23 @@ if [ IsOptionalHaikuImagePackageAdded Welcome ] {
: /boot/system/documentation/userguide/en/contents.html : User\ Guide ; : /boot/system/documentation/userguide/en/contents.html : User\ Guide ;
} }
# Wifi-ipw2100+fw # Wifi-ipw2100+fw
if [ IsOptionalHaikuImagePackageAdded Wifi-ipw2100+fw ] { if [ IsOptionalHaikuImagePackageAdded Wifi-ipw2100+fw ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Wifi-ipw2100+fw available for $(TARGET_ARCH)" ; Echo "No optional package Wifi-ipw2100+fw available for $(TARGET_ARCH)" ;
} else { } else {
AddDriversToHaikuImage net : ipw2100 ; AddDriversToHaikuImage net : ipw2100 ;
InstallOptionalHaikuImagePackage ipw2100-firmware-installer-2009-12-26 InstallOptionalHaikuImagePackage ipw2100-firmware-installer-2009-12-26b
: $(baseURL)/ipw2100-firmware-installer-2009-12-26.zip : $(baseURL)/ipw2100-firmware-installer-2009-12-26b.zip
: :
; ;
AddSymlinkToHaikuImage home config boot launch AddSymlinkToHaikuImage home config boot launch
: /boot/common/bin/install_firmware_iprowifi2100 ; : /boot/common/bin/install_firmware_ipw2100 ;
} }
} }
# Wifi-iprowifi2200+fw # Wifi-iprowifi2200+fw
if [ IsOptionalHaikuImagePackageAdded Wifi-iprowifi2200+fw ] { if [ IsOptionalHaikuImagePackageAdded Wifi-iprowifi2200+fw ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
src/add-ons/kernel/drivers/network/wlan/ipw2100/ipw2100.cpp
+14 -4
View File
@@ -1160,10 +1160,20 @@ IPW2100::LoadMicrocodeAndFirmware()
{ {
const char *firmware; const char *firmware;
switch (fMode) { switch (fMode) {
case IPW_MODE_BSS: firmware = "/etc/firmware/ipw2100/ipw2100-1.3.fw"; break; case IPW_MODE_BSS:
case IPW_MODE_IBSS: firmware = "/etc/firmware/ipw2100/ipw2100-1.3-i.fw"; break; firmware = "/system/data/firmware/ipw2100/ipw_bss";
case IPW_MODE_MONITOR: firmware = "/etc/firmware/ipw2100/ipw2100-1.3-p.fw"; break; break;
default: return B_BAD_VALUE;
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)); TRACE_ALWAYS(("IPW2100: loading firmware %s\n", firmware));