Sync with sys/i386/conf/GENERIC, SMP-GENERIC, device.i386, files.i386,

majors.i386 and options.i386 revisions 1.116, 1.13, 1.14, 1.203, 1.49
and 1.86, respectively.
This commit is contained in:
kato 1998-09-15 14:10:56 +00:00
parent 33f011b8f7
commit e6b5e2ad1d
9 changed files with 77 additions and 81 deletions

View File

@ -3,7 +3,7 @@
#
# modified for PC-9801
#
# $Id: files.pc98,v 1.67 1998/09/05 02:36:18 kato Exp $
# $Id: files.pc98,v 1.68 1998/09/09 14:39:56 kato Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@ -28,12 +28,13 @@ font8x16.o optional std8x16font \
#
i386/apm/apm.c optional apm device-driver
i386/apm/apm_setup.s optional apm
#i386/eisa/dpt_eisa.c optional eisa dpt device-driver
#i386/eisa/3c5x9.c optional ep device-driver
#i386/eisa/aic7770.c optional ahc device-driver \
# dependency "aic7xxx_reg.h $S/i386/eisa/aic7770.c"
#i386/eisa/aha1742.c optional ahb device-driver
#i386/eisa/bt74x.c optional bt device-driver
i386/eisa/dpt_eisa.c optional eisa dpt device-driver
i386/eisa/3c5x9.c optional ep device-driver
i386/eisa/adv_eisa.c optional adv device-driver
i386/eisa/ahc_eisa.c optional ahc device-driver \
dependency "aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c"
i386/eisa/ahb.c optional ahb device-driver
i386/eisa/bt_eisa.c optional bt device-driver
i386/eisa/eisaconf.c optional eisa
i386/eisa/if_vx_eisa.c optional vx device-driver
i386/eisa/if_fea.c optional fea device-driver
@ -98,11 +99,14 @@ i386/isa/bs/bs.c optional bs device-driver
i386/isa/bs/bsfunc.c optional bs device-driver
i386/isa/bs/bshw.c optional bs device-driver
i386/isa/bs/bsif.c optional bs device-driver
i386/isa/aha1542.c optional aha device-driver
i386/isa/aic6360.c optional aic device-driver
i386/isa/adv_isa.c optional adv device-driver
#i386/isa/aha1542.c optional aha device-driver
i386/isa/aha_isa.c optional aha device-driver
#i386/isa/aic6360.c optional aic device-driver
i386/isa/aic_isa.c optional aic device-driver
i386/isa/alog.c optional alog device-driver
i386/isa/b004.c optional bqu device-driver
i386/isa/bt5xx-445.c optional bt device-driver
i386/isa/bt_isa.c optional bt device-driver
pc98/pc98/clock.c standard
i386/isa/cronyx.c optional cx device-driver
i386/isa/ctx.c optional ctx device-driver
@ -147,7 +151,7 @@ pc98/pc98/lpt.c optional lpt device-driver
i386/isa/labpc.c optional labpc device-driver
i386/isa/mcd.c optional mcd device-driver
pc98/pc98/mse.c optional mse device-driver
i386/isa/ncr5380.c optional nca device-driver
#i386/isa/ncr5380.c optional nca device-driver
pc98/pc98/npx.c mandatory npx device-driver
pc98/pc98/pcaudio.c optional pca device-driver
i386/isa/matcd/matcd.c optional matcd device-driver
@ -169,7 +173,7 @@ i386/isa/random_machdep.c standard
i386/isa/rc.c optional rc device-driver
i386/isa/rp.c optional rp device-driver
i386/isa/scd.c optional scd device-driver
i386/isa/seagate.c optional sea device-driver
#i386/isa/seagate.c optional sea device-driver
i386/isa/si.c optional si device-driver
i386/isa/si2_z280.c optional si device-driver
i386/isa/si3_t225.c optional si device-driver
@ -246,7 +250,7 @@ pc98/pc98/spkr.c optional speaker device-driver
i386/isa/stallion.c optional stl device-driver
pc98/pc98/syscons.c optional sc device-driver
i386/isa/tw.c optional tw device-driver
i386/isa/ultra14f.c optional uha device-driver
#i386/isa/ultra14f.c optional uha device-driver
pc98/pc98/wd.c optional wdc device-driver
pc98/pc98/wd.c optional wd device-driver
i386/isa/atapi.c optional atapi device-driver
@ -270,10 +274,6 @@ i386/linux/linux_stats.c optional compat_linux
i386/linux/linux_sysent.c optional compat_linux
i386/linux/linux_sysvec.c optional compat_linux
i386/linux/linux_util.c optional compat_linux
i386/scsi/93cx6.c optional ahc device-driver
i386/scsi/aic7xxx.c optional ahc device-driver \
dependency "aic7xxx_{reg,seq}.h"
i386/scsi/bt.c optional bt device-driver
libkern/bcd.c standard
libkern/divdi3.c standard
libkern/inet_ntoa.c standard

