Shuffle wd/wdc driver files around (via repository copies). wdc
now lives in dev/ic, wd now lives in dev/ata. there's now a 'ata' interface attribute defined in conf/files, but wdc can't go there yet because some ports still use private versions based on the old ISA version.
This commit is contained in:
parent
561056f2e2
commit
ad141a69a7
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.i386,v 1.96 1998/01/12 18:59:04 thorpej Exp $
|
||||
# $NetBSD: files.i386,v 1.97 1998/01/14 23:36:30 cgd Exp $
|
||||
#
|
||||
# new style config file for i386 architecture
|
||||
#
|
||||
|
@ -41,6 +41,13 @@ major {sd = 4}
|
|||
major {st = 5}
|
||||
major {cd = 6}
|
||||
|
||||
#
|
||||
# Machine-independent ATA drivers
|
||||
#
|
||||
|
||||
include "../../../dev/ata/files.ata"
|
||||
major {wd = 0}
|
||||
|
||||
# Memory Disk for install floppy
|
||||
file arch/i386/i386/md_root.c memory_disk_hooks
|
||||
major {md = 17}
|
||||
|
@ -87,7 +94,6 @@ file arch/i386/pci/pcib.c pcib
|
|||
include "../../../dev/isa/files.isa"
|
||||
major {mcd = 7}
|
||||
#major {scd = 15}
|
||||
major {wd = 0}
|
||||
major {wt = 3}
|
||||
|
||||
file arch/i386/isa/isa_machdep.c isa
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files,v 1.163 1998/01/12 21:27:09 scottr Exp $
|
||||
# $NetBSD: files,v 1.164 1998/01/14 23:36:31 cgd Exp $
|
||||
|
||||
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
|
||||
|
||||
|
@ -27,6 +27,7 @@ define ifnet
|
|||
define tty
|
||||
define audio { }
|
||||
define scsi {[channel = -1]}
|
||||
define ata {[drive = -1]}
|
||||
define atapi { }
|
||||
define miibus { }
|
||||
|
||||
|
@ -164,6 +165,14 @@ file dev/ic/com.c com needs-flag
|
|||
define i2c
|
||||
define i2c_eeprom
|
||||
|
||||
# XXX THE FOLLOWING BLOCK SHOULD BE UNCOMMENTED, BUT CANNOT
|
||||
# XXX BECAUSE NOT ALL PORTS USE THE MI wdc DRIVER YET.
|
||||
#
|
||||
# # ESDI/IDE/etc. controllers
|
||||
# device wdc class dull: ata, atapi
|
||||
# file dev/ic/wdc.c
|
||||
# wdc & (wd | !wd) needs-flag # XXX
|
||||
|
||||
# Attributes which machine-independent bus support can be attached to.
|
||||
# These should be defined here, because some of these busses can have
|
||||
# devices which provide these attributes, and we'd like to avoid hairy
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
# $NetBSD: files.ata,v 1.1 1998/01/14 23:36:32 cgd Exp $
|
||||
#
|
||||
# Config file and device description for machine-independent devices
|
||||
# which attach to ATA busses. Included by ports that need it. Ports
|
||||
# that use it must provide their own "major" declarations for the
|
||||
# appropriate devices.
|
||||
|
||||
# ATA disks
|
||||
device wd class disk: disk
|
||||
attach wd at ata
|
||||
file dev/ata/wd.c wd needs-flag
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.isa,v 1.48 1998/01/12 09:29:37 thorpej Exp $
|
||||
# $NetBSD: files.isa,v 1.49 1998/01/14 23:36:33 cgd Exp $
|
||||
#
|
||||
# Config file and device description for machine-independent ISA code.
|
||||
# Included by ports that need it. Requires that the SCSI files be
|
||||
|
@ -116,14 +116,16 @@ device scd class disk: disk
|
|||
attach scd at isa
|
||||
file dev/isa/scd.c scd needs-flag
|
||||
|
||||
# ISA "wd" (ESDI/IDE/etc.) controllers
|
||||
define ata {drive=-1}
|
||||
device wdc class dull: atapi, isadma, ata
|
||||
attach wdc at isa
|
||||
device wd class disk: disk
|
||||
attach wd at ata
|
||||
file dev/isa/wdc.c wdc needs-flag
|
||||
file dev/isa/wd.c wd needs-flag
|
||||
# XXX THE FOLLOWING TWO BLOCKS SHOULD GO INTO conf/files, BUT CANNOT
|
||||
# XXX BECAUSE NOT ALL PORTS USE THE MI DRIVER YET.
|
||||
|
||||
# ESDI/IDE/etc. controllers
|
||||
device wdc class dull: ata, atapi
|
||||
file dev/ic/wdc.c
|
||||
wdc & (wd | !wd) needs-flag # XXX
|
||||
|
||||
attach wdc at isa with wdc_isa: isadma
|
||||
file dev/isa/wdc_isa.c wdc_isa
|
||||
|
||||
# Wangtek- and Archive-compatible tape controller boards
|
||||
device wt class tape: tape, isadma
|
||||
|
|
Loading…
Reference in New Issue