diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32 index 212c6b81902f..83725660ad7e 100644 --- a/sys/arch/sparc64/conf/GENERIC32 +++ b/sys/arch/sparc64/conf/GENERIC32 @@ -1,10 +1,10 @@ -# $NetBSD: GENERIC32,v 1.51 2002/10/14 18:39:40 elric Exp $ +# $NetBSD: GENERIC32,v 1.52 2002/10/18 01:54:15 grant Exp $ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.51 $" +#ident "GENERIC-$Revision: 1.52 $" maxusers 64 @@ -304,15 +304,30 @@ ss* at scsibus? target ? lun ? # SCSI scanners ses* at scsibus? target ? lun ? # SCSI SES/SAF-TE devices uk* at scsibus? target ? lun ? # unknown SCSI -# PCI IDE. -pciide* at pci ? dev ? function ? flags 0x0000 +# IDE and related devices +# PCI IDE controllers - see pciide(4) for supported hardware. +# 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 atapibus* at pciide? channel ? +# IDE drives +# Flags are used only with controllers that support DMA operations +# and mode settings (e.g. some pciide controllers) +# The lowest order four bits (rightmost digit) of the flags define the PIO +# mode to use, the next set of four bits the DMA mode and the third set the +# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode +# to use, and the last bit must be 1 for this setting to be used. +# For DMA and UDMA, 0xf (1111) means 'disable'. +# 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". + ## Disable UDMA 4 which causes data corruption on the Acer Labs ## chipset on Sun Blade 100 and Netra X1 machines. wd* at pciide? channel ? drive ? flags 0x0a00 # Disable UDMA 4 - cd* at atapibus? drive ? flags 0x0000 # ATAPI CD-ROM drives sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown