From 98d46ad0c90cbfe4f44e5fb8f4c55904b42cf8ec Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Thu, 22 May 1997 08:47:40 +0000 Subject: [PATCH] Add the 'wl' ISA Wavelan driver. Obtained from: Jim Binkley --- sys/conf/NOTES | 4 +++- sys/conf/files.i386 | 3 ++- sys/conf/options.i386 | 3 ++- sys/i386/conf/LINT | 4 +++- sys/i386/conf/NOTES | 4 +++- sys/i386/conf/files.i386 | 3 ++- sys/i386/conf/options.i386 | 3 ++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a3c14e551f36..b8fc14da8dfe 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.336 1997/05/10 17:40:53 fsmp Exp $ +# $Id: LINT,v 1.337 1997/05/11 18:05:34 tegge Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -848,6 +848,7 @@ options DSI_SOFT_MODEM #code for DSI Softmodems # DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL) # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# wl: Lucent Wavelan (ISA card only). # ze: IBM/National Semiconductor PCMCIA ethernet controller. # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for # send/receive operation, but it needs 'iomem' to read/write the @@ -867,6 +868,7 @@ device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x300 net irq 10 drq 0 vector lncintr device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr +device wl0 at isa? port 0x300 net irq ? vector wlintr # Needed so that we can (bogusly) include both the dedicated PCCARD # drivers and the generic support options LINT_PCCARD_HACK diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 320e6c0a7f32..ccea5ea784c6 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.159 1997/04/14 00:35:25 gibbs Exp $ +# $Id: files.i386,v 1.160 1997/04/26 11:44:58 peter Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -117,6 +117,7 @@ i386/isa/if_ie.c optional ie device-driver i386/isa/if_le.c optional le device-driver i386/isa/if_lnc.c optional lnc device-driver i386/isa/if_sr.c optional sr device-driver +i386/isa/if_wl.c optional wl device-driver i386/isa/if_ze.c optional ze device-driver i386/isa/if_zp.c optional zp device-driver i386/isa/isa.c optional isa device-driver diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index cbbd191eecf0..d267d0622ff7 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.43 1997/04/28 19:26:17 se Exp $ +# $Id: options.i386,v 1.44 1997/05/07 19:39:16 peter Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -22,6 +22,7 @@ CONSPEED opt_comconsole.h COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h DSI_SOFT_MODEM opt_sio.h +WLDEBUG opt_wavelan.h I586_CTR_GUPROF opt_i586_guprof.h I586_PMC_GUPROF opt_i586_guprof.h FAT_CURSOR opt_pcvt.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index a3c14e551f36..b8fc14da8dfe 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.336 1997/05/10 17:40:53 fsmp Exp $ +# $Id: LINT,v 1.337 1997/05/11 18:05:34 tegge Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -848,6 +848,7 @@ options DSI_SOFT_MODEM #code for DSI Softmodems # DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL) # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# wl: Lucent Wavelan (ISA card only). # ze: IBM/National Semiconductor PCMCIA ethernet controller. # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for # send/receive operation, but it needs 'iomem' to read/write the @@ -867,6 +868,7 @@ device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x300 net irq 10 drq 0 vector lncintr device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr +device wl0 at isa? port 0x300 net irq ? vector wlintr # Needed so that we can (bogusly) include both the dedicated PCCARD # drivers and the generic support options LINT_PCCARD_HACK diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index a3c14e551f36..b8fc14da8dfe 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.336 1997/05/10 17:40:53 fsmp Exp $ +# $Id: LINT,v 1.337 1997/05/11 18:05:34 tegge Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -848,6 +848,7 @@ options DSI_SOFT_MODEM #code for DSI Softmodems # DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL) # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# wl: Lucent Wavelan (ISA card only). # ze: IBM/National Semiconductor PCMCIA ethernet controller. # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for # send/receive operation, but it needs 'iomem' to read/write the @@ -867,6 +868,7 @@ device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x300 net irq 10 drq 0 vector lncintr device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr +device wl0 at isa? port 0x300 net irq ? vector wlintr # Needed so that we can (bogusly) include both the dedicated PCCARD # drivers and the generic support options LINT_PCCARD_HACK diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 320e6c0a7f32..ccea5ea784c6 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.159 1997/04/14 00:35:25 gibbs Exp $ +# $Id: files.i386,v 1.160 1997/04/26 11:44:58 peter Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -117,6 +117,7 @@ i386/isa/if_ie.c optional ie device-driver i386/isa/if_le.c optional le device-driver i386/isa/if_lnc.c optional lnc device-driver i386/isa/if_sr.c optional sr device-driver +i386/isa/if_wl.c optional wl device-driver i386/isa/if_ze.c optional ze device-driver i386/isa/if_zp.c optional zp device-driver i386/isa/isa.c optional isa device-driver diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index cbbd191eecf0..d267d0622ff7 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.43 1997/04/28 19:26:17 se Exp $ +# $Id: options.i386,v 1.44 1997/05/07 19:39:16 peter Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -22,6 +22,7 @@ CONSPEED opt_comconsole.h COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h DSI_SOFT_MODEM opt_sio.h +WLDEBUG opt_wavelan.h I586_CTR_GUPROF opt_i586_guprof.h I586_PMC_GUPROF opt_i586_guprof.h FAT_CURSOR opt_pcvt.h