Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc/stand Casts for PROM_LOADADDR which is not ca...



details:   https://anonhg.NetBSD.org/src/rev/68ac3b29913b
branches:  trunk
changeset: 472616:68ac3b29913b
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 03 16:13:16 1999 +0000

description:
Casts for PROM_LOADADDR which is not casted anymore.

diffstat:

 sys/arch/sparc/stand/boot/boot.c      |  4 ++--
 sys/arch/sparc/stand/bootxx/bootxx.c  |  6 +++---
 sys/arch/sparc/stand/bootxx/promlib.c |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 35a3a581863f -r 68ac3b29913b sys/arch/sparc/stand/boot/boot.c
--- a/sys/arch/sparc/stand/boot/boot.c  Mon May 03 15:50:38 1999 +0000
+++ b/sys/arch/sparc/stand/boot/boot.c  Mon May 03 16:13:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.6 1999/04/30 09:29:40 christos Exp $ */
+/*     $NetBSD: boot.c,v 1.7 1999/05/03 16:13:16 christos Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -187,7 +187,7 @@
 
        marks[MARK_END] = (((u_long)marks[MARK_END] + sizeof(int) - 1)) &
            (-sizeof(int));
-       arg = (prom_version() == PROM_OLDMON) ? PROM_LOADADDR : romp;
+       arg = (prom_version() == PROM_OLDMON) ? (caddr_t)PROM_LOADADDR : romp;
 #if 0
        /* Old style cruft; works only with a.out */
        marks[MARK_END] |= 0xf0000000;
diff -r 35a3a581863f -r 68ac3b29913b sys/arch/sparc/stand/bootxx/bootxx.c
--- a/sys/arch/sparc/stand/bootxx/bootxx.c      Mon May 03 15:50:38 1999 +0000
+++ b/sys/arch/sparc/stand/bootxx/bootxx.c      Mon May 03 16:13:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootxx.c,v 1.4 1999/02/15 18:59:36 pk Exp $ */
+/*     $NetBSD: bootxx.c,v 1.5 1999/05/03 16:13:16 christos Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -84,10 +84,10 @@
                        prom_bootdevice != NULL ? prom_bootdevice : "unknown");
        }
 
-       (void)loadboot(&io, PROM_LOADADDR);
+       (void)loadboot(&io, (caddr_t)PROM_LOADADDR);
        (io.f_dev->dv_close)(&io);
 
-       arg = (prom_version() == PROM_OLDMON) ? PROM_LOADADDR : romp;
+       arg = (prom_version() == PROM_OLDMON) ? (caddr_t)PROM_LOADADDR : romp;
        (*entry)(arg);
        _rtt();
 }
diff -r 35a3a581863f -r 68ac3b29913b sys/arch/sparc/stand/bootxx/promlib.c
--- a/sys/arch/sparc/stand/bootxx/promlib.c     Mon May 03 15:50:38 1999 +0000
+++ b/sys/arch/sparc/stand/bootxx/promlib.c     Mon May 03 16:13:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: promlib.c,v 1.1 1999/02/15 18:59:36 pk Exp $ */
+/*     $NetBSD: promlib.c,v 1.2 1999/05/03 16:13:16 christos Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -208,7 +208,7 @@
 
        if (CPU_ISSUN4) {
                prom_init_oldmon();
-               romp = PROM_LOADADDR;           /* Used in main() */
+               romp = (caddr_t)PROM_LOADADDR;  /* Used in main() */
        } else if (obpvec->pv_magic == OBP_MAGIC) {
                prom_init_obp();
        } else {



Home | Main Index | Thread Index | Old Index