[src/netbsd-1-5]: src/sys/arch/pmax/pmax Pull up revisions 1.14, 1.15:

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

details:   https://anonhg.NetBSD.org/src/rev/25bca1457135
branches:  netbsd-1-5
changeset: 488725:25bca1457135
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Jul 26 11:45:20 2000 +0000

description:
Pull up revisions 1.14, 1.15:
  CopyToBuffer/CopyFromBuffer are used by sii/xsii and nothing else;
  following from this, remove uneeded include.

diffstat:

 sys/arch/pmax/pmax/locore_machdep.S |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r 8e97dff7d009 -r 25bca1457135 sys/arch/pmax/pmax/locore_machdep.S
--- a/sys/arch/pmax/pmax/locore_machdep.S       Wed Jul 26 09:33:39 2000 +0000
+++ b/sys/arch/pmax/pmax/locore_machdep.S       Wed Jul 26 11:45:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_machdep.S,v 1.13 2000/03/10 01:31:23 nisimura Exp $     */
+/*     $NetBSD: locore_machdep.S,v 1.13.4.1 2000/07/26 11:45:20 ad Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,7 +53,6 @@
  *     @(#)locore.s    8.5 (Berkeley) 1/4/94
  */
 
-
 /*
  * DECstation-specific mips locore code.
  */
@@ -61,16 +60,16 @@
 #include <mips/asm.h>
 #include <mips/cpuregs.h>      /* XXX - misnomer? */
 
-#include "opt_dec_3100.h"
+#include "sii.h"
 #include "opt_dec_5100.h"
 #include "opt_dec_5400.h"
 
        .set    noreorder
-#if defined(DEC_3100) || defined(DEC_5100)
 
+#if NSII > 0 || NXSII > 0
 /*
  * Copy data to a DMA buffer padded with 16 bits of data, 16
- * bits of padding per 32bit word (e.g., for pmin/pmax  sii (and lance) DMA).
+ * bits of padding per 32bit word (e.g., for pmin/pmax sii DMA).
  *
  * The DMA bufffer can only be written one short at a time
  * (and takes ~14 cycles).
@@ -140,8 +139,7 @@
        j       ra
        nop
 END(CopyFromBuffer)
-#endif /* DEC_3100 || DEC_5100 */
-
+#endif /* NSII > 0 || NXSII > 0 */
 
 /*
  * Write-buffer flush for writebuffer hardware on DEC mips r2000a