[src/netbsd-1-4]: src/sys/arch/alpha/pci Apply patch (requested by thorpej):

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

details:   https://anonhg.NetBSD.org/src/rev/23f1014a8a42
branches:  netbsd-1-4
changeset: 470302:23f1014a8a42
user:      he <he%NetBSD.org@localhost>
date:      Mon Feb 07 19:35:10 2000 +0000

description:
Apply patch (requested by thorpej):
  Fix a small oversight in the Miata DMA fix pullups.

diffstat:

 sys/arch/alpha/pci/cia.c    |  6 ++++--
 sys/arch/alpha/pci/ciavar.h |  7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r fbb6c516395a -r 23f1014a8a42 sys/arch/alpha/pci/cia.c
--- a/sys/arch/alpha/pci/cia.c  Mon Feb 07 15:16:39 2000 +0000
+++ b/sys/arch/alpha/pci/cia.c  Mon Feb 07 19:35:10 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.47.2.2 2000/02/06 17:29:37 he Exp $ */
+/* $NetBSD: cia.c,v 1.47.2.3 2000/02/07 19:35:10 he Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.47.2.2 2000/02/06 17:29:37 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.47.2.3 2000/02/07 19:35:10 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -326,6 +326,8 @@
                printf("%s: WARNING: Pyxis pass 1 DMA bug; no bets...\n",
                    self->dv_xname);
 
+               ccp->cc_flags |= CCF_PYXISBUG;
+
                alpha_mb();
                ctrl = REGVAL(CIA_CSR_CTRL);
                ctrl &= ~(CTRL_RD_TYPE|CTRL_RL_TYPE|CTRL_RM_TYPE);
diff -r fbb6c516395a -r 23f1014a8a42 sys/arch/alpha/pci/ciavar.h
--- a/sys/arch/alpha/pci/ciavar.h       Mon Feb 07 15:16:39 2000 +0000
+++ b/sys/arch/alpha/pci/ciavar.h       Mon Feb 07 19:35:10 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ciavar.h,v 1.15 1998/07/29 01:28:44 thorpej Exp $ */
+/* $NetBSD: ciavar.h,v 1.15.8.1 2000/02/07 19:35:28 he Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -57,8 +57,9 @@
        int     cc_flags;
 
 #define        CCF_ISPYXIS     0x01            /* chip is a 21174 Pyxis */
-#define        CCF_PCI_USE_BWX 0x02            /* use BWX for PCI config space */
-#define        CCF_BUS_USE_BWX 0x04            /* use BWX for bus space */
+#define        CCF_PYXISBUG    0x02
+#define        CCF_PCI_USE_BWX 0x04            /* use BWX for PCI config space */
+#define        CCF_BUS_USE_BWX 0x08            /* use BWX for bus space */
 
        struct extent *cc_io_ex, *cc_d_mem_ex, *cc_s_mem_ex;
        int     cc_mallocsafe;