diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC index f50ebe2a175c..413655e5726d 100644 --- a/sys/arch/acorn32/conf/GENERIC +++ b/sys/arch/acorn32/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.28 2003/09/30 00:35:31 thorpej Exp $ +# $NetBSD: GENERIC,v 1.29 2003/10/08 11:00:38 bouyer Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.28 $" +#ident "GENERIC-$Revision: 1.29 $" # estimated number of users maxusers 32 @@ -228,8 +228,10 @@ pioc0 at mainbus? base 0x00210000 # IDE disk controller wdc0 at pioc? offset 0x01f0 irq 9 #wdc* at pioc? offset 0x0170 irq -1 -wd* at wdc? channel ? drive ? -atapibus* at wdc? channel ? +atabus* at wdc? channel ? + +wd* at atabus? ? drive ? +atapibus* at atabus? cd* at atapibus? drive ? sd* at atapibus? drive ? @@ -291,24 +293,19 @@ uk* at scsibus? target ? lun ? # SCSI unknown device ss* at scsibus? target ? lun ? # SCSI scanner dtide* at podulebus? # D.T. Software IDE card -wd* at dtide? channel ? drive ? -atapibus* at dtide? channel ? +atabus* at dtide? channel hcide* at podulebus? # HCCS IDE card -wd* at hcide? channel ? drive ? -atapibus* at hcide? channel ? +atabus* at hcide? channel ? icside* at podulebus? # ICS IDE card -wd* at icside? channel ? drive ? -atapibus* at icside? channel ? +atabus* at icside? channel ? rapide* at podulebus? # Yellowstone RapIDE card -wd* at rapide? channel ? drive ? -atapibus* at rapide? channel ? +atabus* at rapide? channel ? simide* at podulebus? # Simtec IDE card -wd* at simide? channel ? drive ? -atapibus* at simide? channel ? +atabus* at simide? channel ? amps* at podulebus? # Atomwide Multi-Port Serial card com* at amps? diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL index e236498f9d4d..70afa415b392 100644 --- a/sys/arch/acorn32/conf/INSTALL +++ b/sys/arch/acorn32/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.15 2003/09/30 00:35:31 thorpej Exp $ +# $NetBSD: INSTALL,v 1.16 2003/10/08 11:00:38 bouyer Exp $ # # INSTALL -- NetBSD/acorn32 install configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "INSTALL-$Revision: 1.15 $" +#ident "INSTALL-$Revision: 1.16 $" # estimated number of users maxusers 32 @@ -227,8 +227,10 @@ pioc0 at mainbus? base 0x00210000 # IDE disk controller wdc0 at pioc? offset 0x01f0 irq 9 #wdc* at pioc? offset 0x0170 irq -1 -wd* at wdc? channel ? drive ? -atapibus* at wdc? channel ? +atabus* at wdc? channel ? + +wd* at atabus? drive ? +atapibus* at atabus? cd* at atapibus? drive ? sd* at atapibus? drive ? @@ -290,24 +292,19 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives #ss* at scsibus? target ? lun ? # SCSI scanner dtide* at podulebus? # D.T. Software IDE card -wd* at dtide? channel ? drive ? -atapibus* at dtide? channel ? +atabus* at dtide? channel ? hcide* at podulebus? # HCCS IDE card -wd* at hcide? channel ? drive ? -atapibus* at hcide? channel ? +atabus* at hcide? channel ? icside* at podulebus? # ICS IDE card -wd* at icside? channel ? drive ? -atapibus* at icside? channel ? +atabus* at icside? channel ? rapide* at podulebus? # Yellowstone RapIDE card -wd* at rapide? channel ? drive ? -atapibus* at rapide? channel ? +atabus* at rapide? channel ? simide* at podulebus? # Simtec IDE card -wd* at simide? channel ? drive ? -atapibus* at simide? channel ? +atabus* at simide? channel ? amps* at podulebus? # Atomwide Multi-Port Serial card com* at amps? diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS index 62ac6f7fc055..cf17b4387b08 100644 --- a/sys/arch/acorn32/conf/LOWMEM_WSCONS +++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS @@ -1,4 +1,4 @@ -# $NetBSD: LOWMEM_WSCONS,v 1.17 2003/09/30 00:35:31 thorpej Exp $ +# $NetBSD: LOWMEM_WSCONS,v 1.18 2003/10/08 11:00:38 bouyer Exp $ # # LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines # @@ -204,8 +204,9 @@ pioc0 at mainbus? base 0x00210000 # IDE disk controller wdc0 at pioc? offset 0x01f0 irq 9 #wdc* at pioc? offset 0x0170 irq -1 -wd* at wdc? channel ? drive ? -#atapibus* at wdc? channel ? +atabus* at wdc? channel ? +wd* at atabus? drive ? +#atapibus* at atabus? #cd* at atapibus? drive ? #sd* at atapibus? drive ? @@ -267,16 +268,13 @@ sysbeep0 at vidc? #ss* at scsibus? target ? lun ? # SCSI scanner #icside* at podulebus? # ICS IDE card -#wd* at icside? channel ? drive ? -#atapibus* at icside? channel ? +#atabus* at icside? channel ? #rapide* at podulebus? # Yellowstone RapIDE card -#wd* at rapide? channel ? drive ? -#atapibus* at rapide? channel ? +#atabus* at rapide? channel ? #simide* at podulebus? # Simtec IDE card -#wd* at simide? channel ? drive ? -#atapibus* at simide? channel ? +#atabus* at simide? channel ? #amps* at podulebus? # Atomwide Multi-Port Serial card #com* at amps? diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC index 470ee3aeae72..85f809f95448 100644 --- a/sys/arch/acorn32/conf/NC +++ b/sys/arch/acorn32/conf/NC @@ -1,4 +1,4 @@ -# $NetBSD: NC,v 1.17 2003/09/30 00:35:31 thorpej Exp $ +# $NetBSD: NC,v 1.18 2003/10/08 11:00:38 bouyer Exp $ # # NC - with vidcconsole # @@ -174,8 +174,9 @@ pioc0 at mainbus? base 0x00210000 # IDE disk controller #wdc0 at pioc? offset 0x01f0 irq 9 #wdc* at pioc? offset 0x0170 irq -1 -#wd* at wdc? channel ? drive ? -#atapibus* at wdc? channel ? +#atabus* at wdc? channel ? +#wd* at atabus? drive ? +#atapibus* at atabus? #cd* at atapibus? drive ? #sd* at atapibus? drive ? @@ -237,16 +238,13 @@ podulebus0 at root #ss* at scsibus? target ? lun ? # SCSI scanner #icside* at podulebus? # ICS IDE card -#wd* at icside? channel ? drive ? -#atapibus* at icside? channel ? +#atabus* at icside? channel ? #rapide* at podulebus? # Yellowstone RapIDE card -#wd* at rapide? channel ? drive ? -#atapibus* at rapide? channel ? +#atabus* at rapide? channel ? #simide* at podulebus? # Simtec IDE card -#wd* at simide? channel ? drive ? -#atapibus* at simide? channel ? +#atabus* at simide? channel ? #amps* at podulebus? # Atomwide Multi-Port Serial card #com* at amps? diff --git a/sys/arch/acorn32/conf/NC_WSCONS b/sys/arch/acorn32/conf/NC_WSCONS index be20fe013d92..4ec99c5cd6c0 100644 --- a/sys/arch/acorn32/conf/NC_WSCONS +++ b/sys/arch/acorn32/conf/NC_WSCONS @@ -1,4 +1,4 @@ -# $NetBSD: NC_WSCONS,v 1.20 2003/09/30 00:35:31 thorpej Exp $ +# $NetBSD: NC_WSCONS,v 1.21 2003/10/08 11:00:38 bouyer Exp $ # # NC - with wscons # @@ -201,8 +201,9 @@ pioc0 at mainbus? base 0x00210000 # IDE disk controller #wdc0 at pioc? offset 0x01f0 irq 9 #wdc* at pioc? offset 0x0170 irq -1 -#wd* at wdc? channel ? drive ? -#atapibus* at wdc? channel ? +#atabus* at wdc? channel ? +#wd* at atabus? drive ? +#atapibus* at atabus? #cd* at atapibus? drive ? #sd* at atapibus? drive ? @@ -265,15 +266,15 @@ podulebus0 at root #icside* at podulebus? # ICS IDE card #wd* at icside? channel ? drive ? -#atapibus* at icside? channel ? +#atabus* at icside? channel ? #rapide* at podulebus? # Yellowstone RapIDE card #wd* at rapide? channel ? drive ? -#atapibus* at rapide? channel ? +#atabus* at rapide? channel ? #simide* at podulebus? # Simtec IDE card #wd* at simide? channel ? drive ? -#atapibus* at simide? channel ? +#atabus* at simide? channel ? #amps* at podulebus? # Atomwide Multi-Port Serial card #com* at amps? diff --git a/sys/arch/acorn32/conf/RPC_WSCONS b/sys/arch/acorn32/conf/RPC_WSCONS index def91063d8e7..370588bd6003 100644 --- a/sys/arch/acorn32/conf/RPC_WSCONS +++ b/sys/arch/acorn32/conf/RPC_WSCONS @@ -1,4 +1,4 @@ -# $NetBSD: RPC_WSCONS,v 1.19 2003/09/30 00:35:31 thorpej Exp $ +# $NetBSD: RPC_WSCONS,v 1.20 2003/10/08 11:00:38 bouyer Exp $ # # RPC_WSCONS -- Full RiscPC config with wscons # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.19 $" +#ident "GENERIC-$Revision: 1.20 $" # estimated number of users maxusers 32 @@ -222,8 +222,9 @@ pioc0 at mainbus? base 0x00210000 # IDE disk controller wdc0 at pioc? offset 0x01f0 irq 9 #wdc* at pioc? offset 0x0170 irq -1 -wd* at wdc? channel ? drive ? -atapibus* at wdc? channel ? +atabus* at wdc? channel ? +wd* at atabus? drive ? +atapibus* at atabus? cd* at atapibus? drive ? sd* at atapibus? drive ? @@ -285,24 +286,19 @@ uk* at scsibus? target ? lun ? # SCSI unknown device ss* at scsibus? target ? lun ? # SCSI scanner dtide* at podulebus? # D.T. Software IDE card -wd* at dtide? channel ? drive ? -atapibus* at dtide? channel ? +atabus* at dtide? channel ? hcide* at podulebus? # HCCS IDE card -wd* at hcide? channel ? drive ? -atapibus* at hcide? channel ? +atabus* at hcide? channel ? icside* at podulebus? # ICS IDE card -wd* at icside? channel ? drive ? -atapibus* at icside? channel ? +atabus* at icside? channel ? rapide* at podulebus? # Yellowstone RapIDE card -wd* at rapide? channel ? drive ? -atapibus* at rapide? channel ? +atabus* at rapide? channel ? simide* at podulebus? # Simtec IDE card -wd* at simide? channel ? drive ? -atapibus* at simide? channel ? +atabus* at simide? channel ? amps* at podulebus? # Atomwide Multi-Port Serial card com* at amps? diff --git a/sys/arch/acorn32/conf/files.acorn32 b/sys/arch/acorn32/conf/files.acorn32 index 96c7a7d2bc4f..efc4d60370d2 100644 --- a/sys/arch/acorn32/conf/files.acorn32 +++ b/sys/arch/acorn32/conf/files.acorn32 @@ -1,4 +1,4 @@ -# $NetBSD: files.acorn32,v 1.17 2002/10/06 13:05:39 bjh21 Exp $ +# $NetBSD: files.acorn32,v 1.18 2003/10/08 11:00:38 bouyer Exp $ # # First try for arm-specific configuration info # @@ -130,19 +130,19 @@ attach csa at podulebus file arch/acorn32/podulebus/csa.c csa # ICS IDE driver -device icside {[channel = -1]}: wdc_base, ata, atapi +device icside {[channel = -1]}: wdc_base attach icside at podulebus file arch/acorn32/podulebus/icside.c icside file arch/acorn32/podulebus/icside_io_asm.S icside # Yellowstone RapIDE driver -device rapide {[channel = -1]}: wdc_base, ata, atapi +device rapide {[channel = -1]}: wdc_base attach rapide at podulebus file arch/acorn32/podulebus/rapide.c rapide file arch/acorn32/podulebus/rapide_io_asm.S rapide # Simtec IDE driver -device simide {[channel = -1]}: wdc_base, ata, atapi +device simide {[channel = -1]}: wdc_base attach simide at podulebus file arch/acorn32/podulebus/simide.c simide file arch/acorn32/podulebus/simide_io_asm.S simide