[oe-commits] : zd1211b-r222: fix patches

[OE GIT Trial]

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

Author:  <tmbinc at openembedded.org>
Date:   Thu Aug 21 09:13:42 2008 +0000

zd1211b-r222: fix patches

---

 .../zd1211b-r222/ZD1211LnxDrv_2_22_0_0.patch       |  117 ++++++++++----------
 packages/zd1211/zd1211b-r222/zdiface.patch         |   21 ++--
 2 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/packages/zd1211/zd1211b-r222/ZD1211LnxDrv_2_22_0_0.patch b/packages/zd1211/zd1211b-r222/ZD1211LnxDrv_2_22_0_0.patch
index fbd4bfb..3558e8c 100644
--- a/packages/zd1211/zd1211b-r222/ZD1211LnxDrv_2_22_0_0.patch
+++ b/packages/zd1211/zd1211b-r222/ZD1211LnxDrv_2_22_0_0.patch
@@ -1,60 +1,61 @@
---- ZD1211LnxDrv_2_22_0_0/Kopie von Makefile	2008-08-05 15:04:08.000000000 +0200
-+++ ZD1211LnxDrv_2_22_0_0/Makefile	2008-08-05 15:09:28.000000000 +0200
+diff -Naur org/Makefile patched/Makefile
+--- org/Makefile	2008-08-19 12:45:17.000000000 +0200
++++ patched/Makefile	2008-08-19 12:44:55.000000000 +0200
 @@ -4,9 +4,11 @@
- #
- #
- 
--HOST=
--CC=$(HOST)gcc
--LD=$(HOST)ld
-+#HOST=
-+#CC=$(HOST)gcc
-+#LD=$(HOST)ld
-+VERSION := $(shell uname -r)
-+MODPATH := /lib/modules/$(VERSION)
- KERN_VER=$(shell uname -r | cut -b1-3;)
- KDIR := /lib/modules/$(shell uname -r)/build
- PWD := $(shell pwd)
+ #
+ #
+ 
+-HOST=
+-CC=$(HOST)gcc
+-LD=$(HOST)ld
++#HOST=
++#CC=$(HOST)gcc
++#LD=$(HOST)ld
++VERSION := $(shell uname -r)
++MODPATH := /lib/modules/$(VERSION)
+ KERN_VER=$(shell uname -r | cut -b1-3;)
+ KDIR := /lib/modules/$(shell uname -r)/build
+ PWD := $(shell pwd)
 @@ -17,15 +19,17 @@
