Module Name: src
Committed By: riz
Date: Tue Apr 3 15:52:27 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: pcidevs viaide.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1102.2.2 -r1.1102.2.3 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/dev/pci/viaide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1102.2.2 src/sys/dev/pci/pcidevs:1.1102.2.3
--- src/sys/dev/pci/pcidevs:1.1102.2.2 Tue Apr 3 15:38:30 2012
+++ src/sys/dev/pci/pcidevs Tue Apr 3 15:52:26 2012
@@ -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 VT8501AGP 0x8501 VT8501
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
Index: src/sys/dev/pci/viaide.c
diff -u src/sys/dev/pci/viaide.c:1.77 src/sys/dev/pci/viaide.c:1.77.2.1
--- src/sys/dev/pci/viaide.c:1.77 Wed Dec 28 20:28:04 2011
+++ src/sys/dev/pci/viaide.c Tue Apr 3 15:52:26 2012
@@ -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 @@ static const struct pciide_product_desc
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 @@ via_chip_map(struct pciide_softc *sc, co
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.
