[src/netbsd-1-5]: src/sys/dev/pci Pull up revision 1.5 (requested by bouyer):

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

details:   https://anonhg.NetBSD.org/src/rev/64f876300bcb
branches:  netbsd-1-5
changeset: 490644:64f876300bcb
user:      he <he%NetBSD.org@localhost>
date:      Sun Feb 04 18:52:23 2001 +0000

description:
Pull up revision 1.5 (requested by bouyer):
  Add support for Ultra/100 on Intel ICH2.

diffstat:

 sys/dev/pci/pciide_piix_reg.h |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 3134bc9bba23 -r 64f876300bcb sys/dev/pci/pciide_piix_reg.h
--- a/sys/dev/pci/pciide_piix_reg.h     Sun Feb 04 18:46:47 2001 +0000
+++ b/sys/dev/pci/pciide_piix_reg.h     Sun Feb 04 18:52:23 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_piix_reg.h,v 1.4 2000/05/15 08:46:01 bouyer Exp $       */
+/*     $NetBSD: pciide_piix_reg.h,v 1.4.4.1 2001/02/04 18:52:23 he Exp $       */
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -99,13 +99,15 @@
        (((x) << ((channel * 8) + (drive * 4))) << PIIX_UDMATIM_SHIFT)
 
 /*
- * IDE config register (ICH/ICH0 only)
+ * IDE config register (ICH/ICH0/ICH2 only)
  */
 #define PIIX_CONFIG    0x54
 #define PIIX_CONFIG_PINGPONG   0x0400
-/* The following are only for the 82801AA (ICH) */
+/* The following are only for the 82801AA (ICH) and 82801BA (ICH2) */
 #define PIIX_CONFIG_CR(channel, drive) (0x0010 << ((channel) * 2 + (drive)))
 #define PIIX_CONFIG_UDMA66(channel, drive) (0x0001 << ((channel) * 2 + (drive)))
+/* The following are only for the 82801BA (ICH2) */
+#define PIIX_CONFIG_UDMA100(channel, drive) (0x1000 << ((channel) * 2 + (drive)))
 
 /*
  * these tables define the differents values to upload to the
@@ -116,4 +118,4 @@
 static int8_t piix_rtc_pio[] = {0x00, 0x00, 0x00, 0x01, 0x03};
 static int8_t piix_isp_dma[] = {0x00, 0x02, 0x02};
 static int8_t piix_rtc_dma[] = {0x00, 0x02, 0x03};
-static int8_t piix4_sct_udma[] = {0x00, 0x01, 0x02, 0x01, 0x02};
+static int8_t piix4_sct_udma[] = {0x00, 0x01, 0x02, 0x01, 0x02, 0x01};