haiku.git

author	Augustin Cavalier <waddlesplash@gmail.com>	2018-09-15 20:06:45.0 -04:00:00
committer	waddlesplash <waddlesplash@gmail.com>	2018-09-16 0:09:10.0 +00:00:00
commit	ed2098b992b0f2f9409e91cdeb5bee35efefc746 [patch]
tree	2b98067beb812b134423ce0497a0a5f8fb44ca60
parent	b94118ef25ccd3246251ea19feb7debdad5da3a2
download	ed2098b992b0f2f9409e91cdeb5bee35efefc746.tar.gz

iprowifi4965: Add -100 firmware.

Should fix #14492.

Change-Id: If755bc1dc37f84da85cb0377a5e3105b89729735
Reviewed-on: https://review.haiku-os.org/570
Reviewed-by: waddlesplash <waddlesplash@gmail.com>

Diff

 data/system/data/firmware/iprowifi4965/iwlwifi-100-ucode-39.31.5.1.tgz | 0 
 src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile           | 2 ++
 src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c            | 6 +++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/system/data/firmware/iprowifi4965/iwlwifi-100-ucode-39.31.5.1.tgz b/data/system/data/firmware/iprowifi4965/iwlwifi-100-ucode-39.31.5.1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..396648452cb4e92f0ea33ab3905b43134e4eeb80 100644
Binary files /dev/null and b/data/system/data/firmware/iprowifi4965/iwlwifi-100-ucode-39.31.5.1.tgz differdiff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
index cdbefd9..0f09bc1 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
@@ -25,6 +25,7 @@
	;

HAIKU_WIFI_FIRMWARE_PACKAGES on iprowifi4965 =
	iwlwifi-100-ucode-39.31.5.1
	iwlwifi-105-ucode-18.168.6.1 iwlwifi-135-ucode-18.168.6.1
	iwlwifi-1000-ucode-39.31.5.1
	iwlwifi-2000-ucode-18.168.6.1 iwlwifi-2030-ucode-18.168.6.1
@@ -33,6 +34,7 @@
	iwlwifi-6000-ucode-9.221.4.1 iwlwifi-6000g2a-ucode-18.168.6.1
	iwlwifi-6000g2b-ucode-18.168.6.1 iwlwifi-6050-ucode-41.28.5.1 ;
HAIKU_WIFI_FIRMWARE_ARCHIVES on iprowifi4965 =
	iwlwifi-100-ucode-39.31.5.1.tgz
	iwlwifi-105-ucode-18.168.6.1.tgz iwlwifi-135-ucode-18.168.6.1.tgz
	iwlwifi-1000-ucode-39.31.5.1.tgz
	iwlwifi-2000-ucode-18.168.6.1.tgz iwlwifi-2030-ucode-18.168.6.1.tgz
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 6688418..fe8d321 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
@@ -1,5 +1,6 @@
/*
 * Copyright 2018, Colin Günther, coling@gmx.de. All rights reserved.
 * Copyright 2009, Colin Günther, coling@gmx.de. All rights reserved.
 * Copyright 2018, Haiku, Inc. All rights reserved.
 * Distributed under the terms of the MIT license.
 */

@@ -24,7 +25,8 @@
NO_HAIKU_REENABLE_INTERRUPTS();
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(44417);
HAIKU_FIRMWARE_NAME_MAP(12) = {
HAIKU_FIRMWARE_NAME_MAP(13) = {
	{"iwn100fw", "iwlwifi-100-5.ucode"},
	{"iwn105fw", "iwlwifi-105-6.ucode"},
	{"iwn135fw", "iwlwifi-135-6.ucode"},
	{"iwn1000fw", "iwlwifi-1000-5.ucode"},