diff --git a/CHANGES b/CHANGES index d202660..44484c0 100644 --- a/CHANGES +++ b/CHANGES @@ -41,6 +41,7 @@ * Intersil Corporation as part of PRISM(R) chipset product development. * * -------------------------------------------------------------------- + - Make the Configure script a little saner. - Remove the Zydas 1201 USB widget. Use the Zydas modified linux-wlan-ng release instead (we hope to merge it in eventually) -pre13 diff --git a/Configure b/Configure index ad6b3b1..faa0d3d 100755 --- a/Configure +++ b/Configure @@ -57,14 +57,15 @@ usage () { exit 1 } +if [ ! -r config.in ]; then + $ECHO "config.in does not exist!" + fail +fi + +. ./config.in + if [ -r config.out ]; then - . ./config.out 2>/dev/null -else - if [ ! -r config.in ]; then - $ECHO "config.in does not exist!" - fail - fi - . ./config.in + . ./config.out 2>/dev/null fi PROMPT=y @@ -157,94 +158,27 @@ ask_str () { mkversionh () { versionh=src/include/wlan/version.h -cat > $versionh <> $versionh + ${WLAN_VERSION} \ + ${WLAN_PATCHLEVEL} \ + ${WLAN_SUBLEVEL} \ + ${WLAN_EXTRAVERSION} >> $versionh printf '#define WLAN_RELEASE_CODE 0x%02x%02x%02x\n' \ - ${WLAN_VERSION} \ - ${WLAN_PATCHLEVEL} \ - ${WLAN_SUBLEVEL} >> $versionh -echo '#define WLAN_BUILD_DATE "'"$DATE"'"' >> $versionh + ${WLAN_VERSION} \ + ${WLAN_PATCHLEVEL} \ + ${WLAN_SUBLEVEL} >> $versionh +echo "#define WLAN_BUILD_DATE \"$DATE\" " >> $versionh printf '\n' >> $versionh - printf '#endif\n' >> $versionh } -#======================================================================= -# Dump the version variables -write_str WLAN_VERSION -write_str WLAN_PATCHLEVEL -write_str WLAN_SUBLEVEL -write_str WLAN_EXTRAVERSION +#======================================================================= # If the src/include/wlan/version.h file needs a touchup, fix or create it if [ -r src/include/wlan/version.h ]; then diff --git a/src/include/wlan/wlan_compat.h b/src/include/wlan/wlan_compat.h index 639336b..37c6eb7 100644 --- a/src/include/wlan/wlan_compat.h +++ b/src/include/wlan/wlan_compat.h @@ -103,6 +103,7 @@ #define WLAN_PCI 3 #define WLAN_USB 4 #define WLAN_PLX 5 + #define WLAN_SLAVE 6 /* Note: the PLX HOSTIF above refers to some vendors implementations for */ /* PCI. It's a PLX chip that is a PCI to PCMCIA adapter, but it */ diff --git a/src/version.h.in b/src/version.h.in new file mode 100644 index 0000000..56f1fb9 --- /dev/null +++ b/src/version.h.in @@ -0,0 +1,58 @@ +/* src/include/wlan/version.h +* +* +* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. +* -------------------------------------------------------------------- +* +* linux-wlan +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* Alternatively, the contents of this file may be used under the +* terms of the GNU Public License version 2 (the "GPL"), in which +* case the provisions of the GPL are applicable instead of the +* above. If you wish to allow the use of your version of this file +* only under the terms of the GPL and not to allow others to use +* your version of this file under the MPL, indicate your decision +* by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL. If you do not delete +* the provisions above, a recipient may use your version of this +* file under either the MPL or the GPL. +* +* -------------------------------------------------------------------- +* +* Inquiries regarding the linux-wlan Open Source project can be +* made directly to: +* +* AbsoluteValue Systems Inc. +* info@linux-wlan.com +* http://www.linux-wlan.com +* +* -------------------------------------------------------------------- +* +* Portions of the development of this software were funded by +* Intersil Corporation as part of PRISM(R) chipset product development. +* +* -------------------------------------------------------------------- +*/ +#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