Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-properly ifdef'ed SUN4 only code.

This commit is contained in:
matt 2001-08-02 18:06:22 +00:00
parent 10414d85a9
commit d4a7b6fc1c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/sparc/sparc/clock.c
View File

@ -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 @@ clockattach(node, bt, bh)
/* 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
*/

4
sys/arch/sparc/sparc/promlib.c
View File

@ -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 @@ prom_init_oldmon()
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