Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/sgimips/stand/common Track the change of int -> pad...



details:   https://anonhg.NetBSD.org/src/rev/4c1f72d615bb
branches:  trunk
changeset: 570337:4c1f72d615bb
user:      he <he%NetBSD.org@localhost>
date:      Mon Oct 04 19:59:51 2004 +0000

description:
Track the change of int -> paddr_t for the arguments to the ARCBIOS
routines.

diffstat:

 sys/arch/sgimips/stand/common/disk.c    |  8 +++++---
 sys/arch/sgimips/stand/common/getchar.c |  4 ++--
 sys/arch/sgimips/stand/common/putchar.c |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (75 lines):

diff -r 1e1bcecab747 -r 4c1f72d615bb sys/arch/sgimips/stand/common/disk.c
--- a/sys/arch/sgimips/stand/common/disk.c      Mon Oct 04 19:12:52 2004 +0000
+++ b/sys/arch/sgimips/stand/common/disk.c      Mon Oct 04 19:59:51 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disk.c,v 1.4 2003/11/11 06:42:15 sekiya Exp $  */
+/*     $NetBSD: disk.c,v 1.5 2004/10/04 19:59:51 he Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -69,7 +69,7 @@
        struct partition *pp = &sc->sc_label.d_partitions[part];
        int s;
        int64_t offset;
-       int count;
+       paddr_t count;
 
        offset = bn;
 
@@ -112,6 +112,7 @@
        char *msg, buf[DEV_BSIZE];
 #endif
        int i;
+       paddr_t i_arg;
        char *device;
        va_list ap;
 
@@ -134,10 +135,11 @@
        if (part >= 16)
                return (ENXIO);
 
-       if (ARCBIOS->Open(device, 0, &i)) {
+       if (ARCBIOS->Open(device, 0, &i_arg)) {
                printf("open failed\n");
                return (ENXIO);
        }
+       i = (int)i_arg;
 
        sc = alloc(sizeof(struct disk_softc));
        memset(sc, 0, sizeof(struct disk_softc));
diff -r 1e1bcecab747 -r 4c1f72d615bb sys/arch/sgimips/stand/common/getchar.c
--- a/sys/arch/sgimips/stand/common/getchar.c   Mon Oct 04 19:12:52 2004 +0000
+++ b/sys/arch/sgimips/stand/common/getchar.c   Mon Oct 04 19:59:51 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getchar.c,v 1.2 2002/05/21 21:53:35 rafal Exp $         */
+/*     $NetBSD: getchar.c,v 1.3 2004/10/04 19:59:51 he Exp $    */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
 getchar()
 {
        char ch;
-       int count;
+       paddr_t count;
 
        (*ARCBIOS->Read)(0, &ch, 1, &count);
        return(ch);
diff -r 1e1bcecab747 -r 4c1f72d615bb sys/arch/sgimips/stand/common/putchar.c
--- a/sys/arch/sgimips/stand/common/putchar.c   Mon Oct 04 19:12:52 2004 +0000
+++ b/sys/arch/sgimips/stand/common/putchar.c   Mon Oct 04 19:59:51 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: putchar.c,v 1.2 2002/03/13 13:12:30 simonb Exp $        */
+/*     $NetBSD: putchar.c,v 1.3 2004/10/04 19:59:51 he Exp $    */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
        int c;
 {
        static char ch[2] = "?\r";
-       int count;
+       paddr_t count;
 
        ch[0] = c;
        (*ARCBIOS->Write)(1, &ch, c == '\n' ? 2 : 1, &count);



Home | Main Index | Thread Index | Old Index