[src/trunk]: src/sys/arch fix compile problems.

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

details:   https://anonhg.NetBSD.org/src/rev/ce63005c49fe
branches:  trunk
changeset: 782340:ce63005c49fe
user:      chs <chs%NetBSD.org@localhost>
date:      Mon Oct 29 12:55:41 2012 +0000

description:
fix compile problems.

diffstat:

 sys/arch/sun3/dev/fd.c   |  11 +++++++----
 sys/arch/vax/vax/ka730.c |  10 +++++-----
 sys/arch/vax/vax/ubi.c   |   6 +++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diffs (124 lines):

diff -r 91b4554e78d5 -r ce63005c49fe sys/arch/sun3/dev/fd.c
--- a/sys/arch/sun3/dev/fd.c    Mon Oct 29 12:52:43 2012 +0000
+++ b/sys/arch/sun3/dev/fd.c    Mon Oct 29 12:55:41 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.73 2012/10/13 06:37:16 tsutsui Exp $  */
+/*     $NetBSD: fd.c,v 1.74 2012/10/29 12:55:41 chs Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.73 2012/10/13 06:37:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.74 2012/10/29 12:55:41 chs Exp $");
 
 #include "opt_ddb.h"
 
@@ -1766,10 +1766,11 @@
                for (k = 0; k < fdc->sc_nstat; k++)
                        printf(" %x", fdc->sc_status[k]);
                printf(">\n");
+               return 0;
                }
-               return 0;
 
        case _IOW('f', 101, int):
+               {
                struct fdc_softc *fdc =
                    device_private(device_parent(fd->sc_dv));
 
@@ -1777,6 +1778,7 @@
                fdc->sc_cfg |= (*(int *)addr & CFG_THRHLD_MASK);
                fdconf(fdc);
                return 0;
+               }
 
        case _IO('f', 102):
                {
@@ -1789,10 +1791,11 @@
                printf("sensei(%d regs): <", fdc->sc_nstat);
                for (k=0; k < fdc->sc_nstat; k++)
                        printf(" 0x%x", fdc->sc_status[k]);
-               }
                printf(">\n");
                return 0;
+               }
 #endif
+
        default:
                return ENOTTY;
        }
diff -r 91b4554e78d5 -r ce63005c49fe sys/arch/vax/vax/ka730.c
--- a/sys/arch/vax/vax/ka730.c  Mon Oct 29 12:52:43 2012 +0000
+++ b/sys/arch/vax/vax/ka730.c  Mon Oct 29 12:55:41 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka730.c,v 1.3 2011/06/05 16:59:21 matt Exp $ */
+/*     $NetBSD: ka730.c,v 1.4 2012/10/29 12:55:41 chs Exp $ */
 /*
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * All rights reserved.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.3 2011/06/05 16:59:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.4 2012/10/29 12:55:41 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -108,7 +108,7 @@
 };
 
 void
-ka730_conf()
+ka730_conf(void)
 {
        /* Call ctuattach() here so it can setup its vectors. */
        ctuattach();
@@ -154,7 +154,7 @@
 
 /* log crd errors */
 void
-ka730_memerr()
+ka730_memerr(void)
 {
 }
 
@@ -186,7 +186,7 @@
 }
 
 void
-ka730_clrf()
+ka730_clrf(void)
 {
        int s = splhigh();
 
diff -r 91b4554e78d5 -r ce63005c49fe sys/arch/vax/vax/ubi.c
--- a/sys/arch/vax/vax/ubi.c    Mon Oct 29 12:52:43 2012 +0000
+++ b/sys/arch/vax/vax/ubi.c    Mon Oct 29 12:55:41 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubi.c,v 1.4 2011/06/05 16:59:21 matt Exp $ */
+/*     $NetBSD: ubi.c,v 1.5 2012/10/29 12:55:41 chs Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.4 2011/06/05 16:59:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.5 2012/10/29 12:55:41 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@
 
        printf("\n");
 
-        sa.sa_base = NEX730;
+        sa.sa_base = (bus_addr_t)NEX730;
 
 #define NEXPAGES (sizeof(struct nexus) / VAX_NBPG)