From f97e905a3ac479bfc7685c0e5722042c4b899925 Mon Sep 17 00:00:00 2001 From: niklas Date: Thu, 18 Apr 1996 18:55:32 +0000 Subject: [PATCH] Merge of NetBSD 960317 --- sys/arch/i386/conf/DISKLESS | 30 ++++-- sys/arch/i386/conf/GENERIC | 40 +++++--- sys/arch/i386/conf/GENERICADP | 34 +++++-- sys/arch/i386/conf/GENERICOTHER | 32 ++++-- sys/arch/i386/conf/HELIOS_PCMCIA | 13 ++- sys/arch/i386/conf/INSTADP | 30 ++++-- sys/arch/i386/conf/Makefile.i386 | 16 +-- sys/arch/i386/conf/NETTAN | 160 ++++++++++++++++++++++++++++++ sys/arch/i386/conf/TDR | 30 ++++-- sys/arch/i386/conf/files.i386 | 55 +++++----- sys/arch/i386/eisa/eisa_machdep.h | 40 ++++++++ 11 files changed, 372 insertions(+), 108 deletions(-) create mode 100644 sys/arch/i386/conf/NETTAN create mode 100644 sys/arch/i386/eisa/eisa_machdep.h diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 717ae803797..e33317a4a10 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,5 @@ -# $NetBSD: DISKLESS,v 1.13 1995/08/22 19:43:11 jtc Exp $ +# $OpenBSD: DISKLESS,v 1.3 1996/04/18 18:55:32 niklas Exp $ +# $NetBSD: DISKLESS,v 1.21 1996/03/16 06:09:02 thorpej Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) @@ -12,6 +13,11 @@ options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +# Some BIOSes don't get the size of extended memory right. If you +# have a broken BIOS, uncomment the following and set the value +# properly for your system. +#options EXTMEM_SIZE=... # size of extended memory + #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options MACHINE_NONCONTIG @@ -25,7 +31,7 @@ options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices options DDB # in-kernel debugger -options DIAGNOSTIC # internally consistency checks +options DIAGNOSTIC # internal consistency checks options KTRACE # system call tracing, a la ktrace(1) options SYSVMSG # System V-like message queues @@ -73,8 +79,14 @@ options CCITT,LLC,HDLC # X.25 config bsd root on nfs swap on nfs #options GENERIC -isa0 at root -#pci0 at root +mainbus0 at root + +isa0 at mainbus0 +#eisa0 at mainbus0 +#pci0 at mainbus0 bus ? + +#ppb* at pci? dev ? function ? # PCI-PCI bridges +#pci* at ppb? bus ? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -86,7 +98,7 @@ com1 at isa? port 0x2f8 irq 3 com2 at isa? port 0x3e8 irq 5 #com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 3 # AST 4-port serial cards -#com* at ast? slave ? flags 1 +#com* at ast? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards #com* at rtfps? slave ? @@ -100,12 +112,12 @@ lms0 at isa? port 0x23c irq 5 # Logitech bus mouse lms1 at isa? port 0x238 irq 5 mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse mms1 at isa? port 0x238 irq 5 -#pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary port mouse +#pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse #aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers #aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers #scsibus* at aha? -#ahb0 at isa? port ? irq ? # Adaptec 174[024] SCSI controllers +#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? #aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers #scsibus* at aic? @@ -113,7 +125,7 @@ mms1 at isa? port 0x238 irq 5 #bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers #bt2 at isa? port ? irq ? #scsibus* at bt? -#ncr* at pci? bus ? dev ? # NCR 538XX SCSI controllers +#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #sea0 at isa? iomem 0xc8000 irq 5 #scsibus* at sea? @@ -148,7 +160,7 @@ ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN & 3C507 ethernet cards #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster -#spkr0 at isa? ... +#spkr0 at isa? port 0x61 pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 6d4881fd1fc..1a6fcd88231 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,5 @@ -# $NetBSD: GENERIC,v 1.28 1996/01/13 02:05:24 thorpej Exp $ +# $OpenBSD: GENERIC,v 1.7 1996/04/18 18:55:33 niklas Exp $ +# $NetBSD: GENERIC,v 1.36 1996/03/16 06:09:03 thorpej Exp $ # # GENERIC -- everything that's currently supported # @@ -10,6 +11,11 @@ options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +# Some BIOSes don't get the size of extended memory right. If you +# have a broken BIOS, uncomment the following and set the value +# properly for your system. +#options EXTMEM_SIZE=... # size of extended memory + #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options INSECURE # insecure; allow /dev/mem writing for X @@ -25,7 +31,7 @@ options DEVPAGER # mmap() of devices options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -options DIAGNOSTIC # internally consistency checks +options DIAGNOSTIC # internal consistency checks options KTRACE # system call tracing, a la ktrace(1) options SYSVMSG # System V-like message queues @@ -73,11 +79,17 @@ options ISO,TPIP # OSI options EON # OSI tunneling over IP options CCITT,LLC,HDLC # X.25 -config bsd swap generic +config netbsd swap generic options GENERIC -isa0 at root -pci0 at root +mainbus0 at root + +isa0 at mainbus0 +eisa0 at mainbus0 +pci0 at mainbus0 bus ? + +ppb* at pci? dev ? function ? # PCI-PCI bridges +pci* at ppb? bus ? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -89,7 +101,7 @@ com1 at isa? port 0x2f8 irq 3 com2 at isa? port 0x3e8 irq 5 #com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? slave ? flags 1 +#com* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards #com* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards @@ -105,14 +117,14 @@ lms0 at isa? port 0x23c irq 5 # Logitech bus mouse lms1 at isa? port 0x238 irq 5 mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse mms1 at isa? port 0x238 irq 5 -#pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary port mouse +#pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? -ahb0 at isa? port ? irq ? # Adaptec 174[024] SCSI controllers +ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? -ahc* at pci? bus ? dev ? # Adaptec 2940 SCSI controllers +ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers scsibus* at ahc? ahe0 at isa? port 0x1c00 irq ? # Adaptec 284x SCSI controllers scsibus* at ahe? @@ -122,7 +134,7 @@ bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers bt2 at isa? port ? irq ? scsibus* at bt? -ncr* at pci? bus ? dev ? # NCR 538XX SCSI controllers +ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers scsibus* at ncr? sea0 at isa? iomem 0xc8000 irq 5 scsibus* at sea? @@ -156,9 +168,9 @@ el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA -le* at pci? bus ? dev ? # PCnet-PCI based ethernet cards -de* at pci? bus ? dev ? # DC21X4X-based ethernet cards -ep* at pci? bus ? dev ? # 3C590 ethernet cards +le* at pci? dev ? function ? # PCnet-PCI based ethernet cards +de* at pci? dev ? function ? # DC21X4X-based ethernet cards +ep* at pci? dev ? function ? # 3C590 ethernet cards pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver @@ -167,7 +179,7 @@ sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex) -#spkr0 at isa? ... +#spkr0 at isa? port 0x61 pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP index 96a62baaf6b..2ccbebc4488 100644 --- a/sys/arch/i386/conf/GENERICADP +++ b/sys/arch/i386/conf/GENERICADP @@ -1,3 +1,4 @@ +# $OpenBSD: GENERICADP,v 1.6 1996/04/18 18:55:34 niklas Exp $ # $NetBSD: GENERICADP,v 1.3 1995/12/14 01:10:08 tls Exp $ # # GENERICADP -- everything that's currently supported, except non- @@ -11,6 +12,11 @@ options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +# Some BIOSes don't get the size of extended memory right. If you +# have a broken BIOS, uncomment the following and set the value +# properly for your system. +#options EXTMEM_SIZE=... # size of extended memory + #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options INSECURE # insecure; allow /dev/mem writing for X @@ -26,7 +32,7 @@ options DEVPAGER # mmap() of devices options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -options DIAGNOSTIC # internally consistency checks +options DIAGNOSTIC # internal consistency checks options KTRACE # system call tracing, a la ktrace(1) options SYSVMSG # System V-like message queues @@ -77,8 +83,14 @@ options CCITT,LLC,HDLC # X.25 config bsd swap generic options GENERIC -isa0 at root -pci0 at root +mainbus0 at root + +isa0 at mainbus0 +eisa0 at mainbus0 +pci0 at mainbus0 bus ? + +ppb* at pci? dev ? function ? # PCI-PCI bridges +pci* at ppb? bus ? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -90,7 +102,7 @@ com1 at isa? port 0x2f8 irq 3 com2 at isa? port 0x3e8 irq 5 #com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? slave ? flags 1 +#com* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards #com* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards @@ -106,14 +118,14 @@ lms0 at isa? port 0x23c irq 5 # Logitech bus mouse lms1 at isa? port 0x238 irq 5 mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse mms1 at isa? port 0x238 irq 5 -#pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary port mouse +#pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? -ahb0 at isa? port ? irq ? # Adaptec 174[024] SCSI controllers +ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? -ahc* at pci? bus ? dev ? # Adaptec 2940 SCSI controllers +ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers scsibus* at ahc? ahe0 at isa? port 0x1c00 irq ? # Adaptec 284x SCSI controllers scsibus* at ahe? @@ -145,9 +157,9 @@ el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA -le* at pci? bus ? dev ? # PCnet-PCI based ethernet cards -de* at pci? bus ? dev ? # DC21X4X-based ethernet cards -ep* at pci? bus ? dev ? # 3C590 ethernet cards +le* at pci? dev ? function ? # PCnet-PCI based ethernet cards +de* at pci? dev ? function ? # DC21X4X-based ethernet cards +ep* at pci? dev ? function ? # 3C590 ethernet cards pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver @@ -156,7 +168,7 @@ sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex) -#spkr0 at isa? ... +#spkr0 at isa? port 0x61 pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER index be1a1374ebc..23cdc09b36e 100644 --- a/sys/arch/i386/conf/GENERICOTHER +++ b/sys/arch/i386/conf/GENERICOTHER @@ -1,3 +1,4 @@ +# $OpenBSD: GENERICOTHER,v 1.5 1996/04/18 18:55:34 niklas Exp $ # $NetBSD: GENERICOTHER,v 1.3 1995/12/14 01:10:10 tls Exp $ # # GENERICOTHER -- everything that's currently supported, except @@ -11,6 +12,11 @@ options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +# Some BIOSes don't get the size of extended memory right. If you +# have a broken BIOS, uncomment the following and set the value +# properly for your system. +#options EXTMEM_SIZE=... # size of extended memory + #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options INSECURE # insecure; allow /dev/mem writing for X @@ -26,7 +32,7 @@ options DEVPAGER # mmap() of devices options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -options DIAGNOSTIC # internally consistency checks +options DIAGNOSTIC # internal consistency checks options KTRACE # system call tracing, a la ktrace(1) options SYSVMSG # System V-like message queues @@ -77,8 +83,14 @@ options CCITT,LLC,HDLC # X.25 config bsd swap generic options GENERIC -isa0 at root -pci0 at root +mainbus0 at root + +isa0 at mainbus0 +eisa0 at mainbus0 +pci0 at mainbus0 + +ppb* at pci? dev ? function ? # PCI-PCI bridges +pci* at ppb? bus ? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -90,7 +102,7 @@ com1 at isa? port 0x2f8 irq 3 com2 at isa? port 0x3e8 irq 5 #com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? slave ? flags 1 +#com* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards #com* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards @@ -106,13 +118,13 @@ lms0 at isa? port 0x23c irq 5 # Logitech bus mouse lms1 at isa? port 0x238 irq 5 mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse mms1 at isa? port 0x238 irq 5 -#pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary port mouse +#pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers bt2 at isa? port ? irq ? scsibus* at bt? -ncr* at pci? bus ? dev ? # NCR 538XX SCSI controllers +ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers scsibus* at ncr? sea0 at isa? iomem 0xc8000 irq 5 scsibus* at sea? @@ -146,9 +158,9 @@ el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA -le* at pci? bus ? dev ? # PCnet-PCI based ethernet cards -de* at pci? bus ? dev ? # DC21X4X-based ethernet cards -ep* at pci? bus ? dev ? # 3C590 ethernet cards +le* at pci? dev ? function ? # PCnet-PCI based ethernet cards +de* at pci? dev ? function ? # DC21X4X-based ethernet cards +ep* at pci? dev ? function ? # 3C590 ethernet cards pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver @@ -157,7 +169,7 @@ sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex) -#spkr0 at isa? ... +#spkr0 at isa? port 0x61 pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter diff --git a/sys/arch/i386/conf/HELIOS_PCMCIA b/sys/arch/i386/conf/HELIOS_PCMCIA index bb708369d99..b412cdfb0ad 100644 --- a/sys/arch/i386/conf/HELIOS_PCMCIA +++ b/sys/arch/i386/conf/HELIOS_PCMCIA @@ -1,3 +1,4 @@ +# $OpenBSD: HELIOS_PCMCIA,v 1.3 1996/04/18 18:55:35 niklas Exp $ # # HELIOS_PCMCIA -- Eric Hvozda's notebook # @@ -49,17 +50,19 @@ options INET # IP + ICMP + TCP + UDP config bsd root on wd0a swap on wd0b and vnd0b dumps on wd0b -isa0 at root -pci0 at root +mainbus0 at root + +isa0 at mainbus0 +pci0 at mainbus0 npx0 at isa? port 0xf0 irq 13 # math coprocessor pc0 at isa? port 0x60 irq 1 # generic PC console device pcic0 at isa? port 0x3E0 flags 0 -pcmciabus0 at isa? iomem 0xd4000 iosiz 4096 -com2 at pcmciabus? port 0x3e8 irq 12 -ed2 at pcmciabus? port 0x300 iomem 0xcc000 irq 10 +pcmcia0 at pcic? iomem 0xd4000 iosiz 4096 +com2 at pcmcia? port 0x3e8 irq 12 +ed2 at pcmcia? port 0x300 iomem 0xcc000 irq 10 com0 at isa? port 0x3f8 irq 4 # standard PC serial ports com1 at isa? port 0x2f8 irq 3 diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INSTADP index 3eb7db15173..18c608e335d 100644 --- a/sys/arch/i386/conf/INSTADP +++ b/sys/arch/i386/conf/INSTADP @@ -1,3 +1,4 @@ +# $OpenBSD: INSTADP,v 1.5 1996/04/18 18:55:36 niklas Exp $ # $NetBSD: INSTADP,v 1.3 1995/12/14 01:10:12 tls Exp $ # # INSTADP -- like GENERICADP. This supports only Adaptec SCSI @@ -14,6 +15,11 @@ options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +# Some BIOSes don't get the size of extended memory right. If you +# have a broken BIOS, uncomment the following and set the value +# properly for your system. +#options EXTMEM_SIZE=... # size of extended memory + #options DUMMY_NOPS # speed hack; recommended options MACHINE_NONCONTIG @@ -26,8 +32,6 @@ options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices #makeoptions DEBUG="-g" # compile full symbol table -options DIAGNOSTIC # internally consistency checks -options KTRACE # system call tracing, a la ktrace(1) options COMPAT_10 # NetBSD 1.0, @@ -48,8 +52,14 @@ options INET # IP + ICMP + TCP + UDP config bsd swap generic options GENERIC -isa0 at root -pci0 at root +mainbus0 at root + +isa0 at mainbus0 +eisa0 at mainbus0 +pci0 at mainbus0 + +ppb* at pci? dev ? function ? # PCI-PCI bridges +pci* at ppb? bus ? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -61,7 +71,7 @@ com1 at isa? port 0x2f8 irq 3 com2 at isa? port 0x3e8 irq 5 #com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? slave ? flags 1 +#com* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards #com* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards @@ -76,9 +86,9 @@ lpt2 at isa? port 0x3bc aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers scsibus* at aha? -ahb0 at isa? port ? irq ? # Adaptec 174[024] SCSI controllers +ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers scsibus* at ahb? -ahc* at pci? bus ? dev ? # Adaptec 2940 SCSI controllers +ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers scsibus* at ahc? ahe0 at isa? port 0x1c00 irq ? # Adaptec 284x SCSI controllers scsibus* at ahe? @@ -108,9 +118,9 @@ el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN, 3C507, and Etherexpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA -le* at pci? bus ? dev ? # PCnet-PCI based ethernet cards -de* at pci? bus ? dev ? # DC21X4X-based ethernet cards -ep* at pci? bus ? dev ? # 3C590 ethernet cards +le* at pci? dev ? function ? # PCnet-PCI based ethernet cards +de* at pci? dev ? function ? # DC21X4X-based ethernet cards +ep* at pci? dev ? function ? # 3C590 ethernet cards pseudo-device loop 1 # network loopback pseudo-device sl 2 # CSLIP diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 28565c703cb..9e65ac1a7fd 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,5 @@ -# $NetBSD: Makefile.i386,v 1.64 1996/02/09 02:21:25 mycroft Exp $ +# $OpenBSD: Makefile.i386,v 1.6 1996/04/18 18:55:36 niklas Exp $ +# $NetBSD: Makefile.i386,v 1.66 1996/02/29 20:56:16 cgd Exp $ # Makefile for NetBSD # @@ -21,13 +22,12 @@ # DEBUG is set to -g if debugging. # PROF is set to -pg if profiling. -AS= as -AWK= awk -CC= cc -CPP= cpp -LD= ld -STRIP= strip -d -TOUCH= touch -f -c +AS?= as +CC?= cc +CPP?= cpp +LD?= ld +STRIP?= strip -d +TOUCH?= touch -f -c # source tree is located via $S relative to the compilation directory S= ../../../.. diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN new file mode 100644 index 00000000000..ca14440b910 --- /dev/null +++ b/sys/arch/i386/conf/NETTAN @@ -0,0 +1,160 @@ +# $OpenBSD: NETTAN,v 1.1 1996/04/18 18:55:37 niklas Exp $ +# +# NETTAN -- Applitron Datasystem AB +# + +machine i386 # architecture, used by config; REQUIRED + +options I386_CPU # CPU classes; at least one is REQUIRED +options I486_CPU +options I586_CPU +options MATH_EMULATE # floating point emulation + +#options DUMMY_NOPS # speed hack; recommanded +options XSERVER,UCONSOLE +options INSECURE # insecure; allow /dev/mem writing for X +options MACHINE_NONCONTIG + +maxusers 32 # estimated number of users +options TIMEZONE=0 # time zone to adjust RTC time by +options DST=0 # daylight savings time used by RTC + +options SWAPPAGER # paging; REQUIRED +options VNODEPAGER # mmap() of files +options DEVPAGER # mmap() of devices + +options DDB # in-kernel debugger +makeoptions DEBUG="-g" # compile full symbol table +options DIAGNOSTIC # internally consistency checks +options KTRACE # system call tracing, a la ktrace(1) + +options SYSVMSG # System V-like message queues +options SYSVSEM # System V-like semaphores +options SYSVSHM # System V-like memory sharing +#options SHMMAXPGS=1024 # 1024 pages is the default + +options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8, +options COMPAT_09 # NetBSD 0.9, +options COMPAT_10 # NetBSD 1.0, +options COMPAT_43 # and 4.3BSD +options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD + +options COMPAT_SVR4 # binary compatibility with SVR4 +options COMPAT_SVR4_MAP_PAGE_ZERO + # Dell SVR4 mapped page zero read-only, if you + # have SW doing NULL derefs, add this option +options COMPAT_SVR4_NCR # " (NCR variant) +options COMPAT_IBCS2 # binary compatibility with SCO and ISC +options COMPAT_LINUX # binary compatibility with Linux + +options USER_LDT # user-settable LDT; used by WINE +options LKM # loadable kernel modules + +options FFS # UFS +options QUOTA # UFS quotas +#options LFS # log-structured file system +options MFS # memory file system + +options NFSCLIENT # Network File System client +options NFSSERVER # Network File System server + +options CD9660 # ISO 9660 + Rock Ridge file system +options MSDOSFS # MS-DOS file system +options FDESC # /dev/fd +options FIFO # FIFOs; RECOMMENDED +options KERNFS # /kern +options NULLFS # loopback file system +options PORTAL # ? +options PROCFS # /proc +options UMAPFS # NULLFS + uid and gid remapping +options UNION # union file system + +#options GATEWAY # packet forwarding +options INET # IP + ICMP + TCP + UDP +options NS # XNS +#options ISO,TPIP # OSI +#options EON # OSI tunneling over IP +#options CCITT,LLC,HDLC # X.25 + +config netbsd swap generic +options GENERIC + +mainbus0 at root + +isa0 at mainbus0 + +npx0 at isa? port 0xf0 irq 13 # math coprocessor + +#pc0 at isa? port 0x60 irq 1 # generic PC console device +vt0 at isa? port 0x60 irq 1 + +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +#com3 at isa? port 0x2e8 irq 9 +#ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards +#com* at ast? slave ? flags 1 +boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards +com* at boca? slave ? +#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards +#com* at rtfps? slave ? + +#cy0 at isa? ... + +lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports +lpt1 at isa? port 0x278 +lpt2 at isa? port 0x3bc + +lms0 at isa? port 0x23c irq 5 # Logitech bus mouse +lms1 at isa? port 0x238 irq 5 +mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse +mms1 at isa? port 0x238 irq 5 +#pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary port mouse + +aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers +aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers +scsibus* at aha? +aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers +scsibus* at aic? +#bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers +#bt2 at isa? port ? irq ? +#scsibus* at bt? +#sea0 at isa? iomem 0xc8000 irq 5 +scsibus* at sea? +uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers +uha1 at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI controllers +uha2 at isa? port ? irq ? # UltraStor 24f SCSI controllers +scsibus* at uha? + +sd* at scsibus? target ? lun ? # SCSI disk drives +st* at scsibus? target ? lun ? # SCSI tape drives +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +ch* at scsibus? target ? lun ? # SCSI autochangers + +fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers +#fdc1 at isa? port 0x370 irq ? drq ? +fd* at fdc? drive ? + +#mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives + +wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers +#wdc1 at isa? port 0x170 irq ? +wd* at wdc? drive ? + +ed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000 +ed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards +ed2 at isa? port 0x300 iomem 0xcc000 irq 10 +#eg0 at isa? ... # 3C505 ethernet cards + +#spkr0 at isa? ... + +pseudo-device loop 1 # network loopback +pseudo-device bpfilter 8 # packet filter +pseudo-device sl 2 # CSLIP +pseudo-device ppp 2 # PPP +pseudo-device tun 2 # network tunneling over tty + +pseudo-device pty 64 # pseudo-terminals +pseudo-device tb 1 # tablet line discipline +pseudo-device vnd 4 # paging to files diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR index 07de94e4d7a..5669612bf6a 100644 --- a/sys/arch/i386/conf/TDR +++ b/sys/arch/i386/conf/TDR @@ -1,4 +1,5 @@ -# $NetBSD: TDR,v 1.54 1995/08/22 19:43:28 jtc Exp $ +# $OpenBSD: TDR,v 1.5 1996/04/18 18:55:37 niklas Exp $ +# $NetBSD: TDR,v 1.62 1996/03/16 06:09:12 thorpej Exp $ # # TDR -- Theo Deraadt's 486 # @@ -10,6 +11,11 @@ options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation +# Some BIOSes don't get the size of extended memory right. If you +# have a broken BIOS, uncomment the following and set the value +# properly for your system. +#options EXTMEM_SIZE=... # size of extended memory + options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options MACHINE_NONCONTIG @@ -23,7 +29,7 @@ options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices #options DDB # in-kernel debugger -#options DIAGNOSTIC # internally consistency checks +#options DIAGNOSTIC # internal consistency checks options KTRACE # system call tracing, a la ktrace(1) #options SYSVMSG # System V-like message queues @@ -71,8 +77,14 @@ options INET # IP + ICMP + TCP + UDP config bsd root on sd0 swap on sd0 and sd1 and wd0 #options GENERIC -isa0 at root -#pci0 at root +mainbus0 at root + +isa0 at mainbus0 +#eisa0 at mainbus0 +#pci0 at mainbus0 + +#ppb* at pci? dev ? function ? # PCI-PCI bridges +#pci* at ppb? bus ? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -85,7 +97,7 @@ com0 at isa? port 0x3f8 irq 4 # standard PC serial ports #com2 at isa? port 0x3e8 irq 5 #com3 at isa? port 0x2e8 irq 9 ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -com* at ast? slave ? flags 1 +com* at ast? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards #com* at rtfps? slave ? @@ -99,12 +111,12 @@ com* at ast? slave ? flags 1 #lms1 at isa? port 0x238 irq 5 #mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse #mms1 at isa? port 0x238 irq 5 -#pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary port mouse +#pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse #aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers #aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers #scsibus* at aha? -#ahb0 at isa? port ? irq ? # Adaptec 174[024] SCSI controllers +#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? #aic0 at isa? port 0x340 irq 12 # Adaptec 152[02] SCSI controllers #scsibus* at aic? @@ -112,7 +124,7 @@ bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers #bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers #bt2 at isa? port ? irq ? scsibus* at bt? -#ncr* at pci? bus ? dev ? # NCR 538XX SCSI controllers +#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers #scsibus* at ncr? #sea0 at isa? iomem 0xc8000 irq 5 #scsibus* at sea? @@ -149,7 +161,7 @@ ep2 at isa? port ? irq ? #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA #sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster -#spkr0 at isa? ... +#spkr0 at isa? port 0x61 pseudo-device loop 1 # network loopback pseudo-device bpfilter 16 # packet filter diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 714ae03d60d..bd17bd23737 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,9 +1,10 @@ -# $NetBSD: files.i386,v 1.61 1996/01/08 13:51:30 mycroft Exp $ +# $OpenBSD: files.i386,v 1.9 1996/04/18 18:55:38 niklas Exp $ +# $NetBSD: files.i386,v 1.66 1996/03/16 06:09:16 thorpej Exp $ # # new style config file for i386 architecture # -# maxpartitions must be first item in files.${ARCH}.newconf +# maxpartitions must be first item in files.${ARCH} maxpartitions 8 maxusers 2 16 64 @@ -44,15 +45,22 @@ major {cd = 6} # System bus types # -device isa at root {[port = -1], [size = 0], - [iomem = -1], [iosiz = 0], - [irq = -1], [drq = -1]} -#device eisa at root {...} -device pci at root {[bus = -1], [dev = -1]} +device mainbus at root: isabus, eisabus, pcibus +file arch/i386/i386/mainbus.c mainbus + #device mca at root {...} # -# ISA and mixed ISA+EISA or ISA+PCI drivers +# PCI-only drivers +# XXX MUST BE INCLUDED BEFORE files.isa, as long as files.isa attaches +# XXX devices to 'pci'. +# + +include "../../../dev/pci/files.pci" +file arch/i386/pci/pci_machdep.c pci + +# +# ISA and mixed ISA+EISA or ISA+PCI or ISA+PCMCIA drivers # major {mcd = 7} @@ -60,6 +68,11 @@ major {mcd = 7} major {wd = 0} major {wt = 3} +#define pcic here until config issues are resolved +#device pcic at isa: pcmciabus +#file dev/isa/pcmcia_pcic.c pcic + +include "../../../dev/isa/files.isa" file arch/i386/isa/isa_machdep.c isa # PC clock @@ -86,20 +99,12 @@ file arch/i386/isa/pcvt/pcvt_out.c vt needs-flag file arch/i386/isa/pcvt/pcvt_sup.c vt needs-flag file arch/i386/isa/pcvt/pcvt_vtf.c vt needs-flag -#define pcic here until config issues are resolved -device pcic at isa -file dev/isa/pcmcia_pcic.c pcic pcmciabus -device pcmciabus at isa {[port = -1], [size = 0], - [iomem = -1], [iosiz = 0], - [irq = -1], [drq = -1]} -include "../../../dev/isa/files.isa" - # PC Mice; Logitech-style, Microsoft-style, and PS/2-style device lms at isa file arch/i386/isa/lms.c lms needs-flag device mms at isa file arch/i386/isa/mms.c mms needs-flag -device pms at isa +device pms at pckbd file arch/i386/isa/pms.c pms needs-flag # Floppy disk controller @@ -121,7 +126,7 @@ file dev/isa/if_le.c le # National Semiconductor DS8390/WD83C690-based boards # (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones) # XXX conflicts with other ports; can't be in files.isa -device ed at isa, pcmciabus: ether, ifnet +device ed at isa: ether, ifnet file dev/isa/if_ed.c ed needs-flag # Game adapter (joystick) @@ -133,20 +138,6 @@ file arch/i386/isa/joy.c joy needs-flag # include "../../../dev/eisa/files.eisa" -# XXX not yet: -# file arch/i386/eisa/eisa_machdep.c eisa - -# -# PCI-only drivers -# - -include "../../../dev/pci/files.pci" -file arch/i386/pci/pci_machdep.c pci - -# -# Pcmcia -# -include "../../../dev/pcmcia/files.pcmcia" # # Compatibility modules diff --git a/sys/arch/i386/eisa/eisa_machdep.h b/sys/arch/i386/eisa/eisa_machdep.h new file mode 100644 index 00000000000..e7ba6579fff --- /dev/null +++ b/sys/arch/i386/eisa/eisa_machdep.h @@ -0,0 +1,40 @@ +/* $OpenBSD: eisa_machdep.h,v 1.1 1996/04/18 18:56:27 niklas Exp $ */ +/* $NetBSD: eisa_machdep.h,v 1.1 1996/03/04 03:26:14 cgd Exp $ */ + +/* + * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Christopher G. Demetriou + * for the NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * The "EISA" signature is in the BIOS of EISA systems. We use it + * to determine whether or not we have an EISA bus. + */ +#define EISA_ID "EISA" +#define EISA_ID_LEN (sizeof(EISA_ID) - 1) +#define EISA_ID_PADDR 0xfffd9 -- 2.20.1