From c30e7b0f13fd9a6b342cdaa636da7bde53812518 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Feb 2008 10:39:06 +0000
Subject: [PATCH] * Determine networking.enableIntel3945ABGFirmware.

svn path=/nixos/trunk/; revision=10490
---
 installer/nixos-hardware-scan.pl | 7 +++++++
 system/options.nix               | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index a30f70584f9..00470a6e2fd 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -51,6 +51,7 @@ push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
 # However, some are needed in the initrd to boot the system.
 
 my $enableIntel2200BGFirmware = "false";
+my $enableIntel3945ABGFirmware = "false";
 my $videoDriver = "vesa";
 
 sub pciCheck {
@@ -94,6 +95,10 @@ sub pciCheck {
         ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
          $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
 
+    $enableIntel3945ABGFirmware = "true" if $vendor eq "0x8086" &&
+        ($device eq "0x4229" || $device eq "0x4230" ||
+         $device eq "0x4222" || $device eq "0x4227");
+
     # Hm, can we extract the PCI ids supported by X drivers somehow?
     # cf. http://www.calel.org/pci-devices/xorg-device-list.html
     $videoDriver = "i810" if $vendor eq "0x8086" &&
@@ -206,6 +211,8 @@ print <<EOF ;
   };
 
   networking = {
+    enableIntel3945ABGFirmware = $enableIntel3945ABGFirmware;
+    
     # Warning: setting this option to `true' requires acceptance of the
     # firmware license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
     enableIntel2200BGFirmware = $enableIntel2200BGFirmware;
diff --git a/system/options.nix b/system/options.nix
index 4fee59cc4ea..98fc589b675 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -352,7 +352,7 @@
       default = false;
       description = "
         This option enables automatic loading of the firmware for the Intel
-        PRO/Wireless 3945ABG.
+        PRO/Wireless 3945ABG / 4965AGN.
       ";
     };