diff options
author | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
---|---|---|
committer | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
commit | 148ce94bebd89be1aab174e5e4af889f43ffdd6d (patch) | |
tree | 76c7c637f26dd9c707e9bc4cb86db9ba6765d078 /sys/pc98/conf | |
parent | 7b9ecd2de3dd0e21793ef47de26c51dbf4b2dff9 (diff) | |
download | FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.zip FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.tar.gz |
Yet another merge. Remove support.s by deleting memcopy. Remove
autoconf.c by merging icu.h. Fix a couple of typos.
Submitted by: The FreeBSD(98) Development Team.
Diffstat (limited to 'sys/pc98/conf')
-rw-r--r-- | sys/pc98/conf/GENERIC | 84 | ||||
-rw-r--r-- | sys/pc98/conf/GENERIC98 | 84 | ||||
-rw-r--r-- | sys/pc98/conf/Makefile.pc98 | 4 | ||||
-rw-r--r-- | sys/pc98/conf/files.pc98 | 11 |
4 files changed, 119 insertions, 64 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 2664e5d..5fedd9c 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.75 1996/08/27 16:25:53 wosch Exp $ +# $Id: GENERIC98,v 1.3 1996/08/31 15:06:28 asami Exp $ # GENERIC98 -- Generic PC98 machine with WD/SBIC55 disks @@ -76,17 +76,17 @@ options DIAGNOSTIC config kernel root on wd0 -controller nec0 +controller isa0 controller pci0 -controller fdc0 at nec? port "IO_FD1" bio irq 11 drq 2 vector fdintr +controller fdc0 at isa? port "IO_FD1" bio irq 11 drq 2 vector fdintr disk fd0 at fdc0 drive 0 disk fd1 at fdc0 drive 1 disk fd2 at fdc0 drive 2 disk fd3 at fdc0 drive 3 tape ft0 at fdc0 drive 4 -controller wdc0 at nec? port "IO_WD1" bio irq 9 vector wdintr +controller wdc0 at isa? port "IO_WD1" bio irq 9 vector wdintr disk wd0 at wdc0 drive 0 #disk wd1 at wdc0 drive 1 #disk wd2 at wdc0 drive 2 @@ -96,10 +96,13 @@ options ATAPI # Enable ATAPI support for IDE bus options ATAPI_STATIC #Don't do it as an LKM device wcd #IDE CD-ROM -controller sbic0 at nec? port "IO_SCSI" bio irq 5 drq 3 vector sbicintr -#controller sbic0 at nec? port "IO_SCSI" bio irq 5 drq 3 flags 0xff vector sbicintr -controller aic0 at nec? port 0x1840 bio irq 5 vector aicintr +# A single entry for any of these controllers (ncr, ahb, ahc) is sufficient +# for any number of installed devices. +controller ncr0 controller ahc0 +controller sbic0 at isa? port "IO_SCSI" bio irq 5 drq 3 vector sbicintr +#controller sbic0 at isa? port "IO_SCSI" bio irq 5 drq 3 flags 0xff vector sbicintr +controller aic0 at isa? port 0x1840 bio irq 5 vector aicintr controller scbus0 @@ -111,49 +114,74 @@ device cd0 #Only need one of these, the code dynamically grows device od0 -controller matcd0 at nec? port? bio +controller matcd0 at isa? port? bio # syscons is the default console driver, resembling an SCO console -device sc0 at nec? port "IO_KBD" tty irq 1 vector scintr +device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr #options XSERVER # include code for XFree86 # Mandatory, don't remove -device npx0 at nec? port "IO_NPX" irq 8 vector npxintr +device npx0 at isa? port "IO_NPX" irq 8 vector npxintr # # Laptop support (see LINT for more options) # -device apm0 at nec? disable # Advanced Power Management +device apm0 at isa? disable # Advanced Power Management options APM_BROKEN_STATCLOCK # Workaround some buggy APM BIOS # PCCARD (PCMCIA) support #controller crd0 #device pcic0 at crd? #device pcic1 at crd? -device lpt0 at nec? port "IO_LPT" tty -device mse0 at nec? port "IO_MSE" tty irq 13 vector mseintr +device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr +device sio1 at isa? port 0xd2 tty irq 5 flags 0x101 vector siointr +device sio2 at isa? port 0x8d2 tty flags 0x101 vector siointr -device sio0 at nec? port "IO_COM1" tty irq 4 vector siointr -device sio1 at nec? port 0xd2 tty irq 5 flags 0x101 vector siointr -device sio2 at nec? port 0x8d2 tty flags 0x101 vector siointr +device lpt0 at isa? port "IO_LPT" tty +device mse0 at isa? port "IO_MSE" tty irq 13 vector mseintr +# Order is important here due to intrusive probes, do *not* alphabetize +# this list of network interfaces until the probes have been fixed. +# Right now it appears that the ie0 must be probed before ep0. See +# revision 1.20 of this file. +device de0 +device fxp0 +device vx0 -device ed0 at nec? port 0x00d0 net irq 6 vector edintr -device ed1 at nec? port 0x56d0 net irq 5 vector edintr -device ed2 at nec? port 0x00d0 net irq 6 iomem 0xd0000 iosiz 16384 vector edintr -device fe0 at nec? port 0x00d0 net irq 3 vector feintr -device zp0 at nec? port 0x0300 net irq 10 iomem 0xe0000 vector zpintr -device ep0 at nec? port 0x00d0 net irq 6 vector epintr +# +# DP8390 NIC +# +# ed0: generic driver +# ed1: LANEED LD-BDN +# ed2: EGY-98 +# ed3: LGY-98 +# ed4: ICM-IF-2766/EN-2298-T +# ed5: SIC-98 +# ed6: PC-9801-108 +# ed7: LA-98 +# +device ed0 at isa? port 0x00d0 net irq 6 vector edintr +device ed1 at isa? port 0x00d8 net irq 6 flags 0x20000 vector edintr +device ed2 at isa? port 0x00d8 net irq 6 flags 0x30000 vector edintr +device ed3 at isa? port 0x00d8 net irq 6 flags 0x40000 vector edintr +device ed4 at isa? port 0x56d0 net irq 5 flags 0x50000 vector edintr +device ed5 at isa? port 0x00d0 net irq 6 iomem 0xd0000 iosiz 16384 flags 0x60000 vector edintr +device ed6 at isa? port 0x00d0 net irq 6 flags 0x80000 vector edintr +device ed7 at isa? port 0x00d0 net irq 6 flags 0x90000 vector edintr + +device fe0 at isa? port 0x00d0 net irq 3 vector feintr +device zp0 at isa? port 0x0300 net irq 10 iomem 0xe0000 vector zpintr +device ep0 at isa? port 0x00d0 net irq 6 vector epintr #controller snd0 -#device sb0 at nec? port 0x20d2 irq 10 conflicts drq 3 vector sbintr -#device sbxvi0 at nec? drq 3 -#device sbmidi0 at nec? port 0x80d2 -#device opl0 at nec? port 0x28d2 +#device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3 vector sbintr +#device sbxvi0 at isa? drq 3 +#device sbmidi0 at isa? port 0x80d2 +#device opl0 at isa? port 0x28d2 -#device pcm0 at nec? port 0xa460 irq 12 vector pcmintr +#device pcm0 at isa? port 0xa460 irq 12 vector pcmintr -#device mss0 at nec? port 0xf40 irq12 drq 1 vectro adintr +#device mss0 at isa? port 0xf40 irq12 drq 1 vectro adintr pseudo-device loop pseudo-device ether diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98 index 2664e5d..5fedd9c 100644 --- a/sys/pc98/conf/GENERIC98 +++ b/sys/pc98/conf/GENERIC98 @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.75 1996/08/27 16:25:53 wosch Exp $ +# $Id: GENERIC98,v 1.3 1996/08/31 15:06:28 asami Exp $ # GENERIC98 -- Generic PC98 machine with WD/SBIC55 disks @@ -76,17 +76,17 @@ options DIAGNOSTIC config kernel root on wd0 -controller nec0 +controller isa0 controller pci0 -controller fdc0 at nec? port "IO_FD1" bio irq 11 drq 2 vector fdintr +controller fdc0 at isa? port "IO_FD1" bio irq 11 drq 2 vector fdintr disk fd0 at fdc0 drive 0 disk fd1 at fdc0 drive 1 disk fd2 at fdc0 drive 2 disk fd3 at fdc0 drive 3 tape ft0 at fdc0 drive 4 -controller wdc0 at nec? port "IO_WD1" bio irq 9 vector wdintr +controller wdc0 at isa? port "IO_WD1" bio irq 9 vector wdintr disk wd0 at wdc0 drive 0 #disk wd1 at wdc0 drive 1 #disk wd2 at wdc0 drive 2 @@ -96,10 +96,13 @@ options ATAPI # Enable ATAPI support for IDE bus options ATAPI_STATIC #Don't do it as an LKM device wcd #IDE CD-ROM -controller sbic0 at nec? port "IO_SCSI" bio irq 5 drq 3 vector sbicintr -#controller sbic0 at nec? port "IO_SCSI" bio irq 5 drq 3 flags 0xff vector sbicintr -controller aic0 at nec? port 0x1840 bio irq 5 vector aicintr +# A single entry for any of these controllers (ncr, ahb, ahc) is sufficient +# for any number of installed devices. +controller ncr0 controller ahc0 +controller sbic0 at isa? port "IO_SCSI" bio irq 5 drq 3 vector sbicintr +#controller sbic0 at isa? port "IO_SCSI" bio irq 5 drq 3 flags 0xff vector sbicintr +controller aic0 at isa? port 0x1840 bio irq 5 vector aicintr controller scbus0 @@ -111,49 +114,74 @@ device cd0 #Only need one of these, the code dynamically grows device od0 -controller matcd0 at nec? port? bio +controller matcd0 at isa? port? bio # syscons is the default console driver, resembling an SCO console -device sc0 at nec? port "IO_KBD" tty irq 1 vector scintr +device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr #options XSERVER # include code for XFree86 # Mandatory, don't remove -device npx0 at nec? port "IO_NPX" irq 8 vector npxintr +device npx0 at isa? port "IO_NPX" irq 8 vector npxintr # # Laptop support (see LINT for more options) # -device apm0 at nec? disable # Advanced Power Management +device apm0 at isa? disable # Advanced Power Management options APM_BROKEN_STATCLOCK # Workaround some buggy APM BIOS # PCCARD (PCMCIA) support #controller crd0 #device pcic0 at crd? #device pcic1 at crd? -device lpt0 at nec? port "IO_LPT" tty -device mse0 at nec? port "IO_MSE" tty irq 13 vector mseintr +device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr +device sio1 at isa? port 0xd2 tty irq 5 flags 0x101 vector siointr +device sio2 at isa? port 0x8d2 tty flags 0x101 vector siointr -device sio0 at nec? port "IO_COM1" tty irq 4 vector siointr -device sio1 at nec? port 0xd2 tty irq 5 flags 0x101 vector siointr -device sio2 at nec? port 0x8d2 tty flags 0x101 vector siointr +device lpt0 at isa? port "IO_LPT" tty +device mse0 at isa? port "IO_MSE" tty irq 13 vector mseintr +# Order is important here due to intrusive probes, do *not* alphabetize +# this list of network interfaces until the probes have been fixed. +# Right now it appears that the ie0 must be probed before ep0. See +# revision 1.20 of this file. +device de0 +device fxp0 +device vx0 -device ed0 at nec? port 0x00d0 net irq 6 vector edintr -device ed1 at nec? port 0x56d0 net irq 5 vector edintr -device ed2 at nec? port 0x00d0 net irq 6 iomem 0xd0000 iosiz 16384 vector edintr -device fe0 at nec? port 0x00d0 net irq 3 vector feintr -device zp0 at nec? port 0x0300 net irq 10 iomem 0xe0000 vector zpintr -device ep0 at nec? port 0x00d0 net irq 6 vector epintr +# +# DP8390 NIC +# +# ed0: generic driver +# ed1: LANEED LD-BDN +# ed2: EGY-98 +# ed3: LGY-98 +# ed4: ICM-IF-2766/EN-2298-T +# ed5: SIC-98 +# ed6: PC-9801-108 +# ed7: LA-98 +# +device ed0 at isa? port 0x00d0 net irq 6 vector edintr +device ed1 at isa? port 0x00d8 net irq 6 flags 0x20000 vector edintr +device ed2 at isa? port 0x00d8 net irq 6 flags 0x30000 vector edintr +device ed3 at isa? port 0x00d8 net irq 6 flags 0x40000 vector edintr +device ed4 at isa? port 0x56d0 net irq 5 flags 0x50000 vector edintr +device ed5 at isa? port 0x00d0 net irq 6 iomem 0xd0000 iosiz 16384 flags 0x60000 vector edintr +device ed6 at isa? port 0x00d0 net irq 6 flags 0x80000 vector edintr +device ed7 at isa? port 0x00d0 net irq 6 flags 0x90000 vector edintr + +device fe0 at isa? port 0x00d0 net irq 3 vector feintr +device zp0 at isa? port 0x0300 net irq 10 iomem 0xe0000 vector zpintr +device ep0 at isa? port 0x00d0 net irq 6 vector epintr #controller snd0 -#device sb0 at nec? port 0x20d2 irq 10 conflicts drq 3 vector sbintr -#device sbxvi0 at nec? drq 3 -#device sbmidi0 at nec? port 0x80d2 -#device opl0 at nec? port 0x28d2 +#device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3 vector sbintr +#device sbxvi0 at isa? drq 3 +#device sbmidi0 at isa? port 0x80d2 +#device opl0 at isa? port 0x28d2 -#device pcm0 at nec? port 0xa460 irq 12 vector pcmintr +#device pcm0 at isa? port 0xa460 irq 12 vector pcmintr -#device mss0 at nec? port 0xf40 irq12 drq 1 vectro adintr +#device mss0 at isa? port 0xf40 irq12 drq 1 vectro adintr pseudo-device loop pseudo-device ether diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98 index bc262d2..10f5742 100644 --- a/sys/pc98/conf/Makefile.pc98 +++ b/sys/pc98/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.3 1996/08/30 10:42:49 asami Exp $ +# $Id: Makefile.pc98,v 1.4 1996/09/03 10:23:11 asami Exp $ # # Makefile for FreeBSD # @@ -172,7 +172,7 @@ install: install -c -m 555 -o root -g wheel -fschg kernel / ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h \ - ${I386}/isa/isa_device.h ${PC98}/pc98/pc98.h ${PC98}/pc98/icu.h + ${I386}/isa/isa_device.h ${PC98}/pc98/pc98.h ${I386}/isa/icu.h ${CC} -c ${CFLAGS} ioconf.c param.c: $S/conf/param.c diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98 index 47027cd..fb7d0d4 100644 --- a/sys/pc98/conf/files.pc98 +++ b/sys/pc98/conf/files.pc98 @@ -2,7 +2,7 @@ # files marked standard are always included. # # modified for PC-9801 after: -# $Id: files.pc98,v 1.4 1996/09/03 10:23:12 asami Exp $ +# $Id: files.pc98,v 1.5 1996/09/04 09:52:08 asami Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ @@ -35,8 +35,8 @@ i386/apm/apm_setup.s optional apm #i386/eisa/aic7770.c optional ahc device-driver #i386/eisa/aha1742.c optional ahb device-driver #i386/eisa/bt74x.c optional bt device-driver -#i386/eisa/eisaconf.c optional eisa -pc98/i386/autoconf.c standard device-driver +i386/eisa/eisaconf.c optional eisa +i386/i386/autoconf.c standard device-driver i386/i386/cons.c standard i386/i386/db_disasm.c optional ddb i386/i386/db_interface.c optional ddb @@ -56,7 +56,7 @@ pc98/i386/microtime.s standard i386/i386/perfmon.c optional perfmon pc98/i386/pmap.c standard i386/i386/procfs_machdep.c standard -pc98/i386/support.s standard +i386/i386/support.s standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard pc98/i386/trap.c standard @@ -118,8 +118,7 @@ pc98/pc98/if_fe.c optional fe device-driver #i386/isa/if_sr.c optional sr device-driver #pc98/isa/if_ze.c optional ze device-driver i386/isa/if_zp.c optional zp device-driver -pc98/pc98/pc98.c optional nec device-driver -pc98/pc98/pc98.c optional epson device-driver +pc98/pc98/pc98.c optional isa device-driver pc98/isa/istallion.c optional stli device-driver pc98/isa/joy.c optional joy device-driver pc98/pc98/labpc.c optional labpc device-driver |