From 6a65a12f72a90356e32ce57b63307b8e198ead2f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 22 Dec 2004 22:09:00 +0000
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into
 r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/22 18:11:48+01:00 uni-frankfurt.de!mickeyl
add hostap-modules and hostap-driver 0.3.2 - development tree - hence default preference = -1

BKrev: 41c9f07cFN4S6DzLbXyxVy_fWeYlpw
---
 packages/hostap/files/hostap_cs.conf                              | 7 +++++++
 packages/hostap/hostap-modules-0.2.4/Makefile.patch               | 0
 packages/hostap/hostap-modules-0.2.4/mtx_compat.diff              | 0
 packages/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff | 0
 packages/hostap/hostap-modules-0.3.2/Makefile.patch               | 0
 packages/hostap/hostap-modules-0.3.2/mtx_compat.diff              | 0
 packages/hostap/hostap-modules-0.3.2/mtx_hostap_deferred_irq.diff | 0
 packages/hostap/hostap-modules_0.2.4.bb                           | 0
 packages/hostap/hostap-modules_0.3.2.bb                           | 0
 packages/hostap/hostap-utils_0.3.2.bb                             | 0
 10 files changed, 7 insertions(+)
 delete mode 100644 packages/hostap/hostap-modules-0.2.4/Makefile.patch
 delete mode 100644 packages/hostap/hostap-modules-0.2.4/mtx_compat.diff
 delete mode 100644 packages/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff
 create mode 100644 packages/hostap/hostap-modules-0.3.2/Makefile.patch
 create mode 100644 packages/hostap/hostap-modules-0.3.2/mtx_compat.diff
 create mode 100644 packages/hostap/hostap-modules-0.3.2/mtx_hostap_deferred_irq.diff
 delete mode 100644 packages/hostap/hostap-modules_0.2.4.bb
 create mode 100644 packages/hostap/hostap-modules_0.3.2.bb
 create mode 100644 packages/hostap/hostap-utils_0.3.2.bb

(limited to 'packages/hostap')

diff --git a/packages/hostap/files/hostap_cs.conf b/packages/hostap/files/hostap_cs.conf
index 4aaede4263..712f9db9f6 100644
--- a/packages/hostap/files/hostap_cs.conf
+++ b/packages/hostap/files/hostap_cs.conf
@@ -134,6 +134,13 @@ card "SanDisk ConnectPlus OEM (0MB)"
    manfid 0xd601, 0x0010
    bind "hostap_cs"
 
+# needs special activation (>=hostap 0.3.2 only) plus firmware upload
+card "SanDisk ConnectPlus w/ Memory"
+   version "SanDisk", "ConnectPlus"
+   manfid 0xd601, 0x0101
+   bind "ide-cs" to 1
+   bind "hostap_cs" to 0
+
 card "Senao/Origo 80211b WLAN Card"
    manfid 0x000b,0x7100
    bind "hostap_cs"
diff --git a/packages/hostap/hostap-modules-0.2.4/Makefile.patch b/packages/hostap/hostap-modules-0.2.4/Makefile.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/hostap/hostap-modules-0.2.4/mtx_compat.diff b/packages/hostap/hostap-modules-0.2.4/mtx_compat.diff
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/hostap/hostap-modules-0.3.2/Makefile.patch b/packages/hostap/hostap-modules-0.3.2/Makefile.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/hostap/hostap-modules-0.3.2/mtx_compat.diff b/packages/hostap/hostap-modules-0.3.2/mtx_compat.diff
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/hostap/hostap-modules-0.3.2/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.3.2/mtx_hostap_deferred_irq.diff
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/hostap/hostap-modules_0.2.4.bb b/packages/hostap/hostap-modules_0.2.4.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/hostap/hostap-modules_0.3.2.bb b/packages/hostap/hostap-modules_0.3.2.bb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/hostap/hostap-utils_0.3.2.bb b/packages/hostap/hostap-utils_0.3.2.bb
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3