SH support and beginnings of 2.5.x support as well.

This commit is contained in:
solomon 2002-12-11 23:25:48 +00:00
parent b1677d3eb8
commit 32035b9d2f
10 changed files with 42 additions and 25 deletions

View file

@ -41,10 +41,12 @@
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
- Added support for the SH architechure and many changes necessary for
2.5 support. Modified from the patches by Ryan Veety.
- Compile fixes for 2.2.x introduced as part of the new hotplug support.
- Added man pages contributed by Joey Hess
- Add ident info for the Z-Com 725/726 USB Widgets.
- Fixes to silence GCC3.2 warnings. (Pavel Roskin)
- Fixes to silence GCC 3.2 warnings. (Pavel Roskin)
-pre7
- Patch to fix int array mib manipulation. (Pavel Roskin)
- Minor improvements to the build system.

1
THANKS
View file

@ -95,6 +95,7 @@ Clay Jones <cjones1@email.com>
Matthew Rush <matthew@42.co.nz>
Tom Prado <tprado@charter.net>
Olivier Bornet <Olivier.Bornet@puck.ch>
Ryan Veety <ryan@ryanspc.com>
[Many, many more. If I've overlooked you and you want to be listed here,
send me e-mail and I'll fix it. I _know_ a bunch of linux-wlan contributors

View file

@ -61,6 +61,7 @@
#define WLAN_MIPS 6
#define WLAN_HPPA 7
#define WLAN_SPARC 8
#define WLAN_SH 9
/* WLAN_CPU_CORE */
#define WLAN_I386CORE 1
#define WLAN_PPCCORE 2
@ -70,6 +71,7 @@
#define WLAN_MIPSCORE 6
#define WLAN_HPPACORE 7
#define WLAN_SPARCCORE 8
#define WLAN_SHCORE 9
/* WLAN_CPU_PART */
#define WLAN_I386PART 1
#define WLAN_MPC860 2
@ -81,6 +83,7 @@
#define WLAN_MIPSPART 8
#define WLAN_HPPAPART 9
#define WLAN_SPARCPART 10
#define WLAN_SHPART 11
/* WLAN_SYSARCH */
#define WLAN_PCAT 1
#define WLAN_MBX 2
@ -92,7 +95,8 @@
#define WLAN_ALPHAARCH 7
#define WLAN_MIPSARCH 9
#define WLAN_HPPAARCH 10
#define WLAN_SPARCARCH 10
#define WLAN_SPARCARCH 11
#define WLAN_SHARCH 12
/* WLAN_OS */
#define WLAN_LINUX_KERNEL 1
#define WLAN_LINUX_USER 2
@ -174,6 +178,14 @@
#define WLAN_CPU_CORE WLAN_SPARCCORE
#define WLAN_CPU_PART WLAN_SPARCPART
#define WLAN_SYSARCH WLAN_SPARC
#elif defined(__sh__)
#define WLAN_CPU_FAMILY WLAN_SH
#define WLAN_CPU_CORE WLAN_SHCORE
#define WLAN_CPU_PART WLAN_SHPART
#define WLAN_SYSARCH WLAN_SHARCH
#ifndef __LITTLE_ENDIAN__
#define __LITTLE_ENDIAN__
#endif
#else
#error "No CPU identified!"
#endif

View file

@ -90,13 +90,13 @@ dirs :
mkmetadef: $(MKMETADEF_OBJ) mkmetadefhead.txt
$(HOST_CC) -o $@ $(MKMETADEF_OBJ)
$(HOST_CC) $(LDFLAGS) -o $@ $(MKMETADEF_OBJ)
cat mkmetadefhead.txt > ../include/wlan/p80211metadef.h
./mkmetadef >> ../include/wlan/p80211metadef.h
echo "#endif" >> ../include/wlan/p80211metadef.h
mkmetastruct: $(MKMETASTRUCT_OBJ) mkmetastructhead.txt
$(HOST_CC) -o $@ $(MKMETASTRUCT_OBJ)
$(HOST_CC) $(LDFLAGS) -o $@ $(MKMETASTRUCT_OBJ)
cat mkmetastructhead.txt > ../include/wlan/p80211metastruct.h
./mkmetastruct >> ../include/wlan/p80211metastruct.h
echo "#endif" >> ../include/wlan/p80211metastruct.h

View file

@ -48,7 +48,7 @@ CPPFLAGS= -I../include -I$(LINUX_SRC)/include \
-D__LINUX_WLAN__
nwepgen: nwepgen.o
$(CC) -o nwepgen nwepgen.o
$(CC) $(LDFLAGS) -o nwepgen nwepgen.o
install:
mkdir -p $(TARGET_INST_EXEDIR)

View file

@ -64,52 +64,48 @@ P80211_SRC= p80211conv.c \
p80211frm.c \
p80211wext.c \
p80211wep.c \
p80211netdev.c \
p80211mod.c
p80211netdev.c
P80211_OBJ= p80211conv.o \
p80211req.o \
p80211frm.o \
p80211wext.o \
p80211wep.o \
p80211netdev.o \
p80211mod.o
p80211netdev.o
# List of modules to build
MODULES=
MODULES+=$(P80211_MODULE)
# Implicit rules to handle the separate obj dirs
OBJ_DIR=obj
# Compiler Options
CFLAGS = $(KERNEL_CFLAGS) $(KERNEL_MODFLAGS)
# Preprocessor Options
CPPFLAGS=-I../include $(WLAN_INCLUDE_DEBUG) $(WLAN_CS_CONFIG_SNIFF)
$(OBJ_DIR)/%.o : ../shared/%.c
%.o : ../shared/%.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
$(OBJ_DIR)/%.o : %.c
%.o : %.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
# Dependency Source List
DEP_SRC=$(P80211_SRC)
DEP_SRC=$(P80211_SRC) p80211mod.c
# Rules
all : .depend dirs $(MODULES)
all : .depend $(MODULES)
echo $(MODULES)
dep .depend: $(DEP_SRC) ../../config.mk
ifdef MODULES
$(CPP) -M $(CFLAGS) $(CPPFLAGS) $(DEP_SRC) > .depend
endif
dirs :
mkdir -p $(OBJ_DIR)
p80211mod.o :
$(CC) -c $(CFLAGS) $(CPPFLAGS) -DEXPORT_SYMTAB p80211mod.c -o p80211mod.o
$(P80211_MODULE) : $(P80211_OBJ)
$(LD) -r -o $@ $(P80211_OBJ)
$(P80211_MODULE) : p80211mod.o $(P80211_OBJ)
$(LD) -r -o $@ $(P80211_OBJ) p80211mod.o
chmod -x $@
install : $(MODULES)
@ -118,7 +114,6 @@ install : $(MODULES)
clean:
rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
rm -fr $(OBJ_DIR)
rm -fr $(MODULES)
#

View file

@ -186,3 +186,11 @@ void cleanup_module(void)
DBFEXIT;
return;
}
EXPORT_SYMBOL(p80211netdev_hwremoved);
EXPORT_SYMBOL(p802addr_to_str);
EXPORT_SYMBOL(register_wlandev);
EXPORT_SYMBOL(p80211netdev_rx);
EXPORT_SYMBOL(unregister_wlandev);
EXPORT_SYMBOL(wlan_setup);
EXPORT_SYMBOL(wlan_unsetup);

View file

@ -57,7 +57,7 @@ OBJS = ../shared/p80211types.o \
../shared/p80211metamib.o
wlancfg: wlancfg.o $(OBJS)
$(CC) -o wlancfg wlancfg.o $(OBJS)
$(CC) $(LDFLAGS) -o wlancfg wlancfg.o $(OBJS)
install:
cp wlancfg $(TARGET_INST_EXEDIR)

View file

@ -62,7 +62,7 @@ OBJS = wlanctl.o \
wlanctl: $(OBJS)
$(CC) -o wlanctl $(OBJS)
$(CC) $(LDFLAGS) -o wlanctl $(OBJS)
install:
mkdir -p $(TARGET_INST_EXEDIR)
@ -72,4 +72,3 @@ clean:
rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
rm -f wlanctl
for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done

View file

@ -60,7 +60,7 @@ OBJS = wland.o \
wland: $(OBJS)
$(CC) -o wland $(OBJS)
$(CC) $(LDFLAGS) -o wland $(OBJS)
install:
mkdir -p $(TARGET_INST_EXEDIR)