View File

@ -1,4 +1,4 @@
# $Id: options.pc98,v 1.64 1998/08/10 16:54:09 kato Exp $
# $Id: options.pc98,v 1.65 1998/09/09 14:39:20 kato Exp $
BOUNCEPAGES opt_bounce.h
DISABLE_PSE
USER_LDT
@ -41,11 +41,6 @@ NBUS opt_smp.h
NAPIC opt_smp.h
NINTR opt_smp.h
AHC_TAGENABLE opt_aic7xxx.h
AHC_SCBPAGING_ENABLE opt_aic7xxx.h
AHC_ALLOW_MEMIO opt_aic7xxx.h
AHC_SHARE_SCBS opt_aic7xxx.h
CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
CLK_USE_TSC_CALIBRATION opt_clock.h

View File

@ -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: GENERIC98,v 1.42 1998/09/05 02:20:52 kato Exp $
# $Id: GENERIC98,v 1.43 1998/09/15 08:25:09 kato Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@ -35,8 +35,8 @@ options FFS_ROOT #FFS usable as root device [keep this!]
options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device
options BOUNCE_BUFFERS #include support for DMA bounce buffers
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
options SCSI_CAM #We're using CAM in this kernel
options EPSON_BOUNCEDMA #use bounce buufer for 15-16M
#options EPSON_MEMWIN #EPSON memory window support
options UCONSOLE #Allow users to grab the console
@ -81,7 +81,7 @@ device wcd0 #IDE CD-ROM
# A single entry for any of these controllers (ncr, ahb, ahc) is sufficient
# for any number of installed devices.
controller ncr0
controller amd0
#controller amd0
controller ahc0
controller isp0
@ -108,11 +108,11 @@ controller aic0 at isa? port 0x1840 bio irq 5 flags 0x10000 vector aicintr
controller scbus0
device sd0
device da0
device od0 #See LINT for possible `od' options.
device sa0
device st0
device pass0
device cd0 #Only need one of these, the code dynamically grows

View File

@ -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: GENERIC98,v 1.42 1998/09/05 02:20:52 kato Exp $
# $Id: GENERIC98,v 1.43 1998/09/15 08:25:09 kato Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@ -35,8 +35,8 @@ options FFS_ROOT #FFS usable as root device [keep this!]
options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device
options BOUNCE_BUFFERS #include support for DMA bounce buffers
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
options SCSI_CAM #We're using CAM in this kernel
options EPSON_BOUNCEDMA #use bounce buufer for 15-16M
#options EPSON_MEMWIN #EPSON memory window support
options UCONSOLE #Allow users to grab the console
@ -81,7 +81,7 @@ device wcd0 #IDE CD-ROM
# A single entry for any of these controllers (ncr, ahb, ahc) is sufficient
# for any number of installed devices.
controller ncr0
controller amd0
#controller amd0
controller ahc0
controller isp0
@ -108,11 +108,11 @@ controller aic0 at isa? port 0x1840 bio irq 5 flags 0x10000 vector aicintr
controller scbus0
device sd0
device da0
device od0 #See LINT for possible `od' options.
device sa0
device st0
device pass0
device cd0 #Only need one of these, the code dynamically grows

View File

@ -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: SMP-GENERIC98,v 1.1 1998/05/04 07:58:36 kato Exp $
# $Id: SMP-GENERIC98,v 1.2 1998/05/04 08:48:23 kato Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@ -47,7 +47,8 @@ options FFS_ROOT #FFS usable as root device [keep this!]
options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
options SCSI_CAM #We're using CAM in this kernel
options BOUNCE_BUFFERS #include support for DMA bounce buffers
options UCONSOLE #Allow users to grab the console
options "LINE30"
@ -82,6 +83,9 @@ disk fd0 at fdc0 drive 0
disk fd1 at fdc0 drive 1
disk fd2 at fdc0 drive 2
disk fd3 at fdc0 drive 3
# Unless you know very well what you're doing, leave ft0 at drive 2, or
# remove the line entirely if you don't need it. Trying to configure
# it on another unit might cause surprises, see PR kern/7176.
tape ft0 at fdc0 drive 4
# options "CMD640" # work around CMD640 chip deficiency
@ -98,7 +102,7 @@ device wcd0 #IDE CD-ROM
# A single entry for any of these controllers (ncr, ahb, ahc) is sufficient
# for any number of installed devices.
controller ncr0
controller amd0
#controller amd0
controller ahc0
controller isp0
@ -128,11 +132,11 @@ controller aic0 at isa? port 0x1840 bio irq 5 flags 0x10000 vector aicintr
controller scbus0
device sd0
device da0
device od0 #See LINT for possible `od' options.
device sa0
device st0
device pass0
device cd0 #Only need one of these, the code dynamically grows
@ -167,7 +171,10 @@ device mse0 at isa? port "IO_MSE" tty irq 13 vector mseintr
# revision 1.20 of this file.
device de0
device fxp0
device tl0
device tx0
device vx0
device xl0
#
# DP8390 NIC
@ -210,7 +217,7 @@ device zp0 at isa? port 0x00d0 net irq 10 iomem 0xe0000 vector zpintr
pseudo-device loop
pseudo-device ether
pseudo-device sl 1
pseudo-device ppp 1
#pseudo-device ppp 1
pseudo-device tun 1
pseudo-device pty 16
pseudo-device gzip # Exec gzipped a.out's
@ -220,3 +227,6 @@ pseudo-device gzip # Exec gzipped a.out's
# the costs of each syscall.
options KTRACE #kernel tracing
# This provides support for System V shared memory.
#
options SYSVSHM

