[src/netbsd-1-4]: src/sys/arch/alpha/pci Pull up 1.2 -> 1.4.

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

details:   https://anonhg.NetBSD.org/src/rev/a6e69d196057
branches:  netbsd-1-4
changeset: 468321:a6e69d196057
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Apr 16 23:41:30 1999 +0000

description:
Pull up 1.2 -> 1.4.

diffstat:

 sys/arch/alpha/pci/mcpciavar.h |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (50 lines):

diff -r e337ee4a58b3 -r a6e69d196057 sys/arch/alpha/pci/mcpciavar.h
--- a/sys/arch/alpha/pci/mcpciavar.h    Fri Apr 16 23:40:42 1999 +0000
+++ b/sys/arch/alpha/pci/mcpciavar.h    Fri Apr 16 23:41:30 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpciavar.h,v 1.2 1999/02/17 03:17:17 mjacob Exp $ */
+/* $NetBSD: mcpciavar.h,v 1.2.2.1 1999/04/16 23:41:30 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -41,7 +41,10 @@
  * MPCIA configuration.
  */
 struct mcpcia_config {
+       int                             cc_gid; /* GID of this MCbus */
+       int                             cc_mid; /* MCbus Module ID */
        int                             cc_initted;
+       int                             cc_mallocsafe;
        struct alpha_bus_space          cc_iot;
        struct alpha_bus_space          cc_memt;
        struct extent *                 cc_io_ex;
@@ -54,22 +57,20 @@
        long                            cc_smem_exstorage[_FSTORE];
        unsigned long                   cc_sysbase;     /* shorthand */
        struct alpha_bus_dma_tag        cc_dmat_direct;
-       struct alpha_bus_dma_tag        cc_dmat_sgmap;
-       struct alpha_sgmap              cc_sgmap;
+       struct alpha_bus_dma_tag        cc_dmat_pci_sgmap;
+       struct alpha_bus_dma_tag        cc_dmat_isa_sgmap;
+       struct alpha_sgmap              cc_pci_sgmap;
+       struct alpha_sgmap              cc_isa_sgmap;
 };
 
 struct mcpcia_softc {
        struct device           mcpcia_dev;
-       struct mcpcia_softc *   mcpcia_next;    /* next in a list */
-       struct mcpcia_config    mcpcia_cc;      /* config info */
-       u_int8_t                mcpcia_gid;     /* GID of this MCbus */
-       u_int8_t                mcpcia_mid;     /* MCbus Module ID */
+       struct mcpcia_config    *mcpcia_cc;     /* config info */
 };
-void mcpcia_config_cleanup __P((void));
 
-extern struct mcpcia_config *mcpcia_eisaccp;
+void   mcpcia_init __P((void));
+void   mcpcia_config_cleanup __P((void));
 
-void   mcpcia_init __P((struct mcpcia_softc *));
 void   mcpcia_pci_init __P((pci_chipset_tag_t, void *));
 void   mcpcia_dma_init __P((struct mcpcia_config *));