summaryrefslogtreecommitdiff
path: root/wlan-ng
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /wlan-ng
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'wlan-ng')
-rw-r--r--wlan-ng/files/Ambit_usb.patch22
-rw-r--r--wlan-ng/files/OZ-Configure.patch19
-rw-r--r--wlan-ng/files/config.in21
-rw-r--r--wlan-ng/files/pass-kernel-cross.patch140
-rw-r--r--wlan-ng/files/scripts-makefile-hostcc.diff11
-rw-r--r--wlan-ng/files/sl6kwlanctl-ng31
-rw-r--r--wlan-ng/files/version.h19
-rw-r--r--wlan-ng/files/wlan-ng.modutils1
-rw-r--r--wlan-ng/files/wlanctl-ng28
9 files changed, 292 insertions, 0 deletions
diff --git a/wlan-ng/files/Ambit_usb.patch b/wlan-ng/files/Ambit_usb.patch
index e69de29bb2..7dcc09a882 100644
--- a/wlan-ng/files/Ambit_usb.patch
+++ b/wlan-ng/files/Ambit_usb.patch
@@ -0,0 +1,22 @@
+--- linux-wlan-ng-0.2.1pre21/src/prism2/driver/prism2_usb.c 2004-03-25 10:03:26.000000000 -0600
++++ linux-wlan-ng-0.2.1pre21/src/prism2/driver/prism2_usb.c~Ambit_usb 2004-09-16 14:26:54.746340840 -0500
+@@ -34,9 +34,9 @@
+ {PRISM_USB_DEVICE(0x0b3b, 0x1602, "ZyXEL ZyAIR B200 Wireless USB Adapter")},
+ {PRISM_USB_DEVICE(0x0baf, 0x00eb, "USRobotics USR1120 Wireless USB Adapter")},
+ {PRISM_USB_DEVICE(0x0411, 0x0027, "Melco WLI-USB-KS11G 11Mbps WLAN Adapter")},
+- {PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")},
++ {PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")},
+ {PRISM_USB_DEVICE(0x0846, 0x4110, "NetGear MA111")},
+- {PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")},
++ {PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")},
+ // {PRISM_USB_DEVICE(0x0ace, 0x1201, "ZyDAS ZD1201 Wireless USB Adapter")},
+ {PRISM_USB_DEVICE(0x2821, 0x3300, "ASUS-WL140 Wireless USB Adapter")},
+ {PRISM_USB_DEVICE(0x2001, 0x3700, "DWL-122 Wireless USB Adapter")},
+@@ -48,6 +48,7 @@
+ {PRISM_USB_DEVICE(0x0411, 0x0044, "Melco WLI-USB-KB11 11Mbps WLAN Adapter")},
+ {PRISM_USB_DEVICE(0x1668, 0x6106, "ROPEX FreeLan 802.11b USB Adapter")},
+ {PRISM_USB_DEVICE(0x124a, 0x4017, "Pheenet WL-503IA 802.11b USB Adapter")},
++ {PRISM_USB_DEVICE(0x0bb2, 0x0302, "Ambit Microsystems Corp. CE-WL08 802.11b WLAN Module")},
+ { /* terminator */ }
+ };
+
diff --git a/wlan-ng/files/OZ-Configure.patch b/wlan-ng/files/OZ-Configure.patch
index e69de29bb2..3ec9d617c7 100644
--- a/wlan-ng/files/OZ-Configure.patch
+++ b/wlan-ng/files/OZ-Configure.patch
@@ -0,0 +1,19 @@
+--- linux-wlan-ng-0.2.1pre22/Configure-dist 2004-08-05 00:55:27.000000000 +1000
++++ linux-wlan-ng-0.2.1pre22/Configure 2004-10-28 02:28:06.000000000 +1000
+@@ -431,16 +431,8 @@
+ if [ -d /etc/rc.d/init.d -o -d /etc/init.d -o -d /sbin/init.d ] ; then
+ $ECHO "It looks like you have a System V init file setup."
+ SYSV_INIT=y
+- if [ -d /etc/rc.d/init.d ] ; then
+- $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG
+- $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG_MK
+- elif [ -d /sbin/init.d ] ; then
+- $ECHO "RC_DIR=/sbin" >> $CONFIG
+- $ECHO "RC_DIR=/sbin" >> $CONFIG_MK
+- else
+ $ECHO "RC_DIR=/etc" >> $CONFIG
+ $ECHO "RC_DIR=/etc" >> $CONFIG_MK
+- fi
+ else
+ $ECHO "It looks like you have a BSD-ish init file setup."
+ if ! grep rc.wlan /etc/rc.d/rc.S >/dev/null ; then
diff --git a/wlan-ng/files/config.in b/wlan-ng/files/config.in
index e69de29bb2..ba6e4c6657 100644
--- a/wlan-ng/files/config.in
+++ b/wlan-ng/files/config.in
@@ -0,0 +1,21 @@
+WLAN_VERSION=0
+WLAN_PATCHLEVEL=2
+WLAN_SUBLEVEL=1
+WLAN_EXTRAVERSION=-pre22
+#LINUX_SRC=$(KERNEL_SOURCE)
+PCMCIA_SRC=
+PREFIX=
+INST_EXEDIR=/sbin
+#TARGET_ROOT_ON_HOST=
+#RC_DIR=/etc/rc.d
+PCMCIA_DIR=/etc/pcmcia
+SYSV_INIT=y
+INSTALL_DEPMOD=y
+WLAN_DEBUG=n
+CROSS_COMPILE_ENABLED=n
+CROSS_COMPILE=
+HOST_COMPILE=
+#PRISM2_PLX=n
+#PRISM2_PCMCIA=n
+#PRISM2_PCI=y
+#PRISM2_USB=n
diff --git a/wlan-ng/files/pass-kernel-cross.patch b/wlan-ng/files/pass-kernel-cross.patch
index e69de29bb2..c9c00cdc25 100644
--- a/wlan-ng/files/pass-kernel-cross.patch
+++ b/wlan-ng/files/pass-kernel-cross.patch
@@ -0,0 +1,140 @@
+--- src/p80211/Makefile.orig 2004-09-13 16:53:46.000000000 +0200
++++ src/p80211/Makefile 2004-10-18 18:20:37.130194928 +0200
+@@ -44,6 +44,13 @@
+
+ include $(WLAN_SRC)../../config.mk
+
++passvars = \
++ KERNEL_PATH='$(KERNEL_PATH)' \
++ KERNEL_SRC='$(KERNEL_SRC)' \
++ KERNEL_VERSION='$(KERNEL_VERSION)' \
++ CC='$(KERNEL_CC)' \
++ LD='$(KERNEL_LD)'
++
+ ifeq ($(WLAN_DEBUG), y)
+ WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG
+ endif
+@@ -89,11 +96,11 @@
+ fi
+
+ $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
+- MODVERDIR=$(PWD)/../.tmp_versions modules
++ MODVERDIR=$(PWD)/../.tmp_versions $(passvars) modules
+ else # kbuild 2.4
+
+ $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
+- modules
++ $(passvars) modules
+ endif # kbuild switch
+
+ endif # KERNELRELEASE
+--- src/prism2/driver/Makefile.orig 2004-08-04 19:27:56.000000000 +0200
++++ src/prism2/driver/Makefile 2004-10-18 18:20:06.614833968 +0200
+@@ -44,6 +44,13 @@
+
+ include $(WLAN_SRC)../../../config.mk
+
++passvars = \
++ KERNEL_PATH='$(KERNEL_PATH)' \
++ KERNEL_SRC='$(KERNEL_SRC)' \
++ KERNEL_VERSION='$(KERNEL_VERSION)' \
++ CC='$(KERNEL_CC)' \
++ LD='$(KERNEL_LD)'
++
+ ifeq ($(WLAN_DEBUG), y)
+ WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG
+ endif
+@@ -85,11 +92,11 @@
+ default:
+ ifeq ($(KERN_25), y)
+ $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
+- MODVERDIR=$(PWD)/../.tmp_versions modules
++ MODVERDIR=$(PWD)/../.tmp_versions $(passvars) modules
+ else # kbuild 2.4
+
+ $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
+- modules
++ $(passvars) modules
+
+ endif # kbuild switch
+
+--- src/prism2/Makefile.orig 2004-02-13 19:47:37.000000000 +0100
++++ src/prism2/Makefile 2004-10-18 18:19:13.511906840 +0200
+@@ -44,6 +44,13 @@
+
+ include ../../config.mk
+
++passvars = \
++ KERNEL_PATH='$(KERNEL_PATH)' \
++ KERNEL_SRC='$(KERNEL_SRC)' \
++ KERNEL_VERSION='$(KERNEL_VERSION)' \
++ KERNEL_CC='$(KERNEL_CC)' \
++ KERNEL_LD='$(KERNEL_LD)'
++
+ DIRS=driver ridlist download
+
+ ifneq ($(wildcard *.addon),)
+@@ -51,10 +58,10 @@
+ endif
+
+ all:
+- set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done
++ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars); done
+
+ clean:
+- set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done
++ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) clean ; done
+ rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
+ for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
+
+@@ -68,7 +75,7 @@
+ cp $$x $(TARGET_ROOT_ON_HOST)$(FIRMWARE_DIR)/prism2_`echo $$x | cut -c1-2`.hex ; \
+ fi; \
+ done
+- set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done
++ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) install ; done
+
+ ctags:
+ ctags -R
+--- Makefile.orig 2004-02-13 19:47:36.000000000 +0100
++++ Makefile 2004-10-18 18:16:58.126488552 +0200
+@@ -42,6 +42,12 @@
+ #
+ # --------------------------------------------------------------------
+
++passvars = \
++ KERNEL_PATH='$(KERNEL_PATH)' \
++ KERNEL_SRC='$(KERNEL_SRC)' \
++ KERNEL_VERSION='$(KERNEL_VERSION)' \
++ KERNEL_CC='$(KERNEL_CC)' \
++ KERNEL_LD='$(KERNEL_LD)'
+
+ DIRS = src doc man etc
+
+@@ -60,7 +66,7 @@
+ @echo " "
+
+ all: config.mk
+- set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done
++ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars); done
+
+ mrproper: clean
+ rm -f config.out
+@@ -68,7 +74,7 @@
+
+ clean:
+ touch config.mk config.new
+- set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done
++ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) clean ; done
+ rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
+ for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
+ rm -f config.mk config.new
+@@ -76,7 +82,7 @@
+
+ install:
+ find . -name .depend -exec rm {} \;
+- set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done
++ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) install ; done
+
+ auto_config config.mk:
+ @touch config.mk config.new
diff --git a/wlan-ng/files/scripts-makefile-hostcc.diff b/wlan-ng/files/scripts-makefile-hostcc.diff
index e69de29bb2..6f0fc5b61c 100644
--- a/wlan-ng/files/scripts-makefile-hostcc.diff
+++ b/wlan-ng/files/scripts-makefile-hostcc.diff
@@ -0,0 +1,11 @@
+--- scripts/Makefile.o 2004-10-06 10:16:13.271421032 +0200
++++ scripts/Makefile 2004-10-06 10:16:34.136249096 +0200
+@@ -24,7 +24,7 @@
+ exit 1;\
+ fi
+
+- $(CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
++ $(BUILD_CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
+
+ get_options:
+ $(MAKE) -f $(CURR_DIR)/Makefile.get_options -C $(KERNEL_SOURCE) get_version_target
diff --git a/wlan-ng/files/sl6kwlanctl-ng b/wlan-ng/files/sl6kwlanctl-ng
index e69de29bb2..377b9d4dc9 100644
--- a/wlan-ng/files/sl6kwlanctl-ng
+++ b/wlan-ng/files/sl6kwlanctl-ng
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+modprobe usb_ohci_tc6393
+
+if test ! -d /dev/usb
+then
+ mkdir -p /dev/usb
+fi
+if test ! -c /dev/usb/host_ohci
+then
+ printf "*\tCreating /dev/usb/host_ohci node\n"
+ mknod /dev/usb/host_ohci c 10 222
+fi
+
+case $0 in
+wlanup|/sbin/wlanup)
+ printf "*\tStarting up wlan-ng interface\n"
+ modprobe prism2_usb
+ /sbin/usbctl on 1
+ /etc/init.d/wlan start
+ ;;
+wlandown|/sbin/wlandown)
+ printf "*\tShutting down wlan-ng interface\n"
+ /etc/init.d/wlan stop
+ /sbin/usbctl off 1
+ rmmod prism2_usb
+ ;;
+*)
+ printf "*\tUSAGE: $0\n"
+ ;;
+esac
diff --git a/wlan-ng/files/version.h b/wlan-ng/files/version.h
index e69de29bb2..8f884dcb47 100644
--- a/wlan-ng/files/version.h
+++ b/wlan-ng/files/version.h
@@ -0,0 +1,19 @@
+#ifndef _WLAN_VERSION_H
+#define _WLAN_VERSION_H
+#ifndef KERNEL_VERSION
+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#endif
+
+/* WLAN_HOSTIF (generally set on the command line, not detected) */
+#define WLAN_PCMCIA 1
+#define WLAN_ISA 2
+#define WLAN_PCI 3
+#define WLAN_USB 4
+#define WLAN_PLX 5
+#define WLAN_SLAVE 6
+#define WLAN_RELEASE "0.2.1-pre21"
+#define WLAN_RELEASE_CODE 0x000201
+#define WLAN_BUILD_DATE "Yesterday Night"
+
+#endif
+
diff --git a/wlan-ng/files/wlan-ng.modutils b/wlan-ng/files/wlan-ng.modutils
index e69de29bb2..010e20d375 100644
--- a/wlan-ng/files/wlan-ng.modutils
+++ b/wlan-ng/files/wlan-ng.modutils
@@ -0,0 +1 @@
+alias wlan0 prism2_usb
diff --git a/wlan-ng/files/wlanctl-ng b/wlan-ng/files/wlanctl-ng
index e69de29bb2..3bd5b1376c 100644
--- a/wlan-ng/files/wlanctl-ng
+++ b/wlan-ng/files/wlanctl-ng
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+modprobe usb_ohci_tc6393
+
+if test ! -d /dev/usb
+then
+ mkdir -p /dev/usb
+fi
+if test ! -c /dev/usb/host_ohci
+then
+ printf "*\tCreating /dev/usb/host_ohci node\n"
+ mknod /dev/usb/host_ohci c 10 222
+fi
+
+case $0 in
+wlanup)
+ printf "*\tStarting up wlan-ng interface\n"
+ modprobe prism2_usb
+ /sbin/usbctl on 1
+ /etc/init.d/wlan start
+ ;;
+wlandown)
+ printf "*\tShutting down wlan-ng interface\n"
+ /etc/init.d/wlan stop
+ /sbin/usbctl off 1
+ rmmod prism2_usb
+ ;;
+esac