[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by t...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86320786c5b5
branches:  netbsd-6
changeset: 773971:86320786c5b5
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Apr 03 15:52:26 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #151):
        sys/dev/pci/viaide.c: revision 1.78
        sys/dev/pci/pcidevs: revision 1.1106
Add VIA VX900 media system processor IDE controller.
PR/46166 from Hiroshi Tokuda.
Regen from pcidevs rev 1.1106:
Add VIA VX900 media system processor IDE controller.
PR/46166 from Hiroshi Tokuda.
Add UDMA support for VIA VX900 media system processor IDE controller.
PR/46166 from Hiroshi Tokuda.
This should be pulled up to netbsd-6, since ZOTAC ZBOX nano VD01
http://www.zotacusa.com/zbox-nano-vd01.html
exhibited at NetBSD booth in Open Source Conference 2012 Tokyo Spring
was favored by many people.

diffstat:

 sys/dev/pci/pcidevs  |   3 ++-
 sys/dev/pci/viaide.c |  14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 940225952f00 -r 86320786c5b5 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Tue Apr 03 15:40:36 2012 +0000
+++ b/sys/dev/pci/pcidevs       Tue Apr 03 15:52:26 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1102.2.2 2012/04/03 15:38:30 riz Exp $
+$NetBSD: pcidevs,v 1.1102.2.3 2012/04/03 15:52:26 riz Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -4682,6 +4682,7 @@
 product VIATECH VT82C597AGP    0x8597  VT82C597 (Apollo VP3) CPU-AGP Bridge
 product VIATECH VT82C598AGP    0x8598  VT82C598 (Apollo MVP3) CPU-AGP Bridge
 product VIATECH VT8605AGP      0x8605  VT8605 (Apollo ProMedia 133) Host-AGP Bridge
+product VIATECH VX900_IDE      0x9001  VX900 IDE Controller
 product VIATECH K8T890_PPB_A238        0xa238  K8T890 PCI-PCI Bridge
 product VIATECH VT8633AGP      0xb091  VT8633 (Apollo Pro 266) CPU-AGP Bridge
 product VIATECH VT8366AGP      0xb099  VT8366 (Apollo KT266) CPU-AGP Bridge
diff -r 940225952f00 -r 86320786c5b5 sys/dev/pci/viaide.c
--- a/sys/dev/pci/viaide.c      Tue Apr 03 15:40:36 2012 +0000
+++ b/sys/dev/pci/viaide.c      Tue Apr 03 15:52:26 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: viaide.c,v 1.77 2011/12/28 20:28:04 phx Exp $  */
+/*     $NetBSD: viaide.c,v 1.77.2.1 2012/04/03 15:52:26 riz Exp $      */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.77 2011/12/28 20:28:04 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.77.2.1 2012/04/03 15:52:26 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -310,6 +310,11 @@
          NULL,
          via_chip_map,
        },
+       { PCI_PRODUCT_VIATECH_VX900_IDE,
+         0,
+         NULL,
+         via_chip_map,
+       },
        { PCI_PRODUCT_VIATECH_VT6410_RAID,
          0,
          NULL,
@@ -464,6 +469,11 @@
                        interface = PCIIDE_INTERFACE_BUS_MASTER_DMA |
                            PCIIDE_INTERFACE_PCI(0) | PCIIDE_INTERFACE_PCI(1);
                        break;
+               case PCI_PRODUCT_VIATECH_VX900_IDE:
+                       aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
+                           "VIA Technologies VX900 ATA133 controller\n");
+                       sc->sc_wdcdev.sc_atac.atac_udma_cap = 6;
+                       break;
                default:
                        /*
                         * get a PCI tag for the ISA bridge.