From a7abbdae773102efa6c570c1f10a99a0b848c171 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 3 Jul 2018 15:36:30 -0400 Subject: [PATCH] iprowifi4965: Add some more firmwares to the image. Not sure why these were left out. Probably helps with #12407. --- .../kernel/drivers/network/wlan/iprowifi4965/Jamfile | 12 ++++++++---- .../kernel/drivers/network/wlan/iprowifi4965/glue.c | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile index 7e4074fffa..cdbefd9d5a 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile @@ -25,14 +25,18 @@ KernelAddon iprowifi4965 : ; HAIKU_WIFI_FIRMWARE_PACKAGES on iprowifi4965 = - iwlwifi-1000-ucode-39.31.5.1 - iwlwifi-2030-ucode-18.168.6.1 iwlwifi-4965-ucode-228.61.2.24 + 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 + iwlwifi-4965-ucode-228.61.2.24 iwlwifi-5000-ucode-8.83.5.1 iwlwifi-5150-ucode-8.24.2.2 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-1000-ucode-39.31.5.1.tgz - iwlwifi-2030-ucode-18.168.6.1.tgz iwlwifi-4965-ucode-228.61.2.24.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 + iwlwifi-4965-ucode-228.61.2.24.tgz iwlwifi-5000-ucode-8.83.5.1.tgz iwlwifi-5150-ucode-8.24.2.2.tgz iwlwifi-6000-ucode-9.221.4.1.tgz iwlwifi-6000g2a-ucode-18.168.6.1.tgz iwlwifi-6000g2b-ucode-18.168.6.1.tgz iwlwifi-6050-ucode-41.28.5.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 cf23a6d04a..1d0b7af6ed 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c @@ -24,8 +24,11 @@ NO_HAIKU_FBSD_MII_DRIVER(); NO_HAIKU_REENABLE_INTERRUPTS(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(44417); -HAIKU_FIRMWARE_NAME_MAP(9) = { +HAIKU_FIRMWARE_NAME_MAP(12) = { + {"iwn105fw", "iwlwifi-105-6.ucode"}, + {"iwn135fw", "iwlwifi-135-6.ucode"}, {"iwn1000fw", "iwlwifi-1000-5.ucode"}, + {"iwn2000fw", "iwlwifi-2000-6.ucode"}, {"iwn2030fw", "iwlwifi-2030-6.ucode"}, {"iwn4965fw", "iwlwifi-4965-2.ucode"}, {"iwn5000fw", "iwlwifi-5000-5.ucode"},