rl2-include.patch

   1 diff -Nur drivers/net.org/Config.in drivers/net/Config.in
   2 --- drivers/net.org/Config.in   Mon Mar 26 14:11:32 2001
   3 +++ drivers/net/Config.in       Mon Mar 26 13:58:21 2001
   4 @@ -100,6 +100,7 @@
   5     if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_PCI" = "y" ]; then
   6        tristate '  HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
   7     fi
   8 +   tristate '  RangeLAN2 support' CONFIG_RL2
   9     dep_bool '  Other ISA cards' CONFIG_NET_ISA $CONFIG_ISA
  10     if [ "$CONFIG_NET_ISA" = "y" ]; then
  11        tristate '    Cabletron E21xx support' CONFIG_E2100
  12 diff -Nur drivers/net.org/Makefile drivers/net/Makefile
  13 --- drivers/net.org/Makefile    Sun Jan  7 04:45:14 2001
  14 +++ drivers/net/Makefile        Mon Mar 26 14:00:13 2001
  15 @@ -36,10 +36,13 @@
  16  subdir-$(CONFIG_APPLETALK) += appletalk
  17  subdir-$(CONFIG_SK98LIN) += sk98lin
  18  subdir-$(CONFIG_SKFP) += skfp
  19 +subdir-$(CONFIG_RL2) += rl2
  20
  21  #
  22  # link order important here
  23  #
  24 +obj-$(CONFIG_RL2) += rlmod.o
  25 +
  26  obj-$(CONFIG_PLIP) += plip.o
  27
  28  obj-$(CONFIG_ROADRUNNER) += rrunner.o
  29 diff -Nur drivers/net.org/rl2/Makefile drivers/net/rl2/Makefile
  30 --- drivers/net.org/rl2/Makefile        Mon Jan  8 17:30:18 2001
  31 +++ drivers/net/rl2/Makefile    Mon Mar 26 14:14:49 2001
  32 @@ -1,192 +1,5 @@
  33 -#-------------------------------------------------------------------------
  34 -# Nothing user configurable.  'make modules' automatically runs a
  35 -# configuration script.  Do 'make config' to force a reconfiguration.
  36 -#-------------------------------------------------------------------------
  37 -SHELL          = /bin/sh
  38 -MODNAME                = rlmod.o
  39 -include                config.mk
  40 +export-objs := lls.o qsm.o
  41 +O_TARGET := rlmod.o
  42
  43 -#-------------------------------------------------------------------------
  44 -# For experimentation
  45 -#-------------------------------------------------------------------------
  46 -#dangerous to change to y!!!
  47 -SPOOF5V                = n
  48 -NO_INT         = y
  49 +include $(TOPDIR)/Rules.make
  50
  51 -#-------------------------------------------------------------------------
  52 -# gcc Compiler options
  53 -#-------------------------------------------------------------------------
  54 -CFLAGS = -Wall -Wstrict-prototypes
  55 -#CFLAGS += -Werror
  56 -CFLAGS += -O2 -fomit-frame-pointer -pipe
  57 -
  58 -#-------------------------------------------------------------------------
  59 -# Linux specific options
  60 -#-------------------------------------------------------------------------
  61 -CFLAGS += -D__KERNEL__ -DMODULE
  62 -CFLAGS += -I${LINUXH}
  63 -
  64 -#-------------------------------------------------------------------------
  65 -# set per config.mk
  66 -#-------------------------------------------------------------------------
  67 -CFLAGS += -DCARDTYPE=${CARDTYPEVAL}
  68 -ifeq ($(BUFFER),y)
  69 -       CFLAGS += -DBUFFER
  70 -endif
  71 -ifeq ($(PCCARD),y)
  72 -       CFLAGS += -DPCCARD -I${PCCARDH}
  73 -endif
  74 -ifeq ($(CONFIG_MODVERSIONS),y)
  75 -       CFLAGS += -DCONFIG_MODVERSIONS -include $(LINUXH)/linux/modversions.h
  76 -endif
  77 -ifeq ($(USBCARD),y)
  78 -       LIBRARY = liblldusb.a
  79 -       LINKLIB = lldusb
  80 -       DO_USB  = y
  81 -       CFLAGS += -DUSBCARD
  82 -else
  83 -       LIBRARY = liblld.a
  84 -       LINKLIB = lld
  85 -       DO_USB  = n
  86 -endif
  87 -ifeq ($(SPOOF5V),y)
  88 -       CFLAGS += -DSPOOF5V
  89 -endif
  90 -ifeq ($(NO_INT),y)
  91 -       CFLAGS += -DNO_INT
  92 -endif
  93 -ifeq (diaglls.c,$(wildcard diaglls.c))
  94 -       CFLAGS += -DPROX_DIAG
  95 -       DIAGLLS = diaglls.o
  96 -       DO_DIAG = y
  97 -       POSTDIAG = -diag
  98 -       PROXDIAG = proxdiag
  99 -else
 100 -       DO_DIAG = n
 101 -endif
 102 -
 103 -#-------------------------------------------------------------------------
 104 -# Revision info
 105 -#-------------------------------------------------------------------------
 106 -CLLDVERSION    = 1.7
 107 -ifeq ($(DO_DIAG),y)
 108 -       VERSION = .1${POSTDIAG}
 109 -else
 110 -       VERSION = .1
 111 -endif
 112 -MKDATE         = 01/08/01
 113 -OWNER          = Dave Koberstein \(davek@komacke.com\)
 114 -DISTNAME        = rl2-${CLLDVERSION}${VERSION}
 115 -CFLAGS                 += -DRL2VERSION=\"${VERSION}\"
 116 -
 117 -#-------------------------------------------------------------------------
 118 -# Directives start here
 119 -#-------------------------------------------------------------------------
 120 -usage:
 121 -       @echo "make <option>"
 122 -       @echo "Options:"
 123 -       @echo "  config                 Configure environment for your distribution."
 124 -       @echo "  modules                Make the modules and the configuration executable."
 125 -       @echo "  modules_install        Install the modules and executables."
 126 -       @echo "  clean                  Remove *.o and executables."
 127 -       @echo "  real_clean             As above but do library also."
 128 -       @echo "  qrl                    Reload the interface."
 129 -       @echo "  distribution           Make a distribution tar ball."
 130 -       @echo "  usage                  This screen."
 131 -
 132 -modules: makelib ${MODNAME} proxcfg proxnet ${PROXDIAG}
 133 -
 134 -${MODNAME}: ${LIBRARY} version.h lls.o asm.o ${DIAGLLS}
 135 -       ld -r -o ${MODNAME} lls.o ${DIAGLLS} asm.o -L. -l${LINKLIB}
 136 -
 137 -proxcfg.o: proxcfg.h asm.h lld.h
 138 -
 139 -proxnet.o: proxcfg.h asm.h lld.h proxnet.c
 140 -
 141 -lls.o ${DIAGLLS}: lls.h lld.h asm.h proxcfg.h
 142 -
 143 -asm.o: asm.h
 144 -
 145 -makelib:
 146 -       @cd ../library;\
 147 -       ${MAKE} ${LIBRARY} DO_USB=${DO_USB} LINUXH=${LINUXH} DO_DIAG=${DO_DIAG}
 148 -
 149 -clean:
 150 -       rm -f *.o proxcfg proxnet ${PROXDIAG} version.h
 151 -
 152 -real_clean: clean
 153 -       @if [ -d ../library ]; then cd ../library; ${MAKE} clean; fi;
 154 -
 155 -modules_install:
 156 -       @if [ "fooREDHAT" = "foo${MODDIR}" ]; then \
 157 -               install -d -g root -m 755 /lib/modules/"`uname -r`"/net; \
 158 -               echo "install -d -g root -m 755 /lib/modules/`uname -r`/net"; \
 159 -               install -g root -m 644 ${MODNAME} /lib/modules/"`uname -r`"/net; \
 160 -               echo "install -g root -m 644 ${MODNAME} /lib/modules/`uname -r`/net"; \
 161 -       else \
 162 -               install -d -g root -m 755 ${MODDIR}; \
 163 -               echo "install -d -g root -m 755 ${MODDIR}"; \
 164 -               install -g root -m 644 ${MODNAME} ${MODDIR}/${MODNAME}; \
 165 -               echo "install -g root -m 644 ${MODNAME} ${MODDIR}/${MODNAME}"; \
 166 -       fi
 167 -       install -g root -m 755 proxcfg ${BINDIR}/proxcfg
 168 -       install -g root -m 755 proxnet ${BINDIR}/proxnet
 169 -       install -g root -m 755 testlink ${BINDIR}/testlink
 170 -
 171 -qrl:
 172 -       @./quickreload $(shell ifconfig | grep 00:20:A6 | cut -d " " -f 1)
 173 -
 174 -distribution:
 175 -       @if [ -d ../library ]; then \
 176 -               ${MAKE} real_clean makelib; \
 177 -               ${MAKE} real_clean makelib DO_USB=n; \
 178 -       fi; \
 179 -       cd ..; \
 180 -       if [ ! -d $(DISTNAME) ]; then mkdir $(DISTNAME); fi; \
 181 -       if [ ! -d $(DISTNAME)/docs ]; then mkdir $(DISTNAME)/docs; fi; \
 182 -       rm -f $(DISTNAME)/*; \
 183 -       rm -f $(DISTNAME)/docs/*; \
 184 -       rm -f *.tgz; \
 185 -       (cp -f lls/* lls/.* $(DISTNAME) 2> /dev/null; exit 0); \
 186 -       (cp -f docs/* docs/.* $(DISTNAME)/docs 2> /dev/null; exit 0); \
 187 -       (cp -f README.1st $(DISTNAME) 2> /dev/null; exit 0); \
 188 -       cp -f /lib/modules/"`uname -r`"/net/$(MODNAME) $(DISTNAME); \
 189 -       rm -f $(DISTNAME)/config.mk; \
 190 -       tar vzcf $(DISTNAME).tgz $(DISTNAME); \
 191 -       cd lls; \
 192 -       ${MAKE} real_clean
 193 -
 194 -tarsource:
 195 -       @cd ..;\
 196 -       if [ -d library ]; then \
 197 -               ${MAKE} real_clean;\
 198 -               rm lls/config.mk;\
 199 -               rm ../src.tgz;\
 200 -               tar vzcf ../src.tgz * lls/.config.mk;\
 201 -       fi;\
 202 -
 203 -config.mk: .config.mk
 204 -       @echo "Apparently this is the first time you have run 'make config'."; \
 205 -       ./Configure; \
 206 -       echo "'make config' is completed.  You must rerun make with other"; \
 207 -       echo "targets for this config to take effect properly."; \
 208 -       echo; \
 209 -       echo "Executing 'make clean'." ;\
 210 -       ${MAKE} real_clean ;\
 211 -       echo; \
 212 -       echo "Ignore the error that follows."; \
 213 -       echo; \
 214 -       exit 1
 215 -
 216 -config: real_clean
 217 -       @./Configure; \
 218 -       echo "'make config' is completed.  You must rerun make with other"; \
 219 -       echo "targets for this config to take effect properly."; \
 220 -       echo; \
 221 -       echo "Ignore the error that follows."; \
 222 -       echo; \
 223 -       exit 1
 224 -
 225 -version.h:
 226 -       @echo static const char *version = \"rlmod.o: \
 227 -                v$(CLLDVERSION)$(VERSION), $(MKDATE), $(OWNER)\\n\"\; > version.h
 228 diff -Nur drivers/net.org/rl2/Makefile~ drivers/net/rl2/Makefile~
 229 --- drivers/net.org/rl2/Makefile~       Thu Jan  1 01:00:00 1970
 230 +++ drivers/net/rl2/Makefile~   Mon Mar 26 14:03:07 2001
 231 @@ -0,0 +1,4 @@
 232 +export-objs := lls.o qsm.o
 233 +O_TARGET := rlmod.o
 234 +
 235 +include $(TOPDIR)/Rules.make
 236 \ No newline at end of file