[oe-commits] org.oe.dev zd1211: Clean up duplicate files

[nail commit]

zd1211: Clean up duplicate files

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 229b8b20851aa09c8224d1b78c96fc495159d9e2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=229b8b20851aa09c8224d1b78c96fc495159d9e2
Files:
1
packages/zd1211/zd1211-r83/makefile-unslung.patch
packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch
packages/zd1211/zd1211-r83/unslung-writel-logging.patch
packages/zd1211/zd1211_r59.bb
packages/zd1211/zd1211_r67.bb
packages/zd1211/zd1211_r74.bb
packages/zd1211/files
packages/zd1211/files/makefile-unslung.patch
packages/zd1211/files/unslung-iwpriv-hack.patch
packages/zd1211/files/unslung-writel-logging.patch
Diffs:

#
# mt diff -rac412c49a8aac12bc5ca1ca1fdefd25e4ea4627c -r229b8b20851aa09c8224d1b78c96fc495159d9e2
#
# 
# 
# delete "packages/zd1211/zd1211-r83/makefile-unslung.patch"
# 
# delete "packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch"
# 
# delete "packages/zd1211/zd1211-r83/unslung-writel-logging.patch"
# 
# delete "packages/zd1211/zd1211_r59.bb"
# 
# delete "packages/zd1211/zd1211_r67.bb"
# 
# delete "packages/zd1211/zd1211_r74.bb"
# 
# add_dir "packages/zd1211/files"
# 
# add_file "packages/zd1211/files/makefile-unslung.patch"
#  content [09bac8e9247378a272b581367518455ef867e1ca]
# 
# add_file "packages/zd1211/files/unslung-iwpriv-hack.patch"
#  content [5e770f37069d3fb00d686a31fc83cdfb7ce58ee5]
# 
# add_file "packages/zd1211/files/unslung-writel-logging.patch"
#  content [8f0a83232cdd234c72454b742fcee208682ffad5]
# 
============================================================
--- packages/zd1211/files/makefile-unslung.patch	09bac8e9247378a272b581367518455ef867e1ca
+++ packages/zd1211/files/makefile-unslung.patch	09bac8e9247378a272b581367518455ef867e1ca
@@ -0,0 +1,48 @@
+--- zd1211-driver-r77/Makefile.orig	2006-02-25 16:04:26.000000000 +0100
++++ zd1211-driver-r77/Makefile	2006-02-25 17:11:27.000000000 +0100
+@@ -4,24 +4,23 @@
+ #
+ #
+ 
+-CC=gcc
+-CPP=g++
+-LD=ld
+-rM=rm -f -r
++CC ?= gcc
++CPP ?= g++
++LD ?= ld
+ 
+-MODPATH := /lib/modules/$(shell uname -r)
++MODPATH ?= /lib/modules/$(shell uname -r)
+ 
+ # if the kernel is 2.6.x, turn on this
+-KERN_26=y
++#KERN_26=y
+ 
+-KERNEL_SOURCE=$(MODPATH)/source
++KERNEL_SOURCE ?= $(MODPATH)/source
+ #KERNEL_SOURCE=/usr/src/linux
+ 
+ # set to 1 for zd1211b
+ ZD1211REV_B=0
+ 
+-SRC_DIR=src
+-DEFINES=-D__KERNEL__ -DMODULE=1
++SRC_DIR=src
++DEFINES ?=-D__KERNEL__ -DMODULE=1
+ 
+ 
+ 
+@@ -227,9 +226,9 @@
+ 	depmod -a
+ 
+ #for apdbg
+-	gcc -o apdbg apdbg.c
+-	chmod +x apdbg
+-	cp ./apdbg /sbin/apdbg   
++#	gcc -o apdbg apdbg.c
++#	chmod +x apdbg
++#	cp ./apdbg /sbin/apdbg   
+ 
+ clean:
+ 	rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o  $(SRC_DIR)/.*.o.cmd
============================================================
--- packages/zd1211/files/unslung-iwpriv-hack.patch	5e770f37069d3fb00d686a31fc83cdfb7ce58ee5
+++ packages/zd1211/files/unslung-iwpriv-hack.patch	5e770f37069d3fb00d686a31fc83cdfb7ce58ee5
@@ -0,0 +1,19 @@
+--- zd1211-driver-r74/src/zd1205.c~	2006-04-16 09:42:15.000000000 -0500
++++ zd1211-driver-r74/src/zd1205.c	2006-04-27 12:29:03.000000000 -0500
+@@ -349,8 +349,14 @@
+                 { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" },
+                 { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" },
+                 { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" },
+-                { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ },
+-                { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ },
++// HACK HACK HACK - The following two lines are commented out in order to make
++// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions
++// can only handle up to 16 iwpriv entries in this structure.  Yes, the correct
++// fix is to patch the Wireless Extensions in the Unslung kernel.  This hack
++// should be removed when that's actually done.  ~mwester 27APR2006
++//                { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ },
++//                { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ },
++// End of HACK
+                 { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" },
+                 { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" },
+         };
============================================================
--- packages/zd1211/files/unslung-writel-logging.patch	8f0a83232cdd234c72454b742fcee208682ffad5
+++ packages/zd1211/files/unslung-writel-logging.patch	8f0a83232cdd234c72454b742fcee208682ffad5
@@ -0,0 +1,14 @@
+--- zd1211-driver-r74/src/zd1211.c~	2006-04-09 12:28:06.000000000 -0500
++++ zd1211-driver-r74/src/zd1211.c	2006-04-27 12:38:55.000000000 -0500
+@@ -652,7 +652,10 @@
+                 count++;
+ 
+                 if (count > 5) {
+-                        printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious");
++// You are going to see this often enough on Unslung that we might as well put it in
++// the syslog and fix it so it has a nl on the end.  Sigh.  ~mwester, 27APR06
++//
++                        printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n");
+                         break;
+                 }
+         }