[src/netbsd-1-5]: src/sys/arch/sparc64/dev Pullup of 1.2 and 1.7 (approved by...

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

details:   https://anonhg.NetBSD.org/src/rev/8b9426d57a1d
branches:  netbsd-1-5
changeset: 489424:8b9426d57a1d
user:      eeh <eeh%NetBSD.org@localhost>
date:      Sat Sep 09 17:30:54 2000 +0000

description:
Pullup of 1.2 and 1.7 (approved by thorpej):

revision 1.7
date: 2000/08/26 16:02:06;  author: eeh;  state: Exp;  lines: +5 -5
Make 64-bit clean.

revision 1.2
date: 2000/08/26 16:02:06;  author: eeh;  state: Exp;  lines: +2 -2
Make 64-bit clean.

diffstat:

 sys/arch/sparc64/dev/cgsix.c    |  10 +++++-----
 sys/arch/sparc64/dev/cgsixreg.h |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 6d23b906c2e7 -r 8b9426d57a1d sys/arch/sparc64/dev/cgsix.c
--- a/sys/arch/sparc64/dev/cgsix.c      Sat Sep 09 13:49:22 2000 +0000
+++ b/sys/arch/sparc64/dev/cgsix.c      Sat Sep 09 17:30:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix.c,v 1.4.18.1 2000/06/30 16:27:41 simonb Exp $ */
+/*     $NetBSD: cgsix.c,v 1.4.18.2 2000/09/09 17:30:54 eeh Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -569,9 +569,9 @@
 #define        CG6_USER_DHC    0x80000000
 
 struct mmo {
-       u_int   mo_uaddr;       /* user (virtual) address */
-       u_int   mo_size;        /* size, or 0 for video ram size */
-       u_int   mo_physoff;     /* offset from sc_physadr */
+       u_long  mo_uaddr;       /* user (virtual) address */
+       u_long  mo_size;        /* size, or 0 for video ram size */
+       u_long  mo_physoff;     /* offset from sc_physadr */
 };
 
 /*
@@ -614,7 +614,7 @@
         * one byte is as good as one page.
         */
        for (mo = mmo; mo < &mmo[NMMO]; mo++) {
-               if ((u_int)off < mo->mo_uaddr)
+               if ((u_long)off < mo->mo_uaddr)
                        continue;
                u = off - mo->mo_uaddr;
                sz = mo->mo_size ? mo->mo_size : sc->sc_fb.fb_type.fb_size;
diff -r 6d23b906c2e7 -r 8b9426d57a1d sys/arch/sparc64/dev/cgsixreg.h
--- a/sys/arch/sparc64/dev/cgsixreg.h   Sat Sep 09 13:49:22 2000 +0000
+++ b/sys/arch/sparc64/dev/cgsixreg.h   Sat Sep 09 17:30:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsixreg.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp $ */
+/*     $NetBSD: cgsixreg.h,v 1.1.1.1.24.1 2000/09/09 17:30:54 eeh Exp $ */
 
 /*
  * Copyright (c) 1993
@@ -167,7 +167,7 @@
 struct cg6_layout {
        /* ROM at 0 */
        union {
-               long un_id;             /* ID = ?? */
+               int  un_id;             /* ID = ?? */
                char un_rom[65536];     /* 64K rom */
                char un_pad[0x200000];
        } cg6_rom_un;