From be85fd25006fe008d6009ac510aceabfb330ad89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2009 10:44:50 +0000
Subject: [PATCH] * "hardware" belongs in the NixOS tree, not in the
 configurations   tree.  (The configurations tree is not for general use.)

svn path=/nixos/branches/modular-nixos/; revision=15672
---
 modules/hardware/network/Intel2200BG.nix      | 11 ++++++++
 modules/hardware/network/Intel3945ABG.nix     | 21 ++++++++++++++++
 modules/hardware/network/Intel4965AGN.nix     | 21 ++++++++++++++++
 modules/hardware/network/SMC2632W/default.nix |  9 +++++++
 .../SMC2632W/firmware/cis/SMC2632W-v1.02.cis  |  8 ++++++
 modules/hardware/network/ZydasZD1211.nix      |  9 +++++++
 modules/hardware/video/encoder/Go7007.nix     | 25 +++++++++++++++++++
 7 files changed, 104 insertions(+)
 create mode 100644 modules/hardware/network/Intel2200BG.nix
 create mode 100644 modules/hardware/network/Intel3945ABG.nix
 create mode 100644 modules/hardware/network/Intel4965AGN.nix
 create mode 100644 modules/hardware/network/SMC2632W/default.nix
 create mode 100644 modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis
 create mode 100644 modules/hardware/network/ZydasZD1211.nix
 create mode 100644 modules/hardware/video/encoder/Go7007.nix

diff --git a/modules/hardware/network/Intel2200BG.nix b/modules/hardware/network/Intel2200BG.nix
new file mode 100644
index 00000000000..a9069da1e94
--- /dev/null
+++ b/modules/hardware/network/Intel2200BG.nix
@@ -0,0 +1,11 @@
+{pkgs, config, ...}:
+
+{
+  services = {
+    udev = {
+      # Warning: setting this option requires acceptance of the firmware
+      # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
+      addFirmware = [ pkgs.ipw2200fw ];
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/hardware/network/Intel3945ABG.nix b/modules/hardware/network/Intel3945ABG.nix
new file mode 100644
index 00000000000..5ba3a1c0263
--- /dev/null
+++ b/modules/hardware/network/Intel3945ABG.nix
@@ -0,0 +1,21 @@
+{pkgs, config, ...}:
+
+let
+  inherit (config.boot) kernelPackages;
+  inherit (kernelPackages) kernel;
+in
+
+{
+  boot = {
+    extraModulePackages =
+      pkgs.lib.optional
+        (!kernel.features ? iwlwifi)
+        kernelPackages.iwlwifi;
+  };
+
+  services = {
+    udev = {
+      addFirmware = [ pkgs.iwlwifi3945ucode ];
+    };
+  };
+}
diff --git a/modules/hardware/network/Intel4965AGN.nix b/modules/hardware/network/Intel4965AGN.nix
new file mode 100644
index 00000000000..e31d8902798
--- /dev/null
+++ b/modules/hardware/network/Intel4965AGN.nix
@@ -0,0 +1,21 @@
+{pkgs, config, ...}:
+
+let
+  inherit (config.boot) kernelPackages;
+  inherit (kernelPackages) kernel;
+in
+
+{
+  boot = {
+    extraModulePackages =
+      pkgs.lib.optional
+        (!kernel.features ? iwlwifi)
+        kernelPackages.iwlwifi;
+  };
+
+  services = {
+    udev = {
+      addFirmware = [ pkgs.iwlwifi4965ucode ];
+    };
+  };
+}
diff --git a/modules/hardware/network/SMC2632W/default.nix b/modules/hardware/network/SMC2632W/default.nix
new file mode 100644
index 00000000000..318131be749
--- /dev/null
+++ b/modules/hardware/network/SMC2632W/default.nix
@@ -0,0 +1,9 @@
+{pkgs, config, ...}:
+
+{
+  hardware = {
+    pcmcia = {
+      firmware = [ (pkgs.lib.cleanSource ./firmware) ];
+    };
+  };
+}
diff --git a/modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis b/modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis
new file mode 100644
index 00000000000..5f13088c373
--- /dev/null
+++ b/modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis
@@ -0,0 +1,8 @@
+  vers_1 5.0, "SMC", "SMC2632W", "Version 01.02", ""
+  manfid 0x0156, 0x0002
+  funcid network_adapter
+  cftable_entry 0x01 [default]
+    Vcc Vmin 3000mV Vmax 3300mV Iavg 300mA Ipeak 300mA
+    Idown 10mA
+    io 0x0000-0x003f [lines=6] [16bit]
+    irq mask 0xffff [level] [pulse]
diff --git a/modules/hardware/network/ZydasZD1211.nix b/modules/hardware/network/ZydasZD1211.nix
new file mode 100644
index 00000000000..a57e8a6cf95
--- /dev/null
+++ b/modules/hardware/network/ZydasZD1211.nix
@@ -0,0 +1,9 @@
+{pkgs, config, ...}:
+
+{
+  services = {
+    udev = {
+      addFirmware = [ pkgs.zd1211fw ];
+    };
+  };
+}
diff --git a/modules/hardware/video/encoder/Go7007.nix b/modules/hardware/video/encoder/Go7007.nix
new file mode 100644
index 00000000000..24ee27cf61d
--- /dev/null
+++ b/modules/hardware/video/encoder/Go7007.nix
@@ -0,0 +1,25 @@
+{pkgs, config, ...}:
+
+let
+  wisGo7007 = config.boot.kernelPackages.wis_go7007;
+
+  wisGo7007Pkg = [ wis_go7007 ];
+  wisGo7007Firmware = [ "${wis_go7007}/firmware" ];
+in
+
+{
+  boot = {
+    extraModulePackages = wisGo7007Pkg;
+  };
+
+  environment = {
+    extraPackages = wisGo7007Pkg;
+  };
+
+  services = {
+    udev = {
+      addFirmware = wisGo7007Firmware;
+      addUdevPkgs = wisGo7007Pkg;
+    };
+  };
+}