Module Name: src
Committed By: chs
Date: Mon Oct 29 12:55:42 UTC 2012
Modified Files:
src/sys/arch/sun3/dev: fd.c
src/sys/arch/vax/vax: ka730.c ubi.c
Log Message:
fix compile problems.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vax/ka730.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/ubi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.73 src/sys/arch/sun3/dev/fd.c:1.74
--- src/sys/arch/sun3/dev/fd.c:1.73 Sat Oct 13 06:37:16 2012
+++ src/sys/arch/sun3/dev/fd.c Mon Oct 29 12:55:41 2012
@@ -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 @@ fdioctl(dev_t dev, u_long cmd, void *add
for (k = 0; k < fdc->sc_nstat; k++)
printf(" %x", fdc->sc_status[k]);
printf(">\n");
- }
return 0;
+ }
case _IOW('f', 101, int):
+ {
struct fdc_softc *fdc =
device_private(device_parent(fd->sc_dv));
@@ -1777,6 +1778,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
fdc->sc_cfg |= (*(int *)addr & CFG_THRHLD_MASK);
fdconf(fdc);
return 0;
+ }
case _IO('f', 102):
{
@@ -1789,10 +1791,11 @@ fdioctl(dev_t dev, u_long cmd, void *add
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;
}
Index: src/sys/arch/vax/vax/ka730.c
diff -u src/sys/arch/vax/vax/ka730.c:1.3 src/sys/arch/vax/vax/ka730.c:1.4
--- src/sys/arch/vax/vax/ka730.c:1.3 Sun Jun 5 16:59:21 2011
+++ src/sys/arch/vax/vax/ka730.c Mon Oct 29 12:55:41 2012
@@ -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 @@ struct cpu_dep ka730_calls = {
};
void
-ka730_conf()
+ka730_conf(void)
{
/* Call ctuattach() here so it can setup its vectors. */
ctuattach();
@@ -154,7 +154,7 @@ ka730_memenable(device_t parent, device_
/* log crd errors */
void
-ka730_memerr()
+ka730_memerr(void)
{
}
@@ -186,7 +186,7 @@ ka730_mchk(void *cmcf)
}
void
-ka730_clrf()
+ka730_clrf(void)
{
int s = splhigh();
Index: src/sys/arch/vax/vax/ubi.c
diff -u src/sys/arch/vax/vax/ubi.c:1.4 src/sys/arch/vax/vax/ubi.c:1.5
--- src/sys/arch/vax/vax/ubi.c:1.4 Sun Jun 5 16:59:21 2011
+++ src/sys/arch/vax/vax/ubi.c Mon Oct 29 12:55:41 2012
@@ -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 @@ ubi_attach(device_t parent, device_t sel
printf("\n");
- sa.sa_base = NEX730;
+ sa.sa_base = (bus_addr_t)NEX730;
#define NEXPAGES (sizeof(struct nexus) / VAX_NBPG)
