6 files changed, 177 insertions, 33 deletions

diff --git a/openembedded/packages/orinoco/files/hermes.conf b/openembedded/packages/orinoco/files/hermes.conf
new file mode 100644
index 0000000000..e45114dd08
--- /dev/null
+++ b/openembedded/packages/orinoco/files/hermes.conf
@@ -0,0 +1,149 @@
+device "orinoco_cs"
+  class "network"
+  module "hermes", "orinoco", "orinoco_cs"
+
+device "spectrum_cs"
+  class "network" module "hermes", "orinoco", "spectrum_cs"
+
+
+# This manfid was used for cards with Lucent/Agere and Intersil firmware.
+# orinoco_cs supports both types, so we don't need to distinguish them.
+
+card "Orinoco or Intersil Prism 2 Wireless"
+  manfid 0x0156,0x0002
+  bind "orinoco_cs"
+
+
+# Cards with Lucent/Agere firmware (Hermes chipset)
+
+card "Lucent Technologies Wavelan/IEEE"
+  version "Lucent Technologies", "WaveLAN/IEEE"
+  bind "orinoco_cs"
+
+card "Avaya World Card"
+  version "Avaya Communication", "Avaya Wireless PC Card"
+  bind "orinoco_cs"
+
+card "Cabletron RoamAbout 802.11 DS"
+  version "Cabletron", "RoamAbout 802.11 DS"
+  bind "orinoco_cs"
+
+card "ELSA AirLancer MC-11"
+  version "ELSA", "AirLancer MC-11"
+  bind "orinoco_cs"
+
+card "MELCO WLI-PCM-L11"
+  version "MELCO", "WLI-PCM-L11"
+  bind "orinoco_cs"
+
+card "ARtem Onair"
+  version "ARtem", "Onair"
+  bind "orinoco_cs"
+
+
+# Cards with Symbol firmware in flash (Spectrum24 chipset)
+
+card "LA4111 Spectrum24 Wireless LAN PC Card"
+  version "Symbol Technologies"
+  bind "orinoco_cs"
+
+card "3Com AirConnect"
+  version "3Com", "3CRWE737A AirConnect Wireless LAN PC Card"
+  bind "orinoco_cs"
+
+card "Intel PRO/Wireless 2011"
+  manfid 0x0089,0x0001
+  bind "orinoco_cs"
+
+card "Ericsson WLAN Card C11"
+  manfid 0x016b,0x0001
+  bind "orinoco_cs" 
+
+card "Nortel Networks e-mobility 802.11 Wireless LAN PC Card"
+  version "Nortel Networks", "emobility 802.11 Wireless LAN PC Card", "1.00"
+  bind "orinoco_cs"
+
+card "D-Link DWL-650H"
+  version "D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter"
+  bind "orinoco_cs"
+
+
+# Cards with Symbol firmware without flash memory (Spectrum24 Trilogy).
+# These cards need a separate driver that loads the firmware.
+
+card "LA4100 Spectrum24 CF WLAN Card"
+  manfid 0x026c, 0x0001
+  bind "spectrum_cs"
+
+card "Socket Communications CF+ LP WLAN Card"
+  manfid 0x0104, 0x0001
+  bind "spectrum_cs"
+
+card "Intel PRO/Wireless 2011B"
+  manfid 0x0089, 0x0001
+  bind "spectrum_cs"
+
+
+# Cards with Intersil firmware (Prism chipset)
+
+card "Farallon SkyLINE"
+  version "INTERSIL", "HFA384x/IEEE"
+  bind "orinoco_cs"
+
+card "D-Link DWL-650"
+  version "D", "Link DWL-650 11Mbps WLAN Card"
+  bind "orinoco_cs"
+
+card "SAMSUNG 11Mbps WLAN Card"
+  version "SAMSUNG", "11Mbps WLAN Card"
+  bind "orinoco_cs"
+# Does this one cover Compaq as well ???
+
+card "HyperLink Wireless PC Card 11Mbps"
+  version "HyperLink","Wireless PC Card 11Mbps"
+  bind "orinoco_cs"
+
+card "PROXIM LAN PC CARD HARMONY 80211B"
+  version "PROXIM","LAN PC CARD HARMONY 80211B"
+  bind "orinoco_cs"
+
+card "Linksys WPC11 11Mbps 802.11b WLAN Card"
+  version "Instant Wireless ", " Network PC CARD", "Version 01.02"
+  bind "orinoco_cs"
+
+card "Linksys WPC11 11Mbps 802.11b WLAN Card"
+  version "The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", "RevA"
+  bind "orinoco_cs"
+
+card "Linksys CompactFlash Wireless Card"
+  version "Linksys", "Wireless CompactFlash Card"
+  bind "orinoco_cs"
+
+card "Tekram PCF-200"
+  version "PCMCIA", "11M WLAN Card v2.5", "ISL37300P", "RevA"
+  bind "orinoco_cs"
+
+card "ACTIONTEC PRISM Wireless LAN PC Card"
+  version "ACTIONTEC", "PRISM Wireless LAN PC Card"
+  bind "orinoco_cs"
+
+card "Zcomax XI-325HP"
+  version " ", "IEEE 802.11 Wireless LAN/PC Card"
+  bind "orinoco_cs"
+
+card "Microsoft Wireless Notebook Adapter MN-520 1.0.3" 
+  version "Microsoft", "Wireless Notebook Adapter MN-520", "", "1.0.3"
+  bind "orinoco_cs"
+
+card "Linksys WPC11 Version 3"
+  manfid 0x0274,0x1613
+  bind "orinoco_cs"
+
+card "Netgear MA401RA"
+  version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA"
+  bind "orinoco_cs"
+
+card "BENQ AWL100"
+  version "BENQ", "AWL100 PCMCIA ADAPTER"
+  bind "orinoco_cs"
+
diff --git a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum.conf b/openembedded/packages/orinoco/files/spectrum.conf
index 96aa794f0b..849455537e 100644
--- a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum.conf
+++ b/openembedded/packages/orinoco/files/spectrum.conf
@@ -5,6 +5,10 @@ card "LA4100 Spectrum24 CF WLAN Card"
   manfid 0x026c, 0x0001
   bind "spectrum_cs"
 
