From 28c8b4f8720a5ca8844b2c9011ffa26be503b899 Mon Sep 17 00:00:00 2001 From: bouyer Date: Wed, 8 Oct 2003 11:13:02 +0000 Subject: [PATCH] Add atabus. --- sys/arch/mmeye/conf/GENERIC | 7 ++++--- sys/arch/mmeye/conf/MMEYE | 5 +++-- sys/arch/mmeye/conf/MMTA | 9 ++++++--- sys/arch/mmeye/conf/MMTAICE | 9 ++++++--- sys/arch/mmeye/conf/MMTAROMNEW | 9 ++++++--- sys/arch/netwinder/conf/GENERIC | 9 ++++++--- 6 files changed, 31 insertions(+), 17 deletions(-) diff --git a/sys/arch/mmeye/conf/GENERIC b/sys/arch/mmeye/conf/GENERIC index 7f68efd1a7de..84130a118490 100644 --- a/sys/arch/mmeye/conf/GENERIC +++ b/sys/arch/mmeye/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.50 2003/04/26 14:10:09 ragge Exp $ +# $NetBSD: GENERIC,v 1.51 2003/10/08 11:13:02 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.50 $" +#ident "GENERIC-$Revision: 1.51 $" maxusers 16 # estimated number of users @@ -157,7 +157,8 @@ pcmcia* at mmeyepcmcia? controller ? socket ? com* at pcmcia? function ? # Modems and serial cards wdc* at pcmcia? function ? -wd* at wdc? drive ? # the drives themselves +atabus* at wdc? channel ? +wd* at atabus? drive ? # the drives themselves ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet mbe* at pcmcia? function ? # MB8696x based Ethernet diff --git a/sys/arch/mmeye/conf/MMEYE b/sys/arch/mmeye/conf/MMEYE index 758dc76bb8f6..981ffb65493a 100644 --- a/sys/arch/mmeye/conf/MMEYE +++ b/sys/arch/mmeye/conf/MMEYE @@ -1,4 +1,4 @@ -# $NetBSD: MMEYE,v 1.20 2003/04/10 22:07:00 christos Exp $ +# $NetBSD: MMEYE,v 1.21 2003/10/08 11:13:02 bouyer Exp $ # # GENERIC -- everything that's currently supported # @@ -84,7 +84,8 @@ pcmcia* at mmeyepcmcia? controller ? socket ? com* at pcmcia? function ? # Modems and serial cards wdc* at pcmcia? function ? -wd* at wdc? drive ? # the drives themselves +atabus* at wdc? channel ? +wd* at atabus? drive ? ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet mbe* at pcmcia? function ? # MB8696x based Ethernet diff --git a/sys/arch/mmeye/conf/MMTA b/sys/arch/mmeye/conf/MMTA index e975ac43744f..a65446169df3 100644 --- a/sys/arch/mmeye/conf/MMTA +++ b/sys/arch/mmeye/conf/MMTA @@ -1,4 +1,4 @@ -# $NetBSD: MMTA,v 1.20 2003/04/10 22:07:00 christos Exp $ +# $NetBSD: MMTA,v 1.21 2003/10/08 11:13:02 bouyer Exp $ # # GENERIC -- everything that's currently supported # @@ -156,11 +156,14 @@ com* at pcmcia? function ? # Modems and serial cards wdc* at pcmcia? function ? +# ATA bus support +atabus* at wdc? channel ? + # IDE drives -wd* at wdc? drive ? # the drives themselves +wd* at atabus? drive ? # ATAPI bus support -#atapibus* at wdc? +#atapibus* at atabus? # ATAPI devices #cd* at atapibus? drive ? # ATAPI CD-ROM drives diff --git a/sys/arch/mmeye/conf/MMTAICE b/sys/arch/mmeye/conf/MMTAICE index 159638c42b36..05a922e3e329 100644 --- a/sys/arch/mmeye/conf/MMTAICE +++ b/sys/arch/mmeye/conf/MMTAICE @@ -1,4 +1,4 @@ -# $NetBSD: MMTAICE,v 1.21 2003/04/10 22:07:00 christos Exp $ +# $NetBSD: MMTAICE,v 1.22 2003/10/08 11:13:02 bouyer Exp $ # # GENERIC -- everything that's currently supported # @@ -182,11 +182,14 @@ com* at pcmcia? function ? # Modems and serial cards wdc* at pcmcia? function ? +# ATA bus support +atabus* at wdc? channel ? + # IDE drives -wd* at wdc? drive ? # the drives themselves +wd* at atabus? drive ? # ATAPI bus support -#atapibus* at wdc? +#atapibus* at atabus? # ATAPI devices #cd* at atapibus? drive ? # ATAPI CD-ROM drives diff --git a/sys/arch/mmeye/conf/MMTAROMNEW b/sys/arch/mmeye/conf/MMTAROMNEW index 34a777717319..ead2a5d50615 100644 --- a/sys/arch/mmeye/conf/MMTAROMNEW +++ b/sys/arch/mmeye/conf/MMTAROMNEW @@ -1,4 +1,4 @@ -# $NetBSD: MMTAROMNEW,v 1.21 2003/04/10 22:07:00 christos Exp $ +# $NetBSD: MMTAROMNEW,v 1.22 2003/10/08 11:13:02 bouyer Exp $ # # GENERIC -- everything that's currently supported # @@ -160,11 +160,14 @@ pcmcia* at mmeyepcmcia? controller ? socket ? wdc* at pcmcia? function ? +# ATA bus support +atabus* at wdc? channel ? + # IDE drives -wd* at wdc? drive ? # the drives themselves +wd* at atabus? drive ? # ATAPI bus support -#atapibus* at wdc? +#atapibus* at atabus? # ATAPI devices #cd* at atapibus? drive ? # ATAPI CD-ROM drives diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC index 96d3eb8f0b41..4dcbfc3dfda2 100644 --- a/sys/arch/netwinder/conf/GENERIC +++ b/sys/arch/netwinder/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.37 2003/09/13 13:30:07 chris Exp $ +# $NetBSD: GENERIC,v 1.38 2003/10/08 11:13:33 bouyer Exp $ # # GENERIC machine description file # @@ -190,7 +190,10 @@ isa* at pcib? # The 0x0001 flag force the driver to use DMA, even if the driver doesn't know # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. -pciide* at pci? dev ? function ? flags 0x0000 +pciide* at pci? dev ? function ? flags 0x0000 + +# ATA bus support +atabus* at pciide? channel ? # IDE drives # Flags are used only with controllers that support DMA operations @@ -203,7 +206,7 @@ pciide* at pci? dev ? function ? flags 0x0000 # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=1111) # 0x0000 means "use whatever the drive claims to support". -wd* at pciide? channel ? drive ? flags 0x0000 # the drives themselves +wd* at atabus? drive ? flags 0x0000 # the drives themselves # PCI network interfaces ne* at pci? dev ? function ? # NE2000 compat ethernet