Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm32/conf Add description of the pciide & wd flags...



details:   https://anonhg.NetBSD.org/src/rev/509c070237c1
branches:  trunk
changeset: 480378:509c070237c1
user:      mark <mark%NetBSD.org@localhost>
date:      Mon Jan 10 07:22:35 2000 +0000

description:
Add description of the pciide & wd flags (from i386 GENERIC config).
Restore the isp driver now that we can down load firmware again.

diffstat:

 sys/arch/arm32/conf/CATS     |  31 +++++++++++++++++++++++--------
 sys/arch/arm32/conf/CATSINST |  14 +++++++-------
 sys/arch/arm32/conf/EBSA285  |  29 ++++++++++++++++++++++-------
 3 files changed, 52 insertions(+), 22 deletions(-)

diffs (165 lines):

diff -r 1ce1c8a1a4bf -r 509c070237c1 sys/arch/arm32/conf/CATS
--- a/sys/arch/arm32/conf/CATS  Mon Jan 10 06:12:20 2000 +0000
+++ b/sys/arch/arm32/conf/CATS  Mon Jan 10 07:22:35 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CATS,v 1.20 1999/12/12 11:51:29 soren Exp $
+#      $NetBSD: CATS,v 1.21 2000/01/10 07:22:35 mark Exp $
 #
 #      CATS -- CHALTECH CATS Development kernel
 #
@@ -210,8 +210,8 @@
 scsibus* at ahc?
 #bha*  at pci? dev ? function ?        # BusLogic 9xx SCSI
 #scsibus* at bha?
-#isp*  at pci? dev ? function ?        # Qlogic ISP 10x0 SCSI controllers
-#scsibus* at isp?
+isp*   at pci? dev ? function ?        # Qlogic ISP 10x0 SCSI controllers
+scsibus* at isp?
 #ncr*  at pci? dev ? function ?        # NCR 53c8xx SCSI
 #scsibus* at ncr?
 #pcscp*        at pci? dev ? function ?        # AMD 53c974 PCscsi-PCI SCSI
@@ -226,17 +226,32 @@
 #ss*   at scsibus? target ? lun ?      # SCSI scanner
 
 # PCI IDE Controllers and Devices
-pciide* at pci? dev ? function ?
+# 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
 
 # IDE drives
-wd*    at pciide? channel ? drive ?    # the drives themselves
+# 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".
+wd*    at pciide? channel ? drive ? flags 0x0000       # the drives themselves
 
 # ATAPI bus support
 atapibus* at pciide? channel ?
 
 # ATAPI devices
-cd*    at atapibus? drive ?            # ATAPI CD-ROM drives
-sd*    at atapibus? drive ?            # ATAPI disk drives
+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
 
 # PCI network interfaces
 de*    at pci? dev ? function ?        # DC21X4X-based ethernet cards
@@ -246,7 +261,7 @@
 #epic* at pci? dev ? function ?        # SMC EPIC/100 Ethernet
 #esh*  at pci? dev ? function ?        # Essential HIPPI card
 #fpa*  at pci? dev ? function ?        # DEC DEFPA FDDI
-#fxp*  at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
+# fxp* at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
 #le*   at pci? dev ? function ?        # PCnet-PCI Ethernet
 ne*    at pci? dev ? function ?        # NE2000 compat ethernet
 #tl*   at pci? dev ? function ?        # ThunderLAN-based Ethernet
diff -r 1ce1c8a1a4bf -r 509c070237c1 sys/arch/arm32/conf/CATSINST
--- a/sys/arch/arm32/conf/CATSINST      Mon Jan 10 06:12:20 2000 +0000
+++ b/sys/arch/arm32/conf/CATSINST      Mon Jan 10 07:22:35 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CATSINST,v 1.5 1999/12/12 11:51:29 soren Exp $
+#      $NetBSD: CATSINST,v 1.6 2000/01/10 07:22:35 mark Exp $
 #
 #      CATSINST -- CHALTECH CATS Install kernel
 #
@@ -188,8 +188,8 @@
 scsibus* at ahc?
 #bha*  at pci? dev ? function ?        # BusLogic 9xx SCSI
 #scsibus* at bha?
-#isp*  at pci? dev ? function ?        # Qlogic ISP 10x0 SCSI controllers
-#scsibus* at isp?
+isp*   at pci? dev ? function ?        # Qlogic ISP 10x0 SCSI controllers
+scsibus* at isp?
 #ncr*  at pci? dev ? function ?        # NCR 53c8xx SCSI
 #scsibus* at ncr?
 
@@ -202,17 +202,17 @@
 #ss*   at scsibus? target ? lun ?      # SCSI scanner
 
 # PCI IDE Controllers and Devices
-pciide* at pci? dev ? function ?
+pciide* at pci? dev ? function ? flags 0x0000
 
 # IDE drives
-wd*    at pciide? channel ? drive ?    # the drives themselves
+wd*    at pciide? channel ? drive ? flags 0x0000       # the drives themselves
 
 # ATAPI bus support
 atapibus* at pciide? channel ?
 
 # ATAPI devices
-cd*    at atapibus? drive ?            # ATAPI CD-ROM drives
-sd*    at atapibus? drive ?            # ATAPI disk drives
+cd*    at atapibus? drive ? flags 0x0000       # ATAPI CD-ROM drives
+sd*    at atapibus? drive ? flags 0x0000       # ATAPI disk drives
 
 # PCI network interfaces
 de*    at pci? dev ? function ?        # DC21X4X-based ethernet cards
diff -r 1ce1c8a1a4bf -r 509c070237c1 sys/arch/arm32/conf/EBSA285
--- a/sys/arch/arm32/conf/EBSA285       Mon Jan 10 06:12:20 2000 +0000
+++ b/sys/arch/arm32/conf/EBSA285       Mon Jan 10 07:22:35 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: EBSA285,v 1.9 1999/12/12 11:51:29 soren Exp $
+#      $NetBSD: EBSA285,v 1.10 2000/01/10 07:22:35 mark Exp $
 #
 #      EBSA285 -- EBSA285 Architecture Kernel
 #
@@ -175,8 +175,8 @@
 scsibus* at ahc?
 #bha*  at pci? dev ? function ?        # BusLogic 9xx SCSI
 #scsibus* at bha?
-#isp*  at pci? dev ? function ?        # Qlogic ISP 10x0 SCSI controllers
-#scsibus* at isp?
+isp*   at pci? dev ? function ?        # Qlogic ISP 10x0 SCSI controllers
+scsibus* at isp?
 #ncr*  at pci? dev ? function ?        # NCR 53c8xx SCSI
 #scsibus* at ncr?
 
@@ -189,17 +189,32 @@
 #ss*   at scsibus? target ? lun ?      # SCSI scanner
 
 # PCI IDE Controllers and Devices
-pciide* at pci? dev ? function ?
+# 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
 
 # IDE drives
-wd*    at pciide? channel ? drive ?    # the drives themselves
+# 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".
+wd*    at pciide? channel ? drive ? flags 0x0000       # the drives themselves
 
 # ATAPI bus support
 atapibus* at pciide? channel ?
 
 # ATAPI devices
-cd*    at atapibus? drive ?            # ATAPI CD-ROM drives
-sd*    at atapibus? drive ?            # ATAPI disk drives
+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
 
 # PCI network interfaces
 de*    at pci? dev ? function ?        # DC21X4X-based ethernet cards



Home | Main Index | Thread Index | Old Index