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

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

details:   https://anonhg.NetBSD.org/src/rev/22d6a58f678c
branches:  netbsd-1-5
changeset: 490646:22d6a58f678c
user:      he <he%NetBSD.org@localhost>
date:      Sun Feb 04 18:54:48 2001 +0000

description:
Pull up revision 1.6 (requested by bouyer):
  Fix bug which affects pciide controllers in native mode.  Main
  effect was a non-functionnal IDE controller on some sparc64 and
  macppc when booted from IDE disk.

diffstat:

 sys/dev/pci/pciidevar.h |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r 28e929c31945 -r 22d6a58f678c sys/dev/pci/pciidevar.h
--- a/sys/dev/pci/pciidevar.h   Sun Feb 04 18:52:41 2001 +0000
+++ b/sys/dev/pci/pciidevar.h   Sun Feb 04 18:54:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciidevar.h,v 1.5 2000/06/06 17:34:23 thorpej Exp $    */
+/*     $NetBSD: pciidevar.h,v 1.5.2.1 2001/02/04 18:54:48 he Exp $     */
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -64,9 +64,10 @@
        struct pciide_channel {                 /* per-channel data */
                struct channel_softc wdc_channel; /* generic part */
                char            *name;
-               int             hw_ok;          /* hardware mapped & OK? */
-               int             compat;         /* is it compat? */
-               void            *ih;            /* compat or pci handle */
+               int             hw_ok;  /* hardware mapped & OK? */
+               int             compat; /* is it compat? */
+               void            *ih;    /* compat or pci handle */
+               bus_space_handle_t ctl_baseioh; /* ctrl regs blk, native mode */
                /* DMA tables and DMA map for xfer, for each drive */
                struct pciide_dma_maps {
                        bus_dmamap_t    dmamap_table;