+card "LA4137 Spectrum24 CF WLAN CARD"
+ manfid 0x014d, 0x0001
+  bind "spectrum_cs"
+
 card "Socket Communications CF+ LP WLAN Card"
   manfid 0x0104, 0x0001
   bind "spectrum_cs"
diff --git a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum_fw.h b/openembedded/packages/orinoco/files/spectrum_fw.h
index 94c825d372..94c825d372 100644
--- a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum_fw.h
+++ b/openembedded/packages/orinoco/files/spectrum_fw.h
diff --git a/openembedded/packages/orinoco/orinoco-conf_1.0.bb b/openembedded/packages/orinoco/orinoco-conf_1.0.bb
new file mode 100644
index 0000000000..d44446895d
--- /dev/null
+++ b/openembedded/packages/orinoco/orinoco-conf_1.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "PCMCIA-cs configuration files for Hermes (Orinoco) wireless LAN cards"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "file://spectrum.conf \
+           file://hermes.conf \
+           file://orinoco_cs.conf"
+
+do_install() {   
+        install -d ${D}${sysconfdir}/pcmcia
+        install -d ${D}${sysconfdir}/modutils   
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/
+        install -m 0644 ${WORKDIR}/hermes.conf ${D}${sysconfdir}/pcmcia/
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
+}
diff --git a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch b/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch
deleted file mode 100644
index c3d89d096b..0000000000
--- a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- orinoco-0.15rc1/spectrum_cs.c~spectrum-firmware     2004-04-19 07:08:24.000000000 +0200
-+++ orinoco-0.15rc1/spectrum_cs.c       2004-05-28 01:20:05.000000000 +0200
-@@ -57,7 +57,7 @@
-  * hotplug firmware directory (typically /usr/lib/hotplug/firmware) and
-  * make sure that you have hotplug installed and enabled in the kernel.
-  */
--/* #define SPECTRUM_FW_INCLUDED 1 */
-+#define SPECTRUM_FW_INCLUDED 1
- 
- #ifdef SPECTRUM_FW_INCLUDED
- /* Header with the firmware */
diff --git a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb
index 8093e7d246..e75924c19d 100644
--- a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -3,9 +3,11 @@ Also contains support for cards using downloadable firmware, i.e. the Symbol/Soc
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 PROVIDES = "spectrum-modules"
+DEPENDS = "orinoco-conf spectrum-fw"
+RDEPENDS = "orinoco-conf"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \
            file://makefile_fix.patch;patch=1 \
@@ -13,37 +15,24 @@ SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \
            file://add_utsname.patch;patch=1 \
            file://add_event.patch;patch=1 \
            file://spectrum_cs_ids.patch;patch=1 \
-           file://spectrum-firmware.patch;patch=1 \
-           file://catch-up-with-kernel-changes.patch;patch=1 \
-           file://spectrum.conf \
-           file://spectrum_fw.h \
-           file://orinoco_cs.conf"
+           file://catch-up-with-kernel-changes.patch;patch=1"
 S = "${WORKDIR}/orinoco-${PV}"
 
 inherit module
 
-do_compile_prepend() {
-        install ${WORKDIR}/spectrum_fw.h ${S}/
-}
-
 do_install() {   
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -d ${D}${sysconfdir}/pcmcia
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/
-        install -m 0644 hermes.conf ${D}${sysconfdir}/pcmcia/
-        install -d ${D}${sysconfdir}/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
-FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"        
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"        
 FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
                                 /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules = "/lib/modules/"
-RDEPENDS_orinoco-modules-cs = "orinoco-modules"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw"
 RDEPENDS_orinoco-modules-pci = "orinoco-modules"
 RDEPENDS_orinoco-modules-usb = "orinoco-modules"
 RDEPENDS_orinoco-modules-nortel = "orinoco-modules"