View File

@ -1,18 +1,17 @@
# This file tells what major numbers the various possible swap devices have.
#
# $Id: devices.pc98,v 1.4 1998/01/18 15:09:05 kato Exp $
# $Id: devices.pc98,v 1.5 1998/02/18 12:33:34 kato Exp $
#
wd 0
wfd 1
fd 2
wt 3
sd 4
st 5
da 4
sa 5
cd 6
mcd 7
vn 15
scd 16
pcd 17
wcd 19
od 20
wst 24

View File

@ -3,7 +3,7 @@
#
# modified for PC-9801
#
# $Id: files.pc98,v 1.67 1998/09/05 02:36:18 kato Exp $
# $Id: files.pc98,v 1.68 1998/09/09 14:39:56 kato Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@ -28,12 +28,13 @@ font8x16.o optional std8x16font \
#
i386/apm/apm.c optional apm device-driver
i386/apm/apm_setup.s optional apm
#i386/eisa/dpt_eisa.c optional eisa dpt device-driver
#i386/eisa/3c5x9.c optional ep device-driver
#i386/eisa/aic7770.c optional ahc device-driver \
# dependency "aic7xxx_reg.h $S/i386/eisa/aic7770.c"
#i386/eisa/aha1742.c optional ahb device-driver
#i386/eisa/bt74x.c optional bt device-driver
i386/eisa/dpt_eisa.c optional eisa dpt device-driver
i386/eisa/3c5x9.c optional ep device-driver
i386/eisa/adv_eisa.c optional adv device-driver
i386/eisa/ahc_eisa.c optional ahc device-driver \
dependency "aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c"
i386/eisa/ahb.c optional ahb device-driver
i386/eisa/bt_eisa.c optional bt device-driver
i386/eisa/eisaconf.c optional eisa
i386/eisa/if_vx_eisa.c optional vx device-driver
i386/eisa/if_fea.c optional fea device-driver
@ -98,11 +99,14 @@ i386/isa/bs/bs.c optional bs device-driver
i386/isa/bs/bsfunc.c optional bs device-driver
i386/isa/bs/bshw.c optional bs device-driver
i386/isa/bs/bsif.c optional bs device-driver
i386/isa/aha1542.c optional aha device-driver
i386/isa/aic6360.c optional aic device-driver
i386/isa/adv_isa.c optional adv device-driver
#i386/isa/aha1542.c optional aha device-driver
i386/isa/aha_isa.c optional aha device-driver
#i386/isa/aic6360.c optional aic device-driver
i386/isa/aic_isa.c optional aic device-driver
i386/isa/alog.c optional alog device-driver
i386/isa/b004.c optional bqu device-driver
i386/isa/bt5xx-445.c optional bt device-driver
i386/isa/bt_isa.c optional bt device-driver
pc98/pc98/clock.c standard
i386/isa/cronyx.c optional cx device-driver
i386/isa/ctx.c optional ctx device-driver
@ -147,7 +151,7 @@ pc98/pc98/lpt.c optional lpt device-driver
i386/isa/labpc.c optional labpc device-driver
i386/isa/mcd.c optional mcd device-driver
pc98/pc98/mse.c optional mse device-driver
i386/isa/ncr5380.c optional nca device-driver
#i386/isa/ncr5380.c optional nca device-driver
pc98/pc98/npx.c mandatory npx device-driver
pc98/pc98/pcaudio.c optional pca device-driver
i386/isa/matcd/matcd.c optional matcd device-driver
@ -169,7 +173,7 @@ i386/isa/random_machdep.c standard
i386/isa/rc.c optional rc device-driver
i386/isa/rp.c optional rp device-driver
i386/isa/scd.c optional scd device-driver
i386/isa/seagate.c optional sea device-driver
#i386/isa/seagate.c optional sea device-driver
i386/isa/si.c optional si device-driver
i386/isa/si2_z280.c optional si device-driver
i386/isa/si3_t225.c optional si device-driver
@ -246,7 +250,7 @@ pc98/pc98/spkr.c optional speaker device-driver
i386/isa/stallion.c optional stl device-driver
pc98/pc98/syscons.c optional sc device-driver
i386/isa/tw.c optional tw device-driver
i386/isa/ultra14f.c optional uha device-driver
#i386/isa/ultra14f.c optional uha device-driver
pc98/pc98/wd.c optional wdc device-driver
pc98/pc98/wd.c optional wd device-driver
i386/isa/atapi.c optional atapi device-driver
@ -270,10 +274,6 @@ i386/linux/linux_stats.c optional compat_linux
i386/linux/linux_sysent.c optional compat_linux
i386/linux/linux_sysvec.c optional compat_linux
i386/linux/linux_util.c optional compat_linux
i386/scsi/93cx6.c optional ahc device-driver
i386/scsi/aic7xxx.c optional ahc device-driver \
dependency "aic7xxx_{reg,seq}.h"
i386/scsi/bt.c optional bt device-driver
libkern/bcd.c standard
libkern/divdi3.c standard
libkern/inet_ntoa.c standard

