Sync with NetBSD 9600430. The port has gone over a major -Wall treat

1 files changed, 11 insertions, 7 deletions

diff --git a/sys/arch/amiga/dev/clock.c b/sys/arch/amiga/dev/clock.c
index aad42f1f0b5..8f307f3316a 100644
--- a/sys/arch/amiga/dev/clock.c
+++ b/sys/arch/amiga/dev/clock.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: clock.c,v 1.5 1996/04/27 18:38:50 niklas Exp $	*/
-/*	$NetBSD: clock.c,v 1.12 1996/03/17 05:58:30 mhitch Exp $	*/
+/*	$OpenBSD: clock.c,v 1.6 1996/05/02 06:43:37 niklas Exp $	*/
+/*	$NetBSD: clock.c,v 1.13 1996/04/21 21:10:57 veego Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -46,6 +46,7 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
+#include <sys/systm.h>
 #include <machine/psl.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
@@ -97,6 +98,8 @@ struct clockframe hardclock_frame;
 
 int clockmatch __P((struct device *, void *, void *));
 void clockattach __P((struct device *, struct device *, void *));
+void cpu_initclocks __P((void));
+void setmicspertick __P((void));
 
 struct cfattach clock_ca = {
 	sizeof(struct device), clockmatch, clockattach
@@ -110,7 +113,6 @@ clockmatch(pdp, match, auxp)
 	struct device *pdp;
 	void *match, *auxp;
 {
-	struct cfdata *cfp = match;
 
 	if (matchname("clock", auxp))
 		return(1);
@@ -198,6 +200,7 @@ cpu_initclocks()
 #endif
 }
 
+void
 setstatclockrate(hz)
 	int hz;
 {
@@ -207,6 +210,7 @@ setstatclockrate(hz)
  * Returns number of usec since last recorded clock "tick"
  * (i.e. clock interrupt).
  */
+u_long
 clkread()
 {
 	u_char hi, hi2, lo;
@@ -274,7 +278,6 @@ delay(mic)
 	u_int mic;
 {
 	u_int temp;
-	int s;
 
 	if (micspertick == 0)
 		setmicspertick();
@@ -693,6 +696,7 @@ int rtcinit __P((void));
  * Initialize the time of day register, based on the time base which is, e.g.
  * from a filesystem.
  */
+void
 inittodr(base)
 	time_t base;
 {
@@ -712,11 +716,11 @@ inittodr(base)
 	time.tv_sec = timbuf;
 }
 
+void
 resettodr()
 {
-	if (settod && settod(time.tv_sec) == 1)
-		return;
-	printf("Cannot set battery backed clock\n");
+	if (settod && settod(time.tv_sec) == 0)
+		printf("Cannot set battery backed clock\n");
 }
 
 int