-diff -urN atmelwlandriver/Makefile atmelwlandriver-Makefiles/Makefile
---- atmelwlandriver/Makefile 2003-12-04 17:20:24.000000000 +0100
-+++ atmelwlandriver-Makefiles/Makefile 2003-12-20 22:52:55.000000000 +0100
-@@ -28,27 +28,31 @@
- @echo Building $(BUILD-y)
- @for i in $(BUILD-y); do make -C $$i all || exit 1; done
-
--ifeq (.config, $(wildcard .config))
-+#ifeq (.config, $(wildcard .config))
- include .config
--check:dummy
--else
--check:config
--endif
-+#check:dummy
-+#else
-+#check:config
-+#endif
-
- BUILD-y:=
- BUILD-n:=
- BUILD- :=
- ifeq ('$(CONFIG_PCMCIA)', 'y')
- BUILD-$(CONFIG_PCMCIA) += src/Pcmcia_Pci
--ifeq ($(CONFIG_PCI), 'y')
--endif
--else
--BUILD-$(CONFIG_PCI) += src/Pcmcia_Pci
-+#ifeq ($(CONFIG_PCI), 'y')
-+#endif
-+#else
-+#BUILD-$(CONFIG_PCI) += src/Pcmcia_Pci
- endif
-+ifeq ('$(CONFIG_USB)', 'y')
- BUILD-$(CONFIG_USB) += src/usb
-+endif
-+ifeq ('$(CONFIG_APPS)', 'y')
- BUILD-$(CONFIG_CMD_LINE) += src/apps/cmd_line
- BUILD-$(CONFIG_Winter) += src/apps/winter
- BUILD-$(CONFIG_XAPP) += src/apps/XWlan
-+endif
-
- ifeq '$(NEW_KERN)' 'y'
- MODEXT:=.ko
-@@ -73,23 +77,26 @@
+diff -uNr atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kernelv2.6
+--- atmelwlandriver.orig/Makefile.kernelv2.6 2004-06-05 06:11:18.000000000 +0200
++++ atmelwlandriver/Makefile.kernelv2.6 2004-07-19 10:45:29.000000000 +0200
+@@ -4,15 +4,13 @@
+ SCRIPTSDIR=$(TOPDIR)/scripts
+ INC=$(TOPDIR)/src/includes
+ VERSION=3.3.5.6
+-MINOR_NUMBER=$(shell uname -r | cut -d . -f 3 | cut -d - -f 1)
+ ID:=$(shell id -u)
+ tmpDIR:=/tmp/atm$(shell date +%S.%s)
+ tmpDES:=$(tmpDIR)/atmelwlandriver
+ LVNET = $(shell pwd)/src/apps/cmd_line
+ WINTER = $(shell pwd)/src/apps/winter
- install:
- set -x
--ifeq '$(ID)' '0'
-- @if (ls $(OBJDIR)/pcm*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pcm*$(MODEXT) $(PCMCIA_DES); fi
-- @if (ls $(OBJDIR)/pci*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pci*$(MODEXT) $(PCI_DES); fi
-- @if (ls $(OBJDIR)/usb*$(MODEXT) >/dev/null 2>&1); then install -m 644 objs/usb*$(MODEXT) $(USB_DES); fi
-- @if [ -f $(OBJDIR)/lvnet ]; then install -m 755 $(OBJDIR)/lvnet /bin/; fi
-- @if [ -f $(OBJDIR)/winter ]; then install -m 755 $(OBJDIR)/winter /usr/X11R6/bin/; fi
-- @if [ -f $(OBJDIR)/xvnet ]; then install -m 755 $(OBJDIR)/xvnet /usr/X11R6/bin/; fi
-- @if [ -f $(SCRIPTSDIR)/fastvnet.sh ]; then install -m 755 $(SCRIPTSDIR)/fastvnet.sh /bin/; fi
-- @bash $(SCRIPTSDIR)/append.sh
-+#ifeq '$(ID)' '0'
-+ @if (ls $(OBJDIR)/pcm*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pcm*$(MODEXT) $(MODDIR)/kernel/drivers/pcmcia; fi
-+ @if (ls $(OBJDIR)/pci*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pci*$(MODEXT) $(MODDIR)/kernel/drivers/net; fi
-+ @if (ls $(OBJDIR)/usb*$(MODEXT) >/dev/null 2>&1); then install -m 644 objs/usb*$(MODEXT) $(MODDIR)/kernel/drivers/usb; fi
-+ @if (ls $(OBJDIR)-smp/pcm*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)-smp/pcm*$(MODEXT) $(MODDIR)smp/kernel/drivers/pcmcia; fi
-+ @if (ls $(OBJDIR)-smp/pci*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)-smp/pci*$(MODEXT) $(MODDIR)smp/kernel/drivers/net; fi
-+ @if (ls $(OBJDIR)-smp/usb*$(MODEXT) >/dev/null 2>&1); then install -m 644 objs-smp/usb*$(MODEXT) $(MODDIR)smp/kernel/drivers/usb; fi
-+ @if [ -f $(OBJDIR)/lvnet ]; then install -m 755 $(OBJDIR)/lvnet $(DESTDIR)/bin/; fi
-+ @if [ -f $(OBJDIR)/winter ]; then install -m 755 $(OBJDIR)/winter $(DESTDIR)/bin/; fi
-+ @if [ -f $(OBJDIR)/xvnet ]; then install -m 755 $(OBJDIR)/xvnet $(DESTDIR)/bin/; fi
-+ @if [ -f $(SCRIPTSDIR)/fastvnet.sh ]; then install -m 755 $(SCRIPTSDIR)/fastvnet.sh $(DESTDIR)/bin/; fi
-+# @bash $(SCRIPTSDIR)/append.sh
- @install -m 644 man/*.1 $(MAN_PATH)
-- depmod -aq
-- @echo OK
--else
-+# depmod -aq
-+# @echo OK
-+#else
- # @echo -ne "\033[0;31m"
-- @echo "You must have root privileges to install the driver"
-+# @echo "You must have root privileges to install the driver"
- # @echo -ne "\033[1;37m"
--endif
-+#endif
+-KERNEL_VERSION:=$(shell uname -r)
+-KERNEL_SOURCE:=/usr/src/linux-$(KERNEL_VERSION)
++KERNEL_SOURCE:=/usr/src/linux
+ PCMCIA_DES = /lib/modules/$(KERNEL_VERSION)/pcmcia
+ PCI_DES = /lib/modules/$(KERNEL_VERSION)/kernel/drivers/net
+ USB_DES = /lib/modules/$(KERNEL_VERSION)/kernel/drivers/usb
+@@ -99,34 +97,15 @@
+ $(all_targets): %:
+ @echo Building $@
+ @if [ ! -d $(OBJDIR)/$@ ]; then echo Bootstraping target $@; mkdir $(OBJDIR)/$@; fi
+- @if [ ! -d $(OBJDIR)/$@/debug ]; then \
+- mkdir $(OBJDIR)/$@/debug; \
+- for f in $(srcs); do (cd $(OBJDIR)/$@/debug; ln -s $(SUBDIRS)/$$f .); done \
+- fi
+ @if [ ! -d $(OBJDIR)/$@/release ]; then \
+ mkdir $(OBJDIR)/$@/release; \
+ for f in $(srcs); do (cd $(OBJDIR)/$@/release; ln -s $(SUBDIRS)/$$f .); done \
+ fi
+- @echo -e "\tDebug"
+- @if [ "$(buildonly)" == debug ] || [ "$(buildonly)" == "" ]; then \
+- echo obj-m=$@.o > $(OBJDIR)/$@/debug/Makefile; \
+- echo all: >> $(OBJDIR)/$@/debug/Makefile; \
+- if [ "$(MINOR_NUMBER)" -gt "5" ]; then \
+- echo -e $(debug_submake_new) >> $(OBJDIR)/$@/debug/Makefile; \
+- else \
+- echo -e $(debug_submake_old) >> $(OBJDIR)/$@/debug/Makefile; \
+- fi;\
+- (cd $(OBJDIR)/$@/debug; make) ; \
+- fi
+ @echo -e "\tRelease"
+ @if [ "$(buildonly)" == release ] || [ "$(buildonly)" == "" ]; then \
+ echo obj-m=$@.o > $(OBJDIR)/$@/release/Makefile; \
+ echo all: >> $(OBJDIR)/$@/release/Makefile; \
+- if [ "$(MINOR_NUMBER)" -gt "5" ]; then \
+- echo -e $(release_submake_new) >> $(OBJDIR)/$@/release/Makefile; \
+- else \
+- echo -e $(release_submake_old) >> $(OBJDIR)/$@/release/Makefile; \
+- fi;\
++ echo -e $(release_submake_new) >> $(OBJDIR)/$@/release/Makefile; \
+ (cd $(OBJDIR)/$@/release; make) ; \
+ fi
- dist:
- @mkdir $(tmpDIR)
-diff -urN atmelwlandriver/src/apps/cmd_line/Makefile atmelwlandriver-Makefiles/src/apps/cmd_line/Makefile
---- atmelwlandriver/src/apps/cmd_line/Makefile 2003-12-04 17:20:24.000000000 +0100
-+++ atmelwlandriver-Makefiles/src/apps/cmd_line/Makefile 2003-12-20 22:10:15.000000000 +0100
-@@ -5,11 +5,11 @@
- WPA_FLAG:=
+diff -uNr atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmcia_Pci/Makefile
+--- atmelwlandriver.orig/src/Pcmcia_Pci/Makefile 2004-06-05 06:11:18.000000000 +0200
++++ atmelwlandriver/src/Pcmcia_Pci/Makefile 2004-07-19 10:54:28.066481184 +0200
+@@ -5,28 +5,15 @@
+ include .lastbuild
endif
- OBJs=../../../objs
--FLAGS1:=$(WPA_FLAG) -DATMEL -O2 -g
-+FLAGS1:=$(WPA_FLAG) -DATMEL $(OPT) -g
- FLAGS2:=-lncurses
- FLAGS3:=-DLOW_RES
- CC:=gcc
-
- all:
-- $(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c
-+ $(CC) $(FLAGS1) -I$(INC) -I/usr/include/ncurses -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c
- @install -m 755 lvnet $(OBJs)/
-diff -urN atmelwlandriver/src/apps/winter/Makefile.rules atmelwlandriver-Makefiles/src/apps/winter/Makefile.rules
---- atmelwlandriver/src/apps/winter/Makefile.rules 2003-12-04 17:20:24.000000000 +0100
-+++ atmelwlandriver-Makefiles/src/apps/winter/Makefile.rules 2003-12-20 22:09:33.000000000 +0100
-@@ -5,9 +5,10 @@
-
- all: postmake
-
--CC:=$(shell wx-config --cxx)
--CFLAGS:=$(shell wx-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS)
--CFLAGS1:=$(shell wx-config --libs)
-+CC:=gcc
-+CFLAGS:=$(shell wxgtk-2.4-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(OPT) $(ARCH_SPECIFIC_CFLAGS)
-+CFLAGS1:=$(shell wxgtk-2.4-config --libs)
-+
-
- VPATH:=$(INC_DIR) $(SRC_DIR) $(RSRC_DIR)
-@@ -20,7 +21,7 @@
- wxconfig:
- @config_exists=no;\
- for path_dir in `echo $(PATH) | tr : ' '`; do\
-- if test -f $$path_dir/wx-config; then\
-+ if test -f $$path_dir/wxgtk-2.4-config; then\
- config_exists=yes;\
- fi\
- done;\
-diff -urN atmelwlandriver/src/Pcmcia_Pci/Makefile atmelwlandriver-Makefiles/src/Pcmcia_Pci/Makefile
---- atmelwlandriver/src/Pcmcia_Pci/Makefile 2003-12-04 17:20:24.000000000 +0100
-+++ atmelwlandriver-Makefiles/src/Pcmcia_Pci/Makefile 2003-12-20 21:59:36.000000000 +0100
-@@ -7,13 +7,13 @@
-
- VR:=$(shell uname -r)
- ID:=$(shell id -u)
+-VR:=$(shell uname -r)
+-ID:=$(shell id -u)
-ifneq ($(VR),$(UNAME))
-this:
-+#ifneq ($(VR),$(UNAME))
-+#this:
- # @echo -ne "\\033[1;31m"
+-# @echo -ne "\\033[1;31m"
- @echo -ne "Running kernel doesn't match with the source"
-+# @echo -ne "Running kernel doesn't match with the source"
- # @echo -ne "\\033[0;39m"
+-# @echo -ne "\\033[0;39m"
- @echo
-endif
-+# @echo
-+#endif
-
+-
# Add extra compilation flags if under version 2.5 or higher
NEWKERNFLAGS := -D__KERNEL__ -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=fastvnet_cs
-@@ -26,7 +26,8 @@
- DEFS := -pipe -O2 -fomit-frame-pointer -fno-strict-aliasing
+-MODOFLAGS := -I$(KERNEL_SRC)/include -D__KERNEL__ -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -DMODULE
+ KMODNAMEFLAG := -DKBUILD_MODNAME=
+
+
+-CC:=gcc
+ CDEBUG:= -DPCMCIA_DEBUG=1
+-DEFS := -pipe -O2 -fomit-frame-pointer -fno-strict-aliasing
CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
-CFLAGS := -DLINUX_OS -D__KERNEL__ $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
-+#CFLAGS := -DLINUX_OS -D__KERNEL__ $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
+CFLAGS := $(KCFLAGS) -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include
srcs := card.c command.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c
pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs))
-diff -urN atmelwlandriver/src/usb/Makefile atmelwlandriver-Makefiles/src/usb/Makefile
---- atmelwlandriver/src/usb/Makefile 2003-12-04 17:20:24.000000000 +0100
-+++ atmelwlandriver-Makefiles/src/usb/Makefile 2003-12-20 22:00:57.000000000 +0100
-@@ -7,7 +7,7 @@
+@@ -75,7 +62,7 @@
+ ld -r -o $(OBJDIR)/$(MODULE).o fastvnet_cs.o $(DEBUGORNO) $(objs)
+ nm $(OBJDIR)/$(MODULE).o |sort -u >$(OBJDIR)/$(patsubst %.o,%.map,$(MODULE).o);
+ ifeq '$(NEW_KERN)' 'y'
+- $(CC) $(MODOFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
++ $(CC) $(KCFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
+ ld -r -o $(OBJDIR)/$(MODULE).ko $(OBJDIR)/$(MODULE).o $(OBJDIR)/$(MAGICMOD).o
+ endif
+
+diff -uNr atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile
+--- atmelwlandriver.orig/src/usb/Makefile 2004-06-05 06:11:18.000000000 +0200
++++ atmelwlandriver/src/usb/Makefile 2004-07-19 10:54:28.067481032 +0200
+@@ -3,28 +3,16 @@
+
+ MODULE := usbvnet.o
+ CDEBUG := -DUSBDBG
+-DEFS := -fno-strict-aliasing -fomit-frame-pointer -pipe
USB_DES := $(MODULES_DES)/kernel/drivers/net
- CC=gcc
+-CC=gcc
CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
+-ifeq '$(NEW_KERN)' 'y'
+-CFLAGS :=-D__KERNEL__ -O2 $(DEFS) -I$(KERNEL_SRC)/drivers/usb/core -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb -Wall $(CFLAGS_y)
+-else
-CFLAGS :=-D__KERNEL__ -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb -Wall $(CFLAGS_y)
-+CFLAGS := $(KCFLAGS) -I$(INC) -I$(INC)/usb $(CFLAGS_y)
+-endif
++CFLAGS :=$(KCFLAGS) -I$(KERNEL_SRC)/drivers/usb/core -I$(INC) -I$(INC)/usb $(CFLAGS_y)
+ # Add extra compilation flags if under version 2.5 or higher
+ NEWKERNFLAGS := -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=vnetusba
+-MODOFLAGS := -I$(KERNEL_SRC)/include -D__KERNEL__ -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -Iinclude/asm-i386/mach-default -DMODULE
+ KMODNAMEFLAG := -DKBUILD_MODNAME=
+ MAGICMOD:= magic.mod
+
+-ifeq '$(NEW_KERN)' 'y'
+ RESET_DEVICE:= reset_device.c
+ MAGIC_MOD:= magic.mod.c
+-else
+-RESET_DEVICE:=
+-MAGIC_MOD:=
+-endif
fws:=$(wildcard external*.h) $(wildcard internal*.h)
+@@ -52,7 +40,7 @@
+
+ final:$(objs) vnetusba.o
+ ifeq '$(NEW_KERN)' 'y'
+- $(CC) $(MODOFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
++ $(CC) $(KCFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
+ ld -m elf_i386 -r -o $(OBJDIR)/$(MODULE).ko vnetusba.o $(objs) $(OBJDIR)/$(MAGICMOD).o
+ @nm $(OBJDIR)/$(MODULE).ko |sort >../$(patsubst %.ko,%.map, $(MODULE).ko);
+ else
projects / packages / atmelwlandriver.git / commitdiff