View File

@ -1,4 +1,4 @@
$Id: majors.pc98,v 1.38 1998/09/09 14:40:27 kato Exp $
$Id: majors.pc98,v 1.39 1998/09/14 10:43:26 kato Exp $
Hopefully, this list will one day be obsoleted by DEVFS, but for now
this is the current allocation of device major numbers.
@ -17,8 +17,8 @@ blkdev name comments
1 wfd ATAPI Floppy client of "ata"
2 fd floppy disk
3 wt QIC-02/36 tape
4 sd SCSI "disk" type
5 st SCSI "tape" type
4 da SCSI "direct acess" devices
5 sa SCSI "sequential access" devices
6 cd SCSI "cdrom" type
7 mcd Mitsumi CDROM interface
8 lkm assigned to Loadable Kernel modules
@ -33,10 +33,8 @@ blkdev name comments
17 matcd Matsushita/Panasonic/Creative(SB) CDROM interface
18 ata "device independent" ATA/IDE driver
19 wcdb ATAPI CDROM client of "ata"
20 od SCSI "magneto-optical" disk
21 ccd concatenated disk
22 gd Geometry disk.
23 worm SCSI "worm type"
24 wstb ATAPI tape client of "ata"
25 vinum RAID fs
26 sw VM internal swap device
@ -57,8 +55,8 @@ chrdev name comments
10 wt QIC-02/36 tape
11 spigot Video capture?
12 sc syscons/pcvt virtual consoles
13 sd SCSI "disk type"
14 st SCSI "tape type"
13 da SCSI "direct access devices"
14 sa SCSI "sequential access devices"
15 cd SCSI "CDROM type"
16 lpt PC parallel printer port
17 ch SCSI changer
@ -75,7 +73,7 @@ chrdev name comments
28 sio 16450/16550 serial
29 mcd Mitsumi CDROM interface
30 snd sound driver system
31 uk SCSI "unknown device type"
31 pass SCSI "Application Pass-Thru"
32 lkmc Loadable Kernel Module Controller
33 lkm assigned to Loadable Kernel Modules
34 lkm assigned to Loadable Kernel Modules
@ -109,12 +107,11 @@ chrdev name comments
62 worm SCSI "worm type"
63 rc Riscom/8 driver
64 ?? Talisman
65 sctarg SCSI target
65 targ SCSI target sample driver
66 labpc National Instruments LabPC
67 meteor Matrox Meteor video capture
68 si Specialix SI/XIO (peter@freebsd.org)
69 wcd ATAPI CDROM client of "ata"
70 od SCSI "magneto-optical disk type"
71 asc AmiScan driver
72 stl Stallion (cd1400 based) (gerg@stallion.oz.au)
73 ?? was qcam

View File

@ -1,4 +1,4 @@
# $Id: options.pc98,v 1.64 1998/08/10 16:54:09 kato Exp $
# $Id: options.pc98,v 1.65 1998/09/09 14:39:20 kato Exp $
BOUNCEPAGES opt_bounce.h
DISABLE_PSE
USER_LDT
@ -41,11 +41,6 @@ NBUS opt_smp.h
NAPIC opt_smp.h
NINTR opt_smp.h
AHC_TAGENABLE opt_aic7xxx.h
AHC_SCBPAGING_ENABLE opt_aic7xxx.h
AHC_ALLOW_MEMIO opt_aic7xxx.h
AHC_SHARE_SCBS opt_aic7xxx.h
CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
CLK_USE_TSC_CALIBRATION opt_clock.h