- 
- ifeq ($(KERN_VER), 2.6) 
-     KERN_26=y
--    KERNEL_SOURCE=/usr/src/linux-2.6.9
-+    KERNEL_SOURCE ?= $(MODPATH)/source
- else 
-     KERN_24=y
-     KERNEL_SOURCE=/usr/src/linux-2.4
- endif
- 
- SRC_DIR=src
--DEFINES=-D__KERNEL__ -DMODULE=1
-+DEFINES ?= -D__KERNEL__ -DMODULE=1
- 
-+# set to 1 for zd1211b
-+ZD1211REV_B=1
- 
- KERNRELEASE := $(shell uname -r;)
- MODPATH := /lib/modules/$(KERNRELEASE)
-@@ -258,14 +261,14 @@
- endif
- 
- debug:
--	gcc -o apdbg apdbg.c
--	chmod +x apdbg
--	cp ./apdbg /sbin/apdbg   
--	make -C Menudbg
--	mv Menudbg/menudbg .
--	chmod +x menudbg
--	cp ./menudbg /sbin
--	gcc -DPKT_SEND_FUNCTION -o winevl_iface Winevl_iface/pkt_send.c Winevl_iface/winevl_bridge.c
-+	#gcc -o apdbg apdbg.c
-+	#chmod +x apdbg
-+	#cp ./apdbg /sbin/apdbg   
-+	#make -C Menudbg
-+	#mv Menudbg/menudbg .
-+	#chmod +x menudbg
-+	#cp ./menudbg /sbin
-+	#gcc -DPKT_SEND_FUNCTION -o winevl_iface Winevl_iface/pkt_send.c Winevl_iface/winevl_bridge.c
- 
- clean:
- 	rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o  $(SRC_DIR)/.*.o.cmd menudbg apdbg winevl_iface
+ 
+ ifeq ($(KERN_VER), 2.6) 
+     KERN_26=y
+-    KERNEL_SOURCE=/usr/src/linux-2.6.9
++    KERNEL_SOURCE ?= $(MODPATH)/source
+ else 
+     KERN_24=y
+     KERNEL_SOURCE=/usr/src/linux-2.4
+ endif
+ 
+ SRC_DIR=src
+-DEFINES=-D__KERNEL__ -DMODULE=1
++DEFINES ?= -D__KERNEL__ -DMODULE=1
+ 
++# set to 1 for zd1211b
++ZD1211REV_B=1
+ 
+ KERNRELEASE := $(shell uname -r;)
+ MODPATH := /lib/modules/$(KERNRELEASE)
+@@ -362,14 +366,14 @@
+ 	/bin/sh scripts/Menuconfig
+ 
+ debug:
+-	gcc -o apdbg apdbg.c
+-	chmod +x apdbg
+-	cp ./apdbg /sbin/apdbg   
+-	make -C Menudbg
+-	mv Menudbg/menudbg .
+-	chmod +x menudbg
+-	cp ./menudbg /sbin
+-	gcc -DPKT_SEND_FUNCTION -o winevl_iface Winevl_iface/pkt_send.c Winevl_iface/winevl_bridge.c
++	#gcc -o apdbg apdbg.c
++	#chmod +x apdbg
++	#cp ./apdbg /sbin/apdbg   
++	#make -C Menudbg
++	#mv Menudbg/menudbg .
++	#chmod +x menudbg
++	#cp ./menudbg /sbin
++	#gcc -DPKT_SEND_FUNCTION -o winevl_iface Winevl_iface/pkt_send.c Winevl_iface/winevl_bridge.c
+ 
+ clean:
+ 	rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o  $(SRC_DIR)/.*.o.cmd menudbg apdbg winevl_iface
diff --git a/packages/zd1211/zd1211b-r222/zdiface.patch b/packages/zd1211/zd1211b-r222/zdiface.patch
index 8201af7..da51ae7 100644
--- a/packages/zd1211/zd1211b-r222/zdiface.patch
+++ b/packages/zd1211/zd1211b-r222/zdiface.patch
@@ -1,11 +1,12 @@
---- ZD1211LnxDrv_2_22_0_0/src/zdusb.c_orig	2007-11-06 13:06:36.000000000 +0100
-+++ ZD1211LnxDrv_2_22_0_0/src/zdusb.c	2008-08-12 10:21:14.000000000 +0200
+diff -Naur org/src/zdusb.c patched/src/zdusb.c
+--- org/src/zdusb.c	2007-11-06 13:06:36.000000000 +0100
++++ patched/src/zdusb.c	2008-08-19 12:44:48.000000000 +0200
 @@ -371,6 +371,8 @@
- 	g_dev = net;  //save this for CBs use
- 	//macp = net->priv; //kernel 2.4
- 	net->priv = macp;   //kernel 2.6
-+  /* ath_desc: use /dev/wlanX as device node */
-+  strcpy(net->name, "wlan%d");	
- 	macp->device = net;
- 	macp->usb = dev;
- 	SET_MODULE_OWNER(net);
+ 	g_dev = net;  //save this for CBs use
+ 	//macp = net->priv; //kernel 2.4
+ 	net->priv = macp;   //kernel 2.6
++  /* ath_desc: use /dev/wlanX as device node */
++  strcpy(net->name, "wlan%d");	
+ 	macp->device = net;
+ 	macp->usb = dev;
+ 	SET_MODULE_OWNER(net);