Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed gcc -Wall warning.

This commit is contained in:
oki 1996-05-15 16:12:48 +00:00
parent 4001987d06
commit 34a55c3e59
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/arch/x68k/dev/pow.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pow.c,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */
/* $NetBSD: pow.c,v 1.2 1996/05/15 16:12:51 oki Exp $ */
/*
* Copyright (c) 1995 MINOURA Makoto.
@ -39,11 +39,13 @@
#include <string.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/fcntl.h>
#include <sys/signalvar.h>
#include <machine/powioctl.h>
#include <x68k/dev/powvar.h>
@ -53,11 +55,10 @@
#define sramtop (IODEVbase->io_sram)
#define rtc (IODEVbase->io_rtc)
static int powinit ();
struct pow_softc pows[NPOW];
/* ARGSUSED */
void
powattach(num)
int num;
{
@ -70,11 +71,11 @@ powattach(num)
mfp.aer &= ~7;
for (minor = 0; minor < num; minor++) {
if (minor == 0) {
if (minor == 0)
pows[minor].status = POW_FREE;
} else {
else
pows[minor].status = POW_ANY;
}
pows[minor].sw = sw;
if (sw) {
@ -82,7 +83,7 @@ powattach(num)
mfp.ierb |= sw;
}
printf ("pow%d: started by ", minor);
printf("pow%d: started by ", minor);
if ((sw & POW_ALARMSW) && sramtop[0x26] == 0)
printf ("RTC alarm.\n");
else if (sw & POW_EXTERNALSW)
@ -92,8 +93,6 @@ powattach(num)
else
printf ("???.\n");
}
return 1;
}
/*ARGSUSED*/
@ -195,8 +194,7 @@ setalarm (bp)
RTCWAIT;
rtc.bank1.mode = 0x08;
}
splx (s);
splx(s);
return 0;
}
@ -216,7 +214,7 @@ powioctl (dev, cmd, addr, flag, p)
switch (cmd) {
case POWIOCGPOWERINFO:
{
struct x68k_powerinfo *bp = (struct x68k_powerinfo*) addr;
struct x68k_powerinfo *bp = (struct x68k_powerinfo*)addr;
if (!(sc->rw & FREAD))
return EBADF;
bp->pow_switch_boottime = sc->sw;
@ -268,19 +266,19 @@ powioctl (dev, cmd, addr, flag, p)
}
void
powintr ()
powintr()
{
int sw;
int s;
s = spl6 ();
s = spl6();
sw = ~mfp.gpip & 6;
mfp.aer &= ~sw;
mfp.ierb |= sw;
if (pows[0].status == POW_BUSY && pows[0].pid != 0)
psignal (pows[0].proc, pows[0].signum);
psignal(pows[0].proc, pows[0].signum);
splx (s);
splx(s);
}

7
sys/arch/x68k/x68k/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.1 1996/05/05 12:17:22 oki Exp $ */
/* $NetBSD: clock.c,v 1.2 1996/05/15 16:12:48 oki Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -43,6 +43,7 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
@ -83,6 +84,7 @@
* no alternative timer is available.
*
*/
void
cpu_initclocks()
{
/* stop timer-C */
@ -109,6 +111,7 @@ setstatclockrate(hz)
* Returns number of usec since last recorded clock "tick"
* (i.e. clock interrupt).
*/
int
clkread()
{
return (mfp.tcdr * CLOCKS_PER_SEC) / CLK_INTERVAL;
@ -460,6 +463,7 @@ long (*settod) () = 0;
* Initialize the time of day register, based on the time base which is, e.g.
* from a filesystem.
*/
void
inittodr(base)
time_t base;
{
@ -484,6 +488,7 @@ inittodr(base)
time.tv_sec = timbuf;
}
void
resettodr()
{
if (settod)