[src/trunk]: src/sys/arch/sparc/sparc Fix non-properly ifdef'ed SUN4 only code.

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

details:   https://anonhg.NetBSD.org/src/rev/17d9f3fa60f8
branches:  trunk
changeset: 513512:17d9f3fa60f8
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Aug 02 18:06:22 2001 +0000

description:
Fix non-properly ifdef'ed SUN4 only code.

diffstat:

 sys/arch/sparc/sparc/clock.c   |  7 ++++---
 sys/arch/sparc/sparc/promlib.c |  4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r e2aa856562e2 -r 17d9f3fa60f8 sys/arch/sparc/sparc/clock.c
--- a/sys/arch/sparc/sparc/clock.c      Thu Aug 02 16:22:46 2001 +0000
+++ b/sys/arch/sparc/sparc/clock.c      Thu Aug 02 18:06:22 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.79 2001/04/09 21:28:50 pk Exp $ */
+/*     $NetBSD: clock.c,v 1.80 2001/08/02 18:06:22 matt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -550,16 +550,17 @@
        /* Establish clock write-enable method */
        todr_handle->todr_setwen = clk_wenable;
 
+#if defined(SUN4)
        if (CPU_ISSUN4) {
                idp = &sun4_idprom_store;
-#if defined(SUN4)
                if (cpuinfo.cpu_type == CPUTYP_4_300 ||
                    cpuinfo.cpu_type == CPUTYP_4_400) {
                        eeprom_va = (char *)bh;
                        eeprom_nvram = 1;
                }
+       } else
 #endif
-       } else {
+       {
        /*
         * Location of IDPROM relative to the end of the NVRAM area
         */
diff -r e2aa856562e2 -r 17d9f3fa60f8 sys/arch/sparc/sparc/promlib.c
--- a/sys/arch/sparc/sparc/promlib.c    Thu Aug 02 16:22:46 2001 +0000
+++ b/sys/arch/sparc/sparc/promlib.c    Thu Aug 02 18:06:22 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: promlib.c,v 1.9 2001/06/26 20:35:54 uwe Exp $ */
+/*     $NetBSD: promlib.c,v 1.10 2001/08/02 18:06:22 matt Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -825,12 +825,14 @@
        promops.po_setcallback = (void *)sparc_noop;
        promops.po_setcontext = oldpvec->setcxsegmap;
 
+#ifdef SUN4
 #ifndef _STANDALONE
        if (oldpvec->romvecVersion >= 2) {
                extern void oldmon_w_cmd __P((u_long, char *));
                *oldpvec->vector_cmd = oldmon_w_cmd;
        }
 #endif
+#endif
 }
 
 static __inline__ void