[oe-commits] : madwifi: update to new hal

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.dreambox
Commit: 0ce6b313d0efff94c9d22a6f6998c27a8e5cfb90
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=0ce6b313d0efff94c9d22a6f6998c27a8e5cfb90

Author:  <tmbinc at openembedded.org>
Date:   Mon Aug 18 04:52:34 2008 +0000

madwifi: update to new hal

---

 ...ine-ioreadwrite32be-for-little-endian-too.patch |   13 -----
 packages/madwifi/files/40-fix-mips.patch           |   49 --------------------
 packages/madwifi/files/40-fix-warnings.patch       |   13 +++++
 packages/madwifi/madwifi-ng_r3314-20080131.bb      |   25 ++++++++--
 4 files changed, 32 insertions(+), 68 deletions(-)

diff --git a/packages/madwifi/files/30-define-ioreadwrite32be-for-little-endian-too.patch b/packages/madwifi/files/30-define-ioreadwrite32be-for-little-endian-too.patch
deleted file mode 100644
index 3752a55..0000000
--- a/packages/madwifi/files/30-define-ioreadwrite32be-for-little-endian-too.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Reported as http://madwifi.org/ticket/1783 ...
-
---- madwifi-ng-r3314-20080131/ath_hal/ah_os.h~	2007-11-23 20:08:18.000000000 +1030
-+++ madwifi-ng-r3314-20080131/ath_hal/ah_os.h	2008-02-11 23:12:11.000000000 +1030
-@@ -168,7 +168,7 @@
-  * for the second time, so the native implementations should be preferred.
-  */
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)) && \
--	!defined(CONFIG_GENERIC_IOMAP) && (AH_BYTE_ORDER == AH_BIG_ENDIAN) && \
-+	!defined(CONFIG_GENERIC_IOMAP) && \
- 	!defined(__mips__) && !defined(__hppa__) && !defined(__powerpc__)
- # ifndef iowrite32be
- #  define iowrite32be(_val, _addr) iowrite32(swab32((_val)), (_addr))
diff --git a/packages/madwifi/files/40-fix-mips.patch b/packages/madwifi/files/40-fix-mips.patch
deleted file mode 100644
index f4e55d4..0000000
--- a/packages/madwifi/files/40-fix-mips.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: madwifi-ng-r3314-20080131/ath/if_athvar.h
-===================================================================
---- madwifi-ng-r3314-20080131.orig/ath/if_athvar.h	2008-06-12 03:19:30.000000000 +0200
-+++ madwifi-ng-r3314-20080131/ath/if_athvar.h	2008-06-12 03:19:41.000000000 +0200
-@@ -522,7 +522,7 @@
- 	atomic_t av_beacon_alloc;       /* set to 1 when the next beacon needs
- 					   to be recomputed */
- #else
--	unsigned int av_beacon_alloc;
-+	unsigned long av_beacon_alloc;
- #endif
- };
- #define	ATH_VAP(_v)	((struct ath_vap *)(_v))
-Index: madwifi-ng-r3314-20080131/hal/public/mips1-le-elf.inc
-===================================================================
---- madwifi-ng-r3314-20080131.orig/hal/public/mips1-le-elf.inc	2008-06-12 03:18:14.000000000 +0200
-+++ madwifi-ng-r3314-20080131/hal/public/mips1-le-elf.inc	2008-06-12 03:18:34.000000000 +0200
-@@ -68,5 +68,5 @@
- 
- LDOPTS=	-EL
- COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
--COPTS+=	-G 0 -EL -mno-abicalls -fno-pic -mips1 -Wa,--trap \
-+COPTS+=	-G 0 -mno-abicalls -fno-pic -Wa,--trap \
- 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
-Index: madwifi-ng-r3314-20080131/ath_hal/ah_os.h
-===================================================================
---- madwifi-ng-r3314-20080131.orig/ath_hal/ah_os.h	2008-06-12 03:20:15.000000000 +0200
-+++ madwifi-ng-r3314-20080131/ath_hal/ah_os.h	2008-06-12 03:22:16.000000000 +0200
-@@ -156,6 +156,11 @@
- #endif
- #endif				/* AH_BYTE_ORDER */
- 
-+#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,12)
-+#define iowrite32 writel
-+#define ioread32 readl
-+#endif
-+
- /*
-  * Some big-endian architectures don't set CONFIG_GENERIC_IOMAP, but fail to
-  * implement iowrite32be and ioread32be.  Provide compatibility macros when
-@@ -169,7 +174,7 @@
-  */
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)) && \
- 	!defined(CONFIG_GENERIC_IOMAP) && \
--	!defined(__mips__) && !defined(__hppa__) && !defined(__powerpc__)
-+	!defined(__hppa__) && !defined(__powerpc__)
- # ifndef iowrite32be
- #  define iowrite32be(_val, _addr) iowrite32(swab32((_val)), (_addr))
- # endif
diff --git a/packages/madwifi/files/40-fix-warnings.patch b/packages/madwifi/files/40-fix-warnings.patch
new file mode 100644
index 0000000..ec984ce
--- /dev/null
+++ b/packages/madwifi/files/40-fix-warnings.patch
@@ -0,0 +1,13 @@
+Index: madwifi-ng-r3314-20080131/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r3314-20080131.orig/ath/if_athvar.h	2008-06-12 03:19:30.000000000 +0200
++++ madwifi-ng-r3314-20080131/ath/if_athvar.h	2008-06-12 03:19:41.000000000 +0200
+@@ -522,7 +522,7 @@
+ 	atomic_t av_beacon_alloc;       /* set to 1 when the next beacon needs
+ 					   to be recomputed */
+ #else
+-	unsigned int av_beacon_alloc;
++	unsigned long av_beacon_alloc;
+ #endif
+ };
+ #define	ATH_VAP(_v)	((struct ath_vap *)(_v))
diff --git a/packages/madwifi/madwifi-ng_r3314-20080131.bb b/packages/madwifi/madwifi-ng_r3314-20080131.bb
index ab4519c..85f75f9 100644
--- a/packages/madwifi/madwifi-ng_r3314-20080131.bb
+++ b/packages/madwifi/madwifi-ng_r3314-20080131.bb
@@ -6,10 +6,23 @@ INHIBIT_PACKAGE_STRIP = "1"
 
 require madwifi-ng_r.inc
 
-SRC_URI += " \
-	file://30-define-ioreadwrite32be-for-little-endian-too.patch;patch=1 \
-	file://40-fix-mips.patch;patch=1 \
-	"
-
 # PR set after the include, to override what's set in the included file.
-PR = "r6"
+PR = "r7"
+
+SRC_URI += "http://sources.dreamboxupdate.com/download/snapshots/openwrt_madwifi_patches_20080811.tar.bz2 \
+	file://40-fix-warnings.patch;patch=1;pnum=1 \
+	http://sources.dreamboxupdate.com/download/snapshots/450-new_madwifi_mipsel_hal.patch.bz2;patch=1"
+
+do_munge() {
+	CUR=`pwd`
+	cd ${S}
+	for i in `ls ${WORKDIR}/openwrt_madwifi_patches | grep ".patch" | sort -n | xargs`; do
+		oenote "Applying openwrt madwifi patch '$i'";
+		patch -p1 < ${WORKDIR}/openwrt_madwifi_patches/$i;
+	done;
+	cd $CUR
+}
+
+addtask munge before do_patch after do_unpack
+
+