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

Some KNF.

This commit is contained in:
tsutsui 2006-07-21 10:01:39 +00:00
parent 14b3937642
commit 7d4b57d7bc
28 changed files with 528 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/arch/hp300/dev/ct.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ct.c,v 1.46 2006/03/28 17:38:24 thorpej Exp $ */
/* $NetBSD: ct.c,v 1.47 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.46 2006/03/28 17:38:24 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.47 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -213,7 +213,7 @@ ctmatch(struct device *parent, struct cfdata *match, void *aux)
{
struct hpibbus_attach_args *ha = aux;
return (ctident(parent, NULL, ha));
return ctident(parent, NULL, ha);
}
static void
@ -257,14 +257,14 @@ ctident(struct device *parent, struct ct_softc *sc,
/* Verify that we have a CS80 device. */
if ((ha->ha_id & 0x200) == 0)
return (0);
return 0;
/* Is it one of the tapes we support? */
for (id = 0; id < nctinfo; id++)
if (ha->ha_id == ctinfo[id].hwid)
break;
if (id == nctinfo)
return (0);
return 0;
ha->ha_punit = ctinfo[id].punit;
@ -292,7 +292,7 @@ ctident(struct device *parent, struct ct_softc *sc,
switch (ha->ha_id) {
case CT7946ID:
if (memcmp(name, "079450", 6) == 0)
return (0); /* not really a 7946 */
return 0; /* not really a 7946 */
/* fall into... */
case CT9144ID:
case CT9145ID:
@ -314,7 +314,7 @@ ctident(struct device *parent, struct ct_softc *sc,
canstream ? "streaming " : "");
}
return (1);
return 1;
}
static void
@ -370,10 +370,10 @@ ctopen(dev_t dev, int flag, int type, struct lwp *l)
if (UNIT(dev) >= ct_cd.cd_ndevs ||
(sc = ct_cd.cd_devs[UNIT(dev)]) == NULL ||
(sc->sc_flags & CTF_ALIVE) == 0)
return (ENXIO);
return ENXIO;
if (sc->sc_flags & CTF_OPEN)
return (EBUSY);
return EBUSY;
ctlr = device_unit(device_parent(&sc->sc_dev));
slave = sc->sc_slave;
@ -393,16 +393,16 @@ ctopen(dev_t dev, int flag, int type, struct lwp *l)
*/
cc = hpibsend(ctlr, slave, C_CMD, &sc->sc_soptc, sizeof(sc->sc_soptc));
if (cc != sizeof(sc->sc_soptc))
return (EBUSY);
return EBUSY;
hpibswait(ctlr, slave);
cc = hpibrecv(ctlr, slave, C_QSTAT, &stat, sizeof(stat));
if (cc != sizeof(stat))
return(EBUSY);
return EBUSY;
sc->sc_tpr = tprintf_open(l->l_proc);
sc->sc_flags |= CTF_OPEN;
return(0);
return 0;
}
/*ARGSUSED*/
@ -434,7 +434,7 @@ ctclose(dev_t dev, int flag, int fmt, struct lwp *l)
if (ctdebug & CDB_FILES)
printf("ctclose: flags %x\n", sc->sc_flags);
#endif
return(0); /* XXX */
return 0; /* XXX */
}
static void
@ -879,14 +879,16 @@ ctdone(struct ct_softc *sc, struct buf *bp)
static int
ctread(dev_t dev, struct uio *uio, int flags)
{
return (physio(ctstrategy, NULL, dev, B_READ, minphys, uio));
return physio(ctstrategy, NULL, dev, B_READ, minphys, uio);
}
static int
ctwrite(dev_t dev, struct uio *uio, int flags)
{
/* XXX: check for hardware write-protect? */
return (physio(ctstrategy, NULL, dev, B_WRITE, minphys, uio));
return physio(ctstrategy, NULL, dev, B_WRITE, minphys, uio);
}
/*ARGSUSED*/
@ -916,7 +918,7 @@ ctioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
break;
default:
return(EINVAL);
return EINVAL;
}
ctcommand(dev, op->mt_op, cnt);
break;
@ -925,9 +927,9 @@ ctioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
break;
default:
return(EINVAL);
return EINVAL;
}
return(0);
return 0;
}
static void

66
sys/arch/hp300/dev/dcm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dcm.c,v 1.71 2006/05/14 21:55:10 elad Exp $ */
/* $NetBSD: dcm.c,v 1.72 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -123,7 +123,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.71 2006/05/14 21:55:10 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.72 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_kgdb.h"
@ -386,10 +386,10 @@ dcmmatch(struct device *parent, struct cfdata *match, void *aux)
switch (da->da_id) {
case DIO_DEVICE_ID_DCM:
case DIO_DEVICE_ID_DCMREM:
return (1);
return 1;
}
return (0);
return 0;
}
static void
@ -535,10 +535,10 @@ dcmopen(dev_t dev, int flag, int mode, struct lwp *l)
if (brd >= dcm_cd.cd_ndevs || port >= NDCMPORT ||
(sc = dcm_cd.cd_devs[brd]) == NULL)
return (ENXIO);
return ENXIO;
if ((sc->sc_flags & DCM_ACTIVE) == 0)
return (ENXIO);
return ENXIO;
if (sc->sc_tty[port] == NULL) {
tp = sc->sc_tty[port] = ttymalloc();
@ -552,8 +552,9 @@ dcmopen(dev_t dev, int flag, int mode, struct lwp *l)
if ((tp->t_state & TS_ISOPEN) &&
(tp->t_state & TS_XCLUDE) &&
kauth_authorize_generic(l->l_proc->p_cred, KAUTH_GENERIC_ISSUSER, &l->l_proc->p_acflag) != 0)
return (EBUSY);
kauth_authorize_generic(l->l_proc->p_cred, KAUTH_GENERIC_ISSUSER,
&l->l_proc->p_acflag) != 0)
return EBUSY;
s = spltty();
@ -609,7 +610,7 @@ dcmopen(dev_t dev, int flag, int mode, struct lwp *l)
error = (*tp->t_linesw->l_open)(dev, tp);
bad:
return (error);
return error;
}
/*ARGSUSED*/
@ -646,7 +647,7 @@ dcmclose(dev_t dev, int flag, int mode, struct lwp *l)
ttyfree(tp);
sc->sc_tty[port] == NULL;
#endif
return (0);
return 0;
}
static int
@ -663,7 +664,7 @@ dcmread(dev_t dev, struct uio *uio, int flag)
sc = dcm_cd.cd_devs[board];
tp = sc->sc_tty[port];
return ((*tp->t_linesw->l_read)(tp, uio, flag));
return (*tp->t_linesw->l_read)(tp, uio, flag);
}
static int
@ -680,7 +681,7 @@ dcmwrite(dev_t dev, struct uio *uio, int flag)
sc = dcm_cd.cd_devs[board];
tp = sc->sc_tty[port];
return ((*tp->t_linesw->l_write)(tp, uio, flag));
return (*tp->t_linesw->l_write)(tp, uio, flag);
}
static int
@ -697,7 +698,7 @@ dcmpoll(dev_t dev, int events, struct lwp *l)
sc = dcm_cd.cd_devs[board];
tp = sc->sc_tty[port];
return ((*tp->t_linesw->l_poll)(tp, events, l));
return (*tp->t_linesw->l_poll)(tp, events, l);
}
static struct tty *
@ -712,7 +713,7 @@ dcmtty(dev_t dev)
sc = dcm_cd.cd_devs[board];
return (sc->sc_tty[port]);
return sc->sc_tty[port];
}
static int
@ -732,7 +733,7 @@ dcmintr(void *arg)
SEM_LOCK(dcm);
if ((dcm->dcm_ic & IC_IR) == 0) {
SEM_UNLOCK(dcm);
return (0);
return 0;
}
for (i = 0; i < 4; i++) {
pcnd[i] = dcm->dcm_icrtab[i].dcm_data;
@ -815,7 +816,7 @@ dcmintr(void *arg)
dis->dis_intr = dis->dis_char = 0;
dis->dis_time = time.tv_sec;
}
return (1);
return 1;
}
/*
@ -1019,11 +1020,11 @@ dcmioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
return error;
error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
return error;
switch (cmd) {
case TIOCSBRK:
@ -1087,9 +1088,10 @@ dcmioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
case TIOCSFLAGS: {
int userbits;
error = kauth_authorize_generic(l->l_proc->p_cred, KAUTH_GENERIC_ISSUSER, &l->l_proc->p_acflag);
error = kauth_authorize_generic(l->l_proc->p_cred,
KAUTH_GENERIC_ISSUSER, &l->l_proc->p_acflag);
if (error)
return (EPERM);
return EPERM;
userbits = *(int *)data;
@ -1105,9 +1107,9 @@ dcmioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
default:
return (EPASSTHROUGH);
return EPASSTHROUGH;
}
return (0);
return 0;
}
static int
@ -1127,14 +1129,14 @@ dcmparam(struct tty *tp, struct termios *t)
/* check requested parameters */
if (ospeed < 0 || (t->c_ispeed && t->c_ispeed != t->c_ospeed))
return (EINVAL);
return EINVAL;
/* and copy to tty */
tp->t_ispeed = t->c_ispeed;
tp->t_ospeed = t->c_ospeed;
tp->t_cflag = cflag;
if (ospeed == 0) {
(void) dcmmctl(DCMUNIT(tp->t_dev), MO_OFF, DMSET);
return (0);
(void)dcmmctl(DCMUNIT(tp->t_dev), MO_OFF, DMSET);
return 0;
}
mode = 0;
@ -1184,7 +1186,7 @@ dcmparam(struct tty *tp, struct termios *t)
* XXX why do we do this?
*/
DELAY(16 * DCM_USPERCH(tp->t_ospeed));
return (0);
return 0;
}
static void
@ -1385,7 +1387,7 @@ dcmmctl(dev_t dev, int bits, int how)
DELAY(10); /* delay until done */
splx(s);
}
return (bits);
return bits;
}
/*
@ -1531,7 +1533,7 @@ dcmselftest(struct dcm_softc *sc)
out:
splx(s);
return (rv);
return rv;
}
/*
@ -1547,7 +1549,7 @@ dcmcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
int maj;
if (bus_space_map(bst, addr, DIOCSIZE, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
dcm = (struct dcmdevice *)va;
@ -1597,11 +1599,11 @@ dcmcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
#endif
return (0);
return 0;
error:
bus_space_unmap(bst, bsh, DIOCSIZE);
return (1);
return 1;
}
/* ARGSUSED */
@ -1633,7 +1635,7 @@ dcmcngetc(dev_t dev)
stat = fifo->data_stat;
pp->r_head = (head + 2) & RX_MASK;
splx(s);
return (c);
return c;
}
/*

26
sys/arch/hp300/dev/dio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dio.c,v 1.32 2005/12/24 20:07:03 perry Exp $ */
/* $NetBSD: dio.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.32 2005/12/24 20:07:03 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@ -92,10 +92,10 @@ diomatch(struct device *parent, struct cfdata *match, void *aux)
/* Allow only one instance. */
if (dio_matched)
return (0);
return 0;
dio_matched = 1;
return (1);
return 1;
}
static void
@ -173,9 +173,9 @@ diosubmatch(struct device *parent, struct cfdata *cf,
if (cf->diocf_scode != DIOCF_SCODE_DEFAULT &&
cf->diocf_scode != da->da_scode)
return (0);
return 0;
return (config_match(parent, cf, aux));
return config_match(parent, cf, aux);
}
static int
@ -188,7 +188,7 @@ dioprint(void *aux, const char *pnp)
aprint_normal("%s at %s",
dio_devinfo(da, buf, sizeof(buf)), pnp);
aprint_normal(" scode %d ipl %d", da->da_scode, da->da_ipl);
return (UNCONF);
return UNCONF;
}
/*
@ -206,7 +206,7 @@ dio_scodetopa(int scode)
else
rval = 0;
return ((void *)rval);
return (void *)rval;
}
/*
@ -230,7 +230,7 @@ dio_scodesize(struct dio_attach_args *da)
}
} else {
foundit:
return (dio_devdatas[i].dd_nscode);
return dio_devdatas[i].dd_nscode;
}
}
}
@ -240,7 +240,7 @@ dio_scodesize(struct dio_attach_args *da)
*/
printf("WARNING: select code size unknown for id = 0x%x secid = 0x%x\n",
da->da_id, da->da_secid);
return (1);
return 1;
}
/*
@ -269,7 +269,7 @@ dio_devinfo(struct dio_attach_args *da, char *buf, size_t buflen)
} else {
foundit:
sprintf(buf, "%s", dio_devdescs[i].dd_desc);
return (buf);
return buf;
}
}
}
@ -280,7 +280,7 @@ dio_devinfo(struct dio_attach_args *da, char *buf, size_t buflen)
*/
sprintf(buf, "device id = 0x%x secid = 0x%x",
da->da_id, da->da_secid);
return (buf);
return buf;
}
/*
@ -296,7 +296,7 @@ dio_intr_establish(int (*func)(void *), void *arg, int ipl, int priority)
if (priority == IPL_BIO)
dmacomputeipl();
return (ih);
return ih;
}
/*

14
sys/arch/hp300/dev/dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dma.c,v 1.33 2005/12/11 12:17:13 christos Exp $ */
/* $NetBSD: dma.c,v 1.34 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.33 2005/12/11 12:17:13 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.34 2006/07/21 10:01:39 tsutsui Exp $");
#include <machine/hp300spu.h> /* XXX param.h includes cpu.h */
@ -174,10 +174,10 @@ dmamatch(struct device *parent, struct cfdata *match, void *aux)
static int dmafound = 0; /* can only have one */
if (strcmp("dma", ia->ia_modname) != 0 || dmafound)
return (0);
return 0;
dmafound = 1;
return (1);
return 1;
}
static void
@ -311,7 +311,7 @@ dmareq(struct dmaqueue *dq)
sc->sc_chan[i].dm_job = dq;
dq->dq_chan = i;
splx(s);
return (1);
return 1;
}
/*
@ -319,7 +319,7 @@ dmareq(struct dmaqueue *dq)
*/
TAILQ_INSERT_TAIL(&sc->sc_queue, dq, dq_list);
splx(s);
return (0);
return 0;
}
void
@ -628,7 +628,7 @@ dmaintr(void *arg)
} else
dmastop(i);
}
return(found);
return found;
}
#ifdef DEBUG

32
sys/arch/hp300/dev/fhpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fhpib.c,v 1.32 2006/03/28 17:38:25 thorpej Exp $ */
/* $NetBSD: fhpib.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.32 2006/03/28 17:38:25 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -161,9 +161,9 @@ fhpibmatch(struct device *parent, struct cfdata *match, void *aux)
struct dio_attach_args *da = aux;
if (da->da_id == DIO_DEVICE_ID_FHPIB)
return (1);
return 1;
return (0);
return 0;
}
static void
@ -183,7 +183,7 @@ fhpibattach(struct device *parent, struct device *self, void *aux)
printf(": %s\n", DIO_DEVICE_DESC_FHPIB);
/* Establish the interrupt handler. */
(void) dio_intr_establish(fhpibintr, sc, da->da_ipl, IPL_BIO);
(void)dio_intr_establish(fhpibintr, sc, da->da_ipl, IPL_BIO);
callout_init(&sc->sc_dmadone_ch);
callout_init(&sc->sc_ppwatch_ch);
@ -222,7 +222,6 @@ fhpibreset(struct hpibbus_softc *hs)
if (fhpibdebug & FDB_DMA)
printf("fhpibtype: %s has word DMA\n",
sc->sc_dev.dv_xname);
#endif
}
}
@ -230,6 +229,7 @@ fhpibreset(struct hpibbus_softc *hs)
static void
fhpibifc(struct fhpibdevice *hd)
{
hd->hpib_cmd |= CT_IFC;
hd->hpib_cmd |= CT_INITFIFO;
DELAY(100);
@ -285,7 +285,7 @@ fhpibsend(struct hpibbus_softc *hs, int slave, int sec, void *ptr, int origcnt)
(void) fhpibwait(hd, IM_IDLE);
}
hd->hpib_imask = 0;
return (origcnt);
return origcnt;
senderr:
hd->hpib_imask = 0;
@ -297,7 +297,7 @@ senderr:
printf("sent %d of %d bytes\n", origcnt-cnt-1, origcnt);
}
#endif
return (origcnt - cnt - 1);
return origcnt - cnt - 1;
}
static int
@ -346,7 +346,7 @@ fhpibrecv(struct hpibbus_softc *hs, int slave, int sec, void *ptr, int origcnt)
(void) fhpibwait(hd, IM_IDLE);
}
hd->hpib_imask = 0;
return (origcnt);
return origcnt;
recverror:
fhpibifc(hd);
@ -359,7 +359,7 @@ recvbyteserror:
printf("got %d of %d bytes\n", origcnt-cnt-1, origcnt);
}
#endif
return (origcnt - cnt - 1);
return origcnt - cnt - 1;
}
static void
@ -544,13 +544,13 @@ fhpibintr(void *arg)
sc->sc_dev.dv_xname, stat0);
/* fhpibbadint[0]++; XXX */
#endif
return(0);
return 0;
}
if ((hs->sc_flags & (HPIBF_IO|HPIBF_DONE)) == HPIBF_IO) {
#ifdef DEBUG
/* fhpibbadint[1]++; XXX */
#endif
return(0);
return 0;
}
#ifdef DEBUG
if ((fhpibdebug & FDB_DMA) &&
@ -603,7 +603,7 @@ fhpibintr(void *arg)
hs->sc_flags &= ~HPIBF_PPOLL;
(hq->hq_intr)(hq->hq_softc);
}
return(1);
return 1;
}
static int
@ -626,7 +626,7 @@ fhpibppoll(struct hpibbus_softc *hs)
hd->hpib_imask = 0;
hd->hpib_pmask = 0;
hd->hpib_stat = ST_IENAB;
return(ppoll);
return ppoll;
}
static int
@ -641,9 +641,9 @@ fhpibwait(struct fhpibdevice *hd, int x)
if (fhpibdebug & FDB_FAIL)
printf("fhpibwait(%p, %x) timeout\n", hd, x);
#endif
return(-1);
return -1;
}
return(0);
return 0;
}
/*

81
sys/arch/hp300/dev/grf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf.c,v 1.59 2006/07/19 17:21:23 tsutsui Exp $ */
/* $NetBSD: grf.c,v 1.60 2006/07/21 10:01:39 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.59 2006/07/19 17:21:23 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.60 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -162,7 +162,7 @@ static int
grfmatch(struct device *parent, struct cfdata *match, void *aux)
{
return (1);
return 1;
}
static void
@ -188,7 +188,7 @@ grfprint(void *aux, const char *pnp)
if (pnp)
aprint_normal("ite at %s", pnp);
return (UNCONF);
return UNCONF;
}
/*ARGSUSED*/
@ -202,27 +202,27 @@ grfopen(dev_t dev, int flags, int mode, struct lwp *l)
if (unit >= grf_cd.cd_ndevs ||
(sc = grf_cd.cd_devs[unit]) == NULL)
return (ENXIO);
return ENXIO;
gp = sc->sc_data;
if ((gp->g_flags & GF_ALIVE) == 0)
return (ENXIO);
return ENXIO;
if ((gp->g_flags & (GF_OPEN|GF_EXCLUDE)) == (GF_OPEN|GF_EXCLUDE))
return(EBUSY);
return EBUSY;
#ifdef COMPAT_HPUX
/*
* XXX: cannot handle both HPUX and BSD processes at the same time
*/
if (l->l_proc->p_emul == &emul_hpux)
if (gp->g_flags & GF_BSDOPEN)
return(EBUSY);
return EBUSY;
else
gp->g_flags |= GF_HPUXOPEN;
else
if (gp->g_flags & GF_HPUXOPEN)
return(EBUSY);
return EBUSY;
else
gp->g_flags |= GF_BSDOPEN;
#endif
@ -235,7 +235,7 @@ grfopen(dev_t dev, int flags, int mode, struct lwp *l)
gp->g_flags |= GF_OPEN;
error = grfon(dev);
}
return(error);
return error;
}
/*ARGSUSED*/
@ -251,14 +251,14 @@ grfclose(dev_t dev, int flags, int mode, struct lwp *l)
gp = sc->sc_data;
if ((gp->g_flags & GF_ALIVE) == 0)
return (ENXIO);
return ENXIO;
(void) grfoff(dev);
#ifdef COMPAT_HPUX
(void) grfunlock(gp);
#endif
gp->g_flags &= GF_ALIVE;
return(0);
return 0;
}
/*ARGSUSED*/
@ -274,11 +274,11 @@ grfioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
gp = sc->sc_data;
if ((gp->g_flags & GF_ALIVE) == 0)
return (ENXIO);
return ENXIO;
#ifdef COMPAT_HPUX
if (l->l_proc->p_emul == &emul_hpux)
return(hpuxgrfioctl(dev, cmd, data, flag, l->l_proc));
return hpuxgrfioctl(dev, cmd, data, flag, l->l_proc);
#endif
error = 0;
switch (cmd) {
@ -308,7 +308,7 @@ grfioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
break;
}
return(error);
return error;
}
/*ARGSUSED*/
@ -317,7 +317,7 @@ grfmmap(dev_t dev, off_t off, int prot)
{
struct grf_softc *sc = grf_cd.cd_devs[GRFUNIT(dev)];
return (grfaddr(sc, off));
return grfaddr(sc, off);
}
int
@ -336,9 +336,8 @@ grfon(dev_t dev/*XXX*/)
* of the dev arg.
*/
iteoff(sc->sc_ite->sc_data, 3);
return((*gp->g_sw->gd_mode)(gp,
(dev&GRFOVDEV) ? GM_GRFOVON : GM_GRFON,
(caddr_t)0));
return (*gp->g_sw->gd_mode)(gp,
(dev & GRFOVDEV) ? GM_GRFOVON : GM_GRFON, (caddr_t)0);
}
int
@ -358,7 +357,7 @@ grfoff(dev_t dev/*XXX*/)
(caddr_t)0);
/* XXX: see comment for iteoff above */
(void) iteon(sc->sc_ite->sc_data, 2);
return(error);
return error;
}
paddr_t
@ -369,15 +368,15 @@ grfaddr(struct grf_softc *sc, off_t off)
/* control registers */
if (off >= 0 && off < gi->gd_regsize)
return(((paddr_t)gi->gd_regaddr + off) >> PGSHIFT);
return ((paddr_t)gi->gd_regaddr + off) >> PGSHIFT;
/* frame buffer */
if (off >= gi->gd_regsize && off < gi->gd_regsize+gi->gd_fbsize) {
off -= gi->gd_regsize;
return(((paddr_t)gi->gd_fbaddr + off) >> PGSHIFT);
return ((paddr_t)gi->gd_fbaddr + off) >> PGSHIFT;
}
/* bogus */
return(-1);
return -1;
}
/*
@ -484,7 +483,7 @@ hpuxgrfioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
error = EINVAL;
break;
}
return(error);
return error;
}
int
@ -514,14 +513,14 @@ grflock(struct grf_data *gp, int block)
}
if (gp->g_lockp) {
if (gp->g_lockp == p)
return(EBUSY);
return EBUSY;
if (!block)
return(OEAGAIN);
return OEAGAIN;
do {
gp->g_flags |= GF_WANTED;
if ((error = tsleep((caddr_t)&gp->g_flags,
(PZERO+1) | PCATCH, devioc, 0)))
return (error);
return error;
} while (gp->g_lockp);
}
gp->g_lockp = p;
@ -535,7 +534,7 @@ grflock(struct grf_data *gp, int block)
gp->g_lockpslot = gp->g_lock->gl_lockslot = slot;
gp->g_lock->gl_locks[slot] = 1;
}
return(0);
return 0;
}
int
@ -548,7 +547,7 @@ grfunlock(struct grf_data *gp)
gp->g_lockp ? gp->g_lockp->p_pid : -1);
#endif
if (gp->g_lockp != curproc)
return(EBUSY);
return EBUSY;
if (gp->g_pid) {
#ifdef DEBUG
if (grfdebug & GDB_LOCK)
@ -564,7 +563,7 @@ grfunlock(struct grf_data *gp)
gp->g_flags &= ~GF_WANTED;
}
gp->g_lockp = NULL;
return(0);
return 0;
}
/*
@ -584,11 +583,11 @@ grfdevno(dev_t dev)
if (unit >= grf_cd.cd_ndevs ||
(sc = grf_cd.cd_devs[unit]) == NULL)
return (bsdtohpuxdev(dev));
return bsdtohpuxdev(dev);
gp = sc->sc_data;
if ((gp->g_flags & GF_ALIVE) == 0)
return (bsdtohpuxdev(dev));
return bsdtohpuxdev(dev);
/* magic major number */
newdev = 12 << 24;
@ -603,7 +602,7 @@ grfdevno(dev_t dev)
if (grfdebug & GDB_DEVNO)
printf("grfdevno: dev %x newdev %x\n", dev, newdev);
#endif
return(newdev);
return newdev;
}
#endif /* COMPAT_HPUX */
@ -639,7 +638,7 @@ grfmap(dev_t dev, caddr_t *addrp, struct proc *p)
p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
if (error == 0)
(void) (*gp->g_sw->gd_mode)(gp, GM_MAP, *addrp);
return(error);
return error;
}
int
@ -654,7 +653,7 @@ grfunmap(dev_t dev, caddr_t addr, struct proc *p)
printf("grfunmap(%d): dev %x addr %p\n", p->p_pid, dev, addr);
#endif
if (addr == 0)
return(EINVAL); /* XXX: how do we deal with this? */
return EINVAL; /* XXX: how do we deal with this? */
(void) (*gp->g_sw->gd_mode)(gp, GM_UNMAP, 0);
size = round_page(gp->g_display.gd_regsize + gp->g_display.gd_fbsize);
uvm_unmap(&p->p_vmspace->vm_map, (vaddr_t)addr, (vaddr_t)addr + size);
@ -670,7 +669,7 @@ iommap(dev_t dev, caddr_t *addrp)
if (grfdebug & (GDB_MMAP|GDB_IOMAP))
printf("iommap(%d): addr %p\n", curproc->p_pid, *addrp);
#endif
return(EINVAL);
return EINVAL;
}
int
@ -683,7 +682,7 @@ iounmmap(dev_t dev, caddr_t addr)
printf("iounmmap(%d): id %d addr %p\n",
curproc->p_pid, unit, addr);
#endif
return(0);
return 0;
}
/*
@ -717,7 +716,7 @@ grffindpid(struct grf_data *gp)
goto done;
}
if (++i == GRFMAXLCK)
return(0);
return 0;
gp->g_pid[0] = i;
gp->g_pid[i] = pid;
done:
@ -726,7 +725,7 @@ done:
printf("grffindpid(%d): slot %d of %d\n",
pid, i, gp->g_pid[0]);
#endif
return(i);
return i;
}
void
@ -767,7 +766,7 @@ grflckmmap(dev_t dev, caddr_t *addrp)
printf("grflckmmap(%d): addr %p\n",
p->p_pid, *addrp);
#endif
return(EINVAL);
return EINVAL;
}
int
@ -780,6 +779,6 @@ grflckunmmap(dev_t dev, caddr_t addr)
printf("grflckunmmap(%d): id %d addr %p\n",
curproc->p_pid, unit, addr);
#endif
return(EINVAL);
return EINVAL;
}
#endif /* COMPAT_HPUX */

28
sys/arch/hp300/dev/grf_dv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_dv.c,v 1.32 2006/05/31 09:32:11 tsutsui Exp $ */
/* $NetBSD: grf_dv.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_dv.c,v 1.32 2006/05/31 09:32:11 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_dv.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -202,19 +202,19 @@ dvbox_intio_match(struct device *parent, struct cfdata *match, void *aux)
struct grfreg *grf;
if (strcmp("fb",ia->ia_modname) != 0)
return (0);
return 0;
if (badaddr((caddr_t)ia->ia_addr))
return (0);
return 0;
grf = (struct grfreg *)ia->ia_addr;
if (grf->gr_id == DIO_DEVICE_ID_FRAMEBUFFER &&
grf->gr_id2 == DIO_DEVICE_SECID_DAVINCI) {
return (1);
return 1;
}
return (0);
return 0;
}
static void
@ -238,9 +238,9 @@ dvbox_dio_match(struct device *parent, struct cfdata *match, void *aux)
if (da->da_id == DIO_DEVICE_ID_FRAMEBUFFER &&
da->da_secid == DIO_DEVICE_SECID_DAVINCI)
return (1);
return 1;
return (0);
return 0;
}
static void
@ -320,7 +320,7 @@ dv_init(struct grf_data *gp, int scode, caddr_t addr)
dv_reset(dbp);
}
return(1);
return 1;
}
/*
@ -456,7 +456,7 @@ dv_mode(struct grf_data *gp, int cmd, caddr_t data)
error = EINVAL;
break;
}
return(error);
return error;
}
#if NITE > 0
@ -671,14 +671,14 @@ dvboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
int size;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
grf = (struct grfreg *)va;
if (badaddr(va) ||
(grf->gr_id != GRFHWID) || (grf->gr_id2 != GID_DAVINCI)) {
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
return 1;
}
if (DIO_ISDIOII(scode))
@ -688,7 +688,7 @@ dvboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
bus_space_unmap(bst, bsh, PAGE_SIZE);
if (bus_space_map(bst, addr, size, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
/*
@ -709,7 +709,7 @@ dvboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
* Initialize the terminal emulator.
*/
itedisplaycnattach(gp, &dvbox_itesw);
return (0);
return 0;
}
#endif /* NITE > 0 */

28
sys/arch/hp300/dev/grf_gb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_gb.c,v 1.31 2006/05/31 09:32:11 tsutsui Exp $ */
/* $NetBSD: grf_gb.c,v 1.32 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -121,7 +121,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_gb.c,v 1.31 2006/05/31 09:32:11 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_gb.c,v 1.32 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -212,19 +212,19 @@ gbox_intio_match(struct device *parent, struct cfdata *match, void *aux)
struct grfreg *grf;
if (strcmp("fb",ia->ia_modname) != 0)
return (0);
return 0;
if (badaddr((caddr_t)ia->ia_addr))
return (0);
return 0;
grf = (struct grfreg *)ia->ia_addr;
if (grf->gr_id == DIO_DEVICE_ID_FRAMEBUFFER &&
grf->gr_id2 == DIO_DEVICE_SECID_GATORBOX) {
return (1);
return 1;
}
return (0);
return 0;
}
static void
@ -248,9 +248,9 @@ gbox_dio_match(struct device *parent, struct cfdata *match, void *aux)
if (da->da_id == DIO_DEVICE_ID_FRAMEBUFFER &&
da->da_secid == DIO_DEVICE_SECID_GATORBOX)
return (1);
return 1;
return (0);
return 0;
}
static void
@ -332,7 +332,7 @@ gb_init(struct grf_data *gp, int scode, caddr_t addr)
gi->gd_colors = *fbp + 1;
*fbp = save;
}
return(1);
return 1;
}
/*
@ -422,7 +422,7 @@ gb_mode(struct grf_data *gp, int cmd, caddr_t data)
error = EINVAL;
break;
}
return(error);
return error;
}
#if NITE > 0
@ -619,14 +619,14 @@ gboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
int size;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
grf = (struct grfreg *)va;
if (badaddr(va) ||
(grf->gr_id != GRFHWID) || (grf->gr_id2 != GID_GATORBOX)) {
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
return 1;
}
if (DIO_ISDIOII(scode))
@ -636,7 +636,7 @@ gboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
bus_space_unmap(bst, bsh, PAGE_SIZE);
if (bus_space_map(bst, addr, size, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
/*
@ -657,7 +657,7 @@ gboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
* Initialize the terminal emulator.
*/
itedisplaycnattach(gp, &gbox_itesw);
return (0);
return 0;
}
#endif /* NITE > 0 */

20
sys/arch/hp300/dev/grf_hy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_hy.c,v 1.29 2006/05/31 09:32:11 tsutsui Exp $ */
/* $NetBSD: grf_hy.c,v 1.30 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -120,7 +120,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_hy.c,v 1.29 2006/05/31 09:32:11 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_hy.c,v 1.30 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -200,9 +200,9 @@ hyper_dio_match(struct device *parent, struct cfdata *match, void *aux)
if (da->da_id == DIO_DEVICE_ID_FRAMEBUFFER &&
da->da_secid == DIO_DEVICE_SECID_HYPERION)
return (1);
return 1;
return (0);
return 0;
}
static void
@ -279,7 +279,7 @@ hy_init(struct grf_data *gp, int scode, caddr_t addr)
gi->gd_planes = hy->num_planes;
gi->gd_colors = 1 << gi->gd_planes;
}
return(1);
return 1;
}
/*
@ -351,7 +351,7 @@ hy_mode(struct grf_data *gp, int cmd, caddr_t data)
error = EINVAL;
break;
}
return(error);
return error;
}
#if NITE > 0
@ -761,14 +761,14 @@ hypercnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
int size;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
grf = (struct grfreg *)va;
if (badaddr(va) ||
(grf->gr_id != GRFHWID) || (grf->gr_id2 != GID_HYPERION)) {
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
return 1;
}
if (DIO_ISDIOII(scode))
@ -778,7 +778,7 @@ hypercnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
bus_space_unmap(bst, bsh, PAGE_SIZE);
if (bus_space_map(bst, addr, size, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
/*
@ -799,7 +799,7 @@ hypercnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
* Initialize the terminal emulator.
*/
itedisplaycnattach(gp, &hyper_itesw);
return (0);
return 0;
}
#endif /* NITE > 0 */

28
sys/arch/hp300/dev/grf_rb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_rb.c,v 1.32 2006/05/31 09:32:11 tsutsui Exp $ */
/* $NetBSD: grf_rb.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_rb.c,v 1.32 2006/05/31 09:32:11 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_rb.c,v 1.33 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -201,19 +201,19 @@ rbox_intio_match(struct device *parent, struct cfdata *match, void *aux)
struct grfreg *grf;
if (strcmp("fb",ia->ia_modname) != 0)
return (0);
return 0;
if (badaddr((caddr_t)ia->ia_addr))
return (0);
return 0;
grf = (struct grfreg *)ia->ia_addr;
if (grf->gr_id == DIO_DEVICE_ID_FRAMEBUFFER &&
grf->gr_id2 == DIO_DEVICE_SECID_RENASSIANCE) {
return (1);
return 1;
}
return (0);
return 0;
}
static void
@ -237,9 +237,9 @@ rbox_dio_match(struct device *parent, struct cfdata *match, void *aux)
if (da->da_id == DIO_DEVICE_ID_FRAMEBUFFER &&
da->da_secid == DIO_DEVICE_SECID_RENASSIANCE)
return (1);
return 1;
return (0);
return 0;
}
static void
@ -317,7 +317,7 @@ rb_init(struct grf_data *gp, int scode, caddr_t addr)
gi->gd_planes = 0; /* ?? */
gi->gd_colors = 256;
}
return(1);
return 1;
}
/*
@ -405,7 +405,7 @@ rb_mode(struct grf_data *gp, int cmd, caddr_t data)
error = EINVAL;
break;
}
return(error);
return error;
}
#if NITE > 0
@ -618,14 +618,14 @@ rboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
int size;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
grf = (struct grfreg *)va;
if (badaddr(va) ||
(grf->gr_id != GRFHWID) || (grf->gr_id2 != GID_RENAISSANCE)) {
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
return 1;
}
if (DIO_ISDIOII(scode))
@ -635,7 +635,7 @@ rboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
bus_space_unmap(bst, bsh, PAGE_SIZE);
if (bus_space_map(bst, addr, size, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
/*
@ -656,7 +656,7 @@ rboxcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
* Initialize the terminal emulator.
*/
itedisplaycnattach(gp, &rbox_itesw);
return (0);
return 0;
}
#endif /* NITE > 0 */

30
sys/arch/hp300/dev/grf_tc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_tc.c,v 1.34 2006/05/31 09:32:11 tsutsui Exp $ */
/* $NetBSD: grf_tc.c,v 1.35 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_tc.c,v 1.34 2006/05/31 09:32:11 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_tc.c,v 1.35 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_compat_hpux.h"
@ -218,10 +218,10 @@ topcat_intio_match(struct device *parent, struct cfdata *match, void *aux)
struct grfreg *grf;
if (strcmp("fb",ia->ia_modname) != 0)
return (0);
return 0;
if (badaddr((caddr_t)ia->ia_addr))
return (0);
return 0;
grf = (struct grfreg *)ia->ia_addr;
@ -234,11 +234,11 @@ topcat_intio_match(struct device *parent, struct cfdata *match, void *aux)
#if 0
case DIO_DEVICE_SECID_XXXCATSEYE:
#endif
return (1);
return 1;
}
}
return (0);
return 0;
}
static void
@ -269,11 +269,11 @@ topcat_dio_match(struct device *parent, struct cfdata *match, void *aux)
#if 0
case DIO_DEVICE_SECID_XXXCATSEYE:
#endif
return (1);
return 1;
}
}
return (0);
return 0;
}
static void
@ -397,7 +397,7 @@ tc_init(struct grf_data *gp, int scode, caddr_t addr)
*fbp = save;
}
}
return(1);
return 1;
}
/*
@ -494,7 +494,7 @@ tc_mode(struct grf_data *gp, int cmd, caddr_t data)
error = EINVAL;
break;
}
return(error);
return error;
}
#if NITE > 0
@ -721,13 +721,13 @@ topcatcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
int size;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
grf = (struct grfreg *)va;
if (badaddr(va) || grf->gr_id != GRFHWID) {
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
return 1;
}
switch (grf->gr_id2) {
@ -749,7 +749,7 @@ topcatcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
default:
bus_space_unmap(bst, bsh, PAGE_SIZE);
return (1);
return 1;
}
if (DIO_ISDIOII(scode))
@ -759,7 +759,7 @@ topcatcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
bus_space_unmap(bst, bsh, PAGE_SIZE);
if (bus_space_map(bst, addr, size, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
/*
@ -779,7 +779,7 @@ topcatcnattach(bus_space_tag_t bst, bus_addr_t addr, int scode)
* Initialize the terminal emulator.
*/
itedisplaycnattach(gp, &topcat_itesw);
return (0);
return 0;
}
#endif /* NITE > 0 */

104
sys/arch/hp300/dev/hil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hil.c,v 1.70 2006/05/15 12:47:13 yamt Exp $ */
/* $NetBSD: hil.c,v 1.71 2006/07/21 10:01:39 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.70 2006/05/15 12:47:13 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.71 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_compat_hpux.h"
#include "ite.h"
@ -186,9 +186,9 @@ hilmatch(struct device *parent, struct cfdata *match, void *aux)
struct intio_attach_args *ia = aux;
if (strcmp("hil", ia->ia_modname) != 0)
return (0);
return 0;
return (1);
return 1;
}
static void
@ -287,17 +287,17 @@ hilopen(dev_t dev, int flags, int mode, struct lwp *l)
#endif
if ((hilp->hl_device[HILLOOPDEV].hd_flags & HIL_ALIVE) == 0)
return(ENXIO);
return ENXIO;
dptr = &hilp->hl_device[HILUNIT(dev)];
if ((dptr->hd_flags & HIL_ALIVE) == 0)
return(ENODEV);
return ENODEV;
/*
* Pseudo-devices cannot be read, nothing more to do.
*/
if (dptr->hd_flags & HIL_PSEUDO)
return(0);
return 0;
/*
* Open semantics:
@ -310,13 +310,13 @@ hilopen(dev_t dev, int flags, int mode, struct lwp *l)
#ifdef COMPAT_HPUX
if (l->l_proc->p_emul == &emul_hpux) {
if (dptr->hd_flags & (HIL_READIN|HIL_QUEUEIN))
return(EBUSY);
return EBUSY;
dptr->hd_flags |= HIL_READIN;
} else
#endif
{
if (dptr->hd_flags & HIL_READIN)
return(EBUSY);
return EBUSY;
dptr->hd_flags |= HIL_QUEUEIN;
}
if (flags & FNONBLOCK)
@ -345,7 +345,7 @@ hilopen(dev_t dev, int flags, int mode, struct lwp *l)
#endif
}
splx(s);
return (0);
return 0;
}
/* ARGSUSED */
@ -371,7 +371,7 @@ hilclose(dev_t dev, int flags, int mode, struct lwp *l)
dptr = &hilp->hl_device[HILUNIT(dev)];
if (HILUNIT(dev) && (dptr->hd_flags & HIL_PSEUDO))
return (0);
return 0;
if (l && l->l_proc->p_emul == &emul_netbsd) {
/*
@ -428,7 +428,7 @@ hilclose(dev_t dev, int flags, int mode, struct lwp *l)
hilkbdenable(hilp);
}
splx(s);
return (0);
return 0;
}
/*
@ -454,24 +454,24 @@ hilread(dev_t dev, struct uio *uio, int flag)
* This check is necessary since loop can reconfigure.
*/
if (HILUNIT(dev) > hilp->hl_maxdev)
return(ENODEV);
return ENODEV;
#endif
dptr = &hilp->hl_device[HILUNIT(dev)];
if ((dptr->hd_flags & HIL_READIN) == 0)
return(ENODEV);
return ENODEV;
s = splhil();
while (dptr->hd_queue.c_cc == 0) {
if (dptr->hd_flags & HIL_NOBLOCK) {
spl0();
return(EWOULDBLOCK);
return EWOULDBLOCK;
}
dptr->hd_flags |= HIL_ASLEEP;
if ((error = tsleep((caddr_t)dptr,
TTIPRI | PCATCH, hilin, 0))) {
(void) spl0();
return (error);
(void)spl0();
return error;
}
}
splx(s);
@ -484,7 +484,7 @@ hilread(dev_t dev, struct uio *uio, int flag)
break;
error = uiomove(buf, cc, uio);
}
return(error);
return error;
}
static int
@ -506,7 +506,7 @@ hilioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
dptr = &hilp->hl_device[HILUNIT(dev)];
if ((dptr->hd_flags & HIL_ALIVE) == 0)
return (ENODEV);
return ENODEV;
/*
* Don't allow hardware ioctls on virtual devices.
@ -521,7 +521,7 @@ hilioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
case HILIOCRN:
case HILIOCRS:
case HILIOCED:
return(ENODEV);
return ENODEV;
/*
* XXX: should also return ENODEV but HP-UX compat
@ -541,7 +541,7 @@ hilioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
#ifdef COMPAT_HPUX
if (l->l_proc->p_emul == &emul_hpux)
return(hpuxhilioctl(dev, cmd, data, flag));
return hpuxhilioctl(dev, cmd, data, flag);
#endif
hilp->hl_cmdbp = hilp->hl_cmdbuf;
@ -658,7 +658,7 @@ hilioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
hilp->hl_cmddev = 0;
return(error);
return error;
}
#ifdef COMPAT_HPUX
@ -781,10 +781,10 @@ hpuxhilioctl(dev_t dev, int cmd, caddr_t data, int flag)
default:
hilp->hl_cmddev = 0;
return(EINVAL);
return EINVAL;
}
hilp->hl_cmddev = 0;
return(0);
return 0;
}
#endif
@ -804,7 +804,7 @@ hilpoll(dev_t dev, int events, struct lwp *l)
/* Attempt to save some work. */
if ((events & (POLLIN | POLLRDNORM)) == 0)
return (revents);
return revents;
/*
* Read interface.
@ -818,7 +818,7 @@ hilpoll(dev_t dev, int events, struct lwp *l)
else
selrecord(l, &dptr->hd_selr);
splx(s);
return (revents);
return revents;
}
/*
@ -828,7 +828,7 @@ hilpoll(dev_t dev, int events, struct lwp *l)
*/
if (HILUNIT(dev) &&
(dptr->hd_flags & (HIL_ALIVE|HIL_PSEUDO)) != HIL_ALIVE)
return (revents | (events & (POLLIN | POLLRDNORM)));
return revents | (events & (POLLIN | POLLRDNORM));
/*
* Select on loop device is special.
@ -848,12 +848,12 @@ hilpoll(dev_t dev, int events, struct lwp *l)
qp->hq_eventqueue->hil_evqueue.head !=
qp->hq_eventqueue->hil_evqueue.tail) {
splx(s);
return (revents | (events & (POLLIN | POLLRDNORM)));
return revents | (events & (POLLIN | POLLRDNORM));
}
selrecord(l, &dptr->hd_selr);
splx(s);
return (revents);
return revents;
}
static void
@ -881,7 +881,7 @@ filt_hilread(struct knote *kn, long hint)
if (dptr->hd_flags & HIL_READIN) {
kn->kn_data = dptr->hd_queue.c_cc;
return (kn->kn_data > 0);
return kn->kn_data > 0;
}
/*
@ -891,7 +891,7 @@ filt_hilread(struct knote *kn, long hint)
*/
if (device && (dptr->hd_flags & (HIL_ALIVE|HIL_PSEUDO)) != HIL_ALIVE) {
kn->kn_data = 0; /* XXXLUKEM (thorpej): what to put here? */
return (1);
return 1;
}
/*
@ -914,11 +914,11 @@ filt_hilread(struct knote *kn, long hint)
qp->hq_eventqueue->hil_evqueue.tail) {
/* XXXLUKEM (thorpej): what to put here? */
kn->kn_data = 0;
return (1);
return 1;
}
}
return (0);
return 0;
}
static const struct filterops hilread_filtops =
@ -947,7 +947,7 @@ hilkqfilter(dev_t dev, struct knote *kn)
break;
default:
return (1);
return 1;
}
kn->kn_hook = (void *)(intptr_t) dev; /* XXX yuck */
@ -956,7 +956,7 @@ hilkqfilter(dev_t dev, struct knote *kn)
SLIST_INSERT_HEAD(klist, kn, kn_selnext);
splx(s);
return (0);
return 0;
}
/*ARGSUSED*/
@ -973,7 +973,7 @@ hilint(void *v)
#if NRND > 0
rnd_add_uint32(&hilp->rnd_source, (stat<<8)|c);
#endif
return (1);
return 1;
}
static void
@ -1201,7 +1201,7 @@ hilqalloc(struct hil_softc *hilp, struct hilqinfo *qip, struct proc *p)
if (hildebug & HDB_FOLLOW)
printf("hilqalloc(%d): addr %p\n", p->p_pid, qip->addr);
#endif
return(EINVAL);
return EINVAL;
}
static int
@ -1212,7 +1212,7 @@ hilqfree(struct hil_softc *hilp, int qnum, struct proc *p)
if (hildebug & HDB_FOLLOW)
printf("hilqfree(%d): qnum %d\n", p->p_pid, qnum);
#endif
return(EINVAL);
return EINVAL;
}
static int
@ -1227,12 +1227,12 @@ hilqmap(struct hil_softc *hilp, int qnum, int device, struct proc *p)
p->p_pid, qnum, device);
#endif
if (qnum >= NHILQ || hilp->hl_queue[qnum].hq_procp != p)
return(EINVAL);
return EINVAL;
if ((dptr->hd_flags & HIL_QUEUEIN) == 0)
return(EINVAL);
return EINVAL;
if (dptr->hd_qmask && kauth_cred_geteuid(p->p_cred) &&
kauth_cred_geteuid(p->p_cred) != dptr->hd_uid)
return(EPERM);
return EPERM;
hilp->hl_queue[qnum].hq_devmask |= hildevmask(device);
if (dptr->hd_qmask == 0)
@ -1245,7 +1245,7 @@ hilqmap(struct hil_softc *hilp, int qnum, int device, struct proc *p)
printf("hilqmap(%d): devmask %x qmask %x\n",
p->p_pid, hilp->hl_queue[qnum].hq_devmask, dptr->hd_qmask);
#endif
return(0);
return 0;
}
static int
@ -1260,7 +1260,7 @@ hilqunmap(struct hil_softc *hilp, int qnum, int device, struct proc *p)
#endif
if (qnum >= NHILQ || hilp->hl_queue[qnum].hq_procp != p)
return(EINVAL);
return EINVAL;
hilp->hl_queue[qnum].hq_devmask &= ~hildevmask(device);
s = splhil();
@ -1272,7 +1272,7 @@ hilqunmap(struct hil_softc *hilp, int qnum, int device, struct proc *p)
p->p_pid, hilp->hl_queue[qnum].hq_devmask,
hilp->hl_device[device].hd_qmask);
#endif
return(0);
return 0;
}
/*
@ -1343,7 +1343,7 @@ hilkbdcngetc(int *statp)
int s;
if (hilkbd_cn_device == NULL)
return (0);
return 0;
/*
* XXX needs to be splraise because we could be called
@ -1355,7 +1355,7 @@ hilkbdcngetc(int *statp)
c = READHILDATA(hilkbd_cn_device);
splx(s);
*statp = stat;
return (c);
return c;
}
/*
@ -1371,7 +1371,7 @@ hilkbdcnattach(bus_space_tag_t bst, bus_addr_t addr)
u_char lang;
if (bus_space_map(bst, addr, PAGE_SIZE, 0, &bsh))
return (1);
return 1;
va = bus_space_vaddr(bst, bsh);
hilkbd_cn_device = (struct hil_dev *)va;
@ -1402,7 +1402,7 @@ hilkbdcnattach(bus_space_tag_t bst, bus_addr_t addr)
hilkbd_cn_ops.arg = NULL;
itekbdcnattach(&hilkbd_cn_ops, &hilkbd_cn_map);
return (0);
return 0;
}
#endif /* End of HIL console keyboard code. */
@ -1422,14 +1422,14 @@ kbdnmi(void)
struct hil_dev *hl_addr = HILADDR;
if ((*KBDNMISTAT & KBDNMI) == 0)
return(0);
return 0;
HILWAIT(hl_addr);
WRITEHILCMD(hl_addr, HIL_CNMT);
HILWAIT(hl_addr);
WRITEHILCMD(hl_addr, HIL_CNMT);
HILWAIT(hl_addr);
return(1);
return 1;
}
#define HILSECURITY 0x33
@ -1711,7 +1711,7 @@ hiliddev(struct hil_softc *hilp)
printf("not found\n");
}
#endif
return(i <= hilp->hl_maxdev ? i : 0);
return i <= hilp->hl_maxdev ? i : 0;
}
#ifdef COMPAT_HPUX
@ -1734,7 +1734,7 @@ hildevno(dev_t dev)
else
#endif
newdev |= (HILLOOP(dev) << 8) | (HILUNIT(dev) << 4);
return(newdev);
return newdev;
}
#endif

38
sys/arch/hp300/dev/hpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpib.c,v 1.33 2006/03/28 17:38:25 thorpej Exp $ */
/* $NetBSD: hpib.c,v 1.34 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.33 2006/03/28 17:38:25 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.34 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -146,7 +146,7 @@ static int
hpibbusmatch(struct device *parent, struct cfdata *match, void *aux)
{
return (1);
return 1;
}
static void
@ -244,7 +244,7 @@ hpibbussearch(struct device *parent, struct cfdata *cf,
config_attach(parent, cf, ha, hpibbusprint);
}
out:
return (0);
return 0;
}
static int
@ -253,7 +253,7 @@ hpibbusprint(void *aux, const char *pnp)
struct hpibbus_attach_args *ha = aux;
aprint_normal(" slave %d punit %d", ha->ha_slave, ha->ha_punit);
return (UNCONF);
return UNCONF;
}
int
@ -263,7 +263,7 @@ hpibdevprint(void *aux, const char *pnp)
/* only hpibbus's can attach to hpibdev's -- easy. */
if (pnp != NULL)
aprint_normal("hpibbus at %s", pnp);
return (UNCONF);
return UNCONF;
}
void
@ -285,9 +285,9 @@ hpibreq(struct device *pdev, struct hpibqueue *hq)
splx(s);
if (sc->sc_queue.tqh_first == hq)
return (1);
return 1;
return (0);
return 0;
}
void
@ -319,7 +319,7 @@ hpibid(int unit, int slave)
if (hpibrecv(unit, 31, slave, &id, 2) != 2)
id = 0;
hpibtimeout = ohpibtimeout;
return(id);
return id;
}
int
@ -327,7 +327,7 @@ hpibsend(int unit, int slave, int sec, void *addr, int cnt)
{
struct hpibbus_softc *sc = hpibbus_cd.cd_devs[unit];
return ((*sc->sc_ops->hpib_send)(sc, slave, sec, addr, cnt));
return (*sc->sc_ops->hpib_send)(sc, slave, sec, addr, cnt);
}
int
@ -335,7 +335,7 @@ hpibrecv(int unit, int slave, int sec, void *addr, int cnt)
{
struct hpibbus_softc *sc = hpibbus_cd.cd_devs[unit];
return ((*sc->sc_ops->hpib_recv)(sc, slave, sec, addr, cnt));
return (*sc->sc_ops->hpib_recv)(sc, slave, sec, addr, cnt);
}
int
@ -343,7 +343,7 @@ hpibpptest(int unit, int slave)
{
struct hpibbus_softc *sc = hpibbus_cd.cd_devs[unit];
return ((*sc->sc_ops->hpib_ppoll)(sc) & (0x80 >> slave));
return (*sc->sc_ops->hpib_ppoll)(sc) & (0x80 >> slave);
}
void
@ -375,10 +375,10 @@ hpibswait(int unit, int slave)
while (((*ppoll)(sc) & mask) == 0) {
if (--timo == 0) {
printf("%s: swait timeout\n", sc->sc_dev.dv_xname);
return(-1);
return -1;
}
}
return(0);
return 0;
}
int
@ -391,8 +391,8 @@ hpibustart(int unit)
else
sc->sc_dq->dq_chan = DMA0 | DMA1;
if (dmareq(sc->sc_dq))
return(1);
return(0);
return 1;
return 0;
}
static void
@ -426,7 +426,7 @@ hpibintr(void *arg)
{
struct hpibbus_softc *sc = arg;
return ((sc->sc_ops->hpib_intr)(arg));
return (sc->sc_ops->hpib_intr)(arg);
}
static int
@ -439,9 +439,9 @@ hpibbus_alloc(struct hpibbus_softc *sc, int slave, int punit)
if (sc->sc_rmap[slave][punit] == 0) {
sc->sc_rmap[slave][punit] = 1;
return (0);
return 0;
}
return (1);
return 1;
}
#if 0

14
sys/arch/hp300/dev/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.58 2005/12/11 12:17:14 christos Exp $ */
/* $NetBSD: if_le.c,v 1.59 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.58 2005/12/11 12:17:14 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.59 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -159,7 +159,7 @@ lerdcsr(struct lance_softc *sc, uint16_t port)
val = bus_space_read_2(bst, bsh1, LER1_RDP);
} while ((bus_space_read_1(bst, bsh0, LER0_STATUS) & LE_ACK) == 0);
return (val);
return val;
}
static int
@ -168,8 +168,8 @@ lematch(struct device *parent, struct cfdata *match, void *aux)
struct dio_attach_args *da = aux;
if (da->da_id == DIO_DEVICE_ID_LAN)
return (1);
return (0);
return 1;
return 0;
}
/*
@ -259,7 +259,7 @@ leintr(void *arg)
isr = lerdcsr(sc, LE_CSR0);
if ((isr & LE_C0_INTR) == 0)
return (0);
return 0;
if (isr & LE_C0_RINT)
ledcontrol(0, 0, LED_LANRCV);
@ -268,7 +268,7 @@ leintr(void *arg)
ledcontrol(0, 0, LED_LANXMT);
#endif /* USELEDS */
return (am7990_intr(sc));
return am7990_intr(sc);
}
static void

42
sys/arch/hp300/dev/ite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ite.c,v 1.73 2006/05/14 21:55:10 elad Exp $ */
/* $NetBSD: ite.c,v 1.74 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -119,7 +119,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.73 2006/05/14 21:55:10 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.74 2006/07/21 10:01:39 tsutsui Exp $");
#include "hil.h"
@ -241,7 +241,7 @@ static int
itematch(struct device *parent, struct cfdata *match, void *aux)
{
return (1);
return 1;
}
static void
@ -285,6 +285,7 @@ iteattach(struct device *parent, struct device *self, void *aux)
void
iteinstallkeymap(void *v)
{
ite_km = (struct kbdmap *)v;
}
@ -296,7 +297,7 @@ iteon(struct ite_data *ip, int flag)
{
if ((ip->flags & ITE_ALIVE) == 0)
return(ENXIO);
return ENXIO;
/* force ite active, overriding graphics mode */
if (flag & 1) {
@ -308,18 +309,18 @@ iteon(struct ite_data *ip, int flag)
if (flag & 2) {
ip->flags &= ~ITE_INGRF;
if ((ip->flags & ITE_ACTIVE) == 0)
return(0);
return 0;
}
ip->flags |= ITE_ACTIVE;
if (ip->flags & ITE_INGRF)
return(0);
return 0;
if (console_kbdops != NULL)
(*console_kbdops->enable)(console_kbdops->arg);
iteinit(ip);
return(0);
return 0;
}
static void
@ -391,7 +392,7 @@ iteopen(dev_t dev, int mode, int devtype, struct lwp *l)
if (unit >= ite_cd.cd_ndevs ||
(sc = ite_cd.cd_devs[unit]) == NULL)
return (ENXIO);
return ENXIO;
ip = sc->sc_data;
if (ip->tty == NULL) {
@ -400,12 +401,13 @@ iteopen(dev_t dev, int mode, int devtype, struct lwp *l)
} else
tp = ip->tty;
if ((tp->t_state&(TS_ISOPEN|TS_XCLUDE)) == (TS_ISOPEN|TS_XCLUDE)
&& kauth_authorize_generic(l->l_proc->p_cred, KAUTH_GENERIC_ISSUSER, &l->l_proc->p_acflag) != 0)
return (EBUSY);
&& kauth_authorize_generic(l->l_proc->p_cred,
KAUTH_GENERIC_ISSUSER, &l->l_proc->p_acflag) != 0)
return EBUSY;
if ((ip->flags & ITE_ACTIVE) == 0) {
error = iteon(ip, 0);
if (error)
return (error);
return error;
first = 1;
}
tp->t_oproc = itestart;
@ -427,7 +429,7 @@ iteopen(dev_t dev, int mode, int devtype, struct lwp *l)
tp->t_winsize.ws_col = ip->cols;
} else if (first)
iteoff(ip, 0);
return (error);
return error;
}
/*ARGSUSED*/
@ -446,7 +448,7 @@ iteclose(dev_t dev, int flag, int mode, struct lwp *l)
ttyfree(tp);
ip->tty = (struct tty *)0;
#endif
return(0);
return 0;
}
static int
@ -455,7 +457,7 @@ iteread(dev_t dev, struct uio *uio, int flag)
struct ite_softc *sc = ite_cd.cd_devs[ITEUNIT(dev)];
struct tty *tp = sc->sc_data->tty;
return ((*tp->t_linesw->l_read)(tp, uio, flag));
return (*tp->t_linesw->l_read)(tp, uio, flag);
}
int
@ -464,7 +466,7 @@ itewrite(dev_t dev, struct uio *uio, int flag)
struct ite_softc *sc = ite_cd.cd_devs[ITEUNIT(dev)];
struct tty *tp = sc->sc_data->tty;
return ((*tp->t_linesw->l_write)(tp, uio, flag));
return (*tp->t_linesw->l_write)(tp, uio, flag);
}
int
@ -473,7 +475,7 @@ itepoll(dev_t dev, int events, struct lwp *l)
struct ite_softc *sc = ite_cd.cd_devs[ITEUNIT(dev)];
struct tty *tp = sc->sc_data->tty;
return ((*tp->t_linesw->l_poll)(tp, events, l));
return (*tp->t_linesw->l_poll)(tp, events, l);
}
struct tty *
@ -481,7 +483,7 @@ itetty(dev_t dev)
{
struct ite_softc *sc = ite_cd.cd_devs[ITEUNIT(dev)];
return (sc->sc_data->tty);
return sc->sc_data->tty;
}
int
@ -494,7 +496,7 @@ iteioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
error = (*tp->t_linesw->l_ioctl)(tp, cmd, addr, flag, l);
if (error != EPASSTHROUGH)
return (error);
return error;
return ttioctl(tp, cmd, addr, flag, l);
}
@ -1031,7 +1033,7 @@ itecngetc(dev_t dev)
int stat;
if (console_kbdops == NULL)
return (-1);
return -1;
c = (*console_kbdops->getc)(&stat);
switch ((stat >> KBD_SSHIFT) & KBD_SMASK) {
@ -1048,7 +1050,7 @@ itecngetc(dev_t dev)
c = 0;
break;
}
return(c);
return c;
}
/* ARGSUSED */

54
sys/arch/hp300/dev/mt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mt.c,v 1.34 2006/03/28 17:38:25 thorpej Exp $ */
/* $NetBSD: mt.c,v 1.35 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.34 2006/03/28 17:38:25 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.35 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -174,7 +174,7 @@ mtmatch(struct device *parent, struct cfdata *match, void *aux)
{
struct hpibbus_attach_args *ha = aux;
return (mtident(NULL, ha));
return mtident(NULL, ha);
}
static void
@ -220,10 +220,10 @@ mtident(struct mt_softc *sc, struct hpibbus_attach_args *ha)
sc->sc_type = mtinfo[i].hwid;
printf(": %s tape\n", mtinfo[i].desc);
}
return (1);
return 1;
}
}
return (0);
return 0;
}
/*
@ -249,10 +249,10 @@ mtreaddsj(struct mt_softc *sc, int ecmd)
if (sc->sc_recvtimeo == 0)
sc->sc_recvtimeo = hz;
if (--sc->sc_recvtimeo == 0)
return (-1);
return -1;
if (retval == 0)
sc->sc_flags |= MTF_DSJTIMEO;
return (-2);
return -2;
}
sc->sc_recvtimeo = 0;
sc->sc_statindex = 0;
@ -263,7 +263,7 @@ mtreaddsj(struct mt_softc *sc, int ecmd)
case 0:
if (ecmd & MTE_DSJ_FORCE)
break;
return (0);
return 0;
case 2:
sc->sc_lastecmd = MTE_COMPLETE;
@ -273,7 +273,7 @@ mtreaddsj(struct mt_softc *sc, int ecmd)
default:
log(LOG_ERR, "%s readdsj: DSJ 0x%x\n", sc->sc_dev.dv_xname,
sc->sc_lastdsj);
return (-1);
return -1;
}
getstats:
retval = hpibrecv(sc->sc_hpibno,
@ -290,11 +290,11 @@ mtreaddsj(struct mt_softc *sc, int ecmd)
sc->sc_flags |= MTF_STATCONT;
}
sc->sc_flags |= MTF_STATTIMEO;
return (-2);
return -2;
}
log(LOG_ERR, "%s readdsj: can't read status",
sc->sc_dev.dv_xname);
return (-1);
return -1;
}
sc->sc_recvtimeo = 0;
sc->sc_statindex = 0;
@ -305,7 +305,7 @@ mtreaddsj(struct mt_softc *sc, int ecmd)
if (sc->sc_lastecmd)
(void) hpibsend(sc->sc_hpibno, sc->sc_slave,
MTL_ECMD, &(sc->sc_lastecmd), 1);
return ((int) sc->sc_lastdsj);
return (int)sc->sc_lastdsj;
}
static int
@ -319,12 +319,12 @@ mtopen(dev_t dev, int flag, int mode, struct lwp *l)
if (unit >= mt_cd.cd_ndevs ||
(sc = mt_cd.cd_devs[unit]) == NULL ||
(sc->sc_flags & MTF_EXISTS) == 0)
return (ENXIO);
return ENXIO;
dlog(LOG_DEBUG, "%s open: flags 0x%x", sc->sc_dev.dv_xname,
sc->sc_flags);
if (sc->sc_flags & MTF_OPEN)
return (EBUSY);
return EBUSY;
sc->sc_flags |= MTF_OPEN;
sc->sc_ttyp = tprintf_open(l->l_proc);
if ((sc->sc_flags & MTF_ALIVE) == 0) {
@ -405,10 +405,10 @@ mtopen(dev_t dev, int flag, int mode, struct lwp *l)
sc->sc_density = req_den;
}
}
return (0);
return 0;
errout:
sc->sc_flags &= ~MTF_OPEN;
return (error);
return error;
}
static int
@ -424,7 +424,7 @@ mtclose(dev_t dev, int flag, int fmt, struct lwp *l)
(void) mtcommand(dev, MTREW, 0);
sc->sc_flags &= ~MTF_OPEN;
tprintf_close(sc->sc_ttyp);
return (0);
return 0;
}
static int
@ -436,7 +436,7 @@ mtcommand(dev_t dev, int cmd, int cnt)
#if 1
if (bp->b_flags & B_BUSY)
return (EBUSY);
return EBUSY;
#endif
bp->b_cmd = cmd;
bp->b_dev = dev;
@ -454,7 +454,7 @@ mtcommand(dev_t dev, int cmd, int cnt)
#else
bp->b_flags &= ~B_BUSY;
#endif
return (error);
return error;
}
/*
@ -932,8 +932,8 @@ mtread(dev_t dev, struct uio *uio, int flags)
{
struct mt_softc *sc = mt_cd.cd_devs[UNIT(dev)];
return(physio(mtstrategy, &sc->sc_bufstore,
dev, B_READ, minphys, uio));
return physio(mtstrategy, &sc->sc_bufstore,
dev, B_READ, minphys, uio);
}
static int
@ -941,8 +941,8 @@ mtwrite(dev_t dev, struct uio *uio, int flags)
{
struct mt_softc *sc = mt_cd.cd_devs[UNIT(dev)];
return(physio(mtstrategy, &sc->sc_bufstore,
dev, B_WRITE, minphys, uio));
return physio(mtstrategy, &sc->sc_bufstore,
dev, B_WRITE, minphys, uio);
}
static int
@ -970,15 +970,15 @@ mtioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
break;
default:
return (EINVAL);
return EINVAL;
}
return (mtcommand(dev, op->mt_op, cnt));
return mtcommand(dev, op->mt_op, cnt);
case MTIOCGET:
break;
default:
return (EINVAL);
return EINVAL;
}
return (0);
return 0;
}

36
sys/arch/hp300/dev/nhpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nhpib.c,v 1.34 2006/03/19 06:47:35 tsutsui Exp $ */
/* $NetBSD: nhpib.c,v 1.35 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.34 2006/03/19 06:47:35 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.35 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -177,9 +177,9 @@ nhpib_intio_match(struct device *parent, struct cfdata *match, void *aux)
struct intio_attach_args *ia = aux;
if (strcmp("hpib", ia->ia_modname) == 0)
return (1);
return 1;
return (0);
return 0;
}
static int
@ -188,9 +188,9 @@ nhpib_dio_match(struct device *parent, struct cfdata *match, void *aux)
struct dio_attach_args *da = aux;
if (da->da_id == DIO_DEVICE_ID_NHPIB)
return (1);
return 1;
return (0);
return 0;
}
static void
@ -213,7 +213,7 @@ nhpib_intio_attach(struct device *parent, struct device *self, void *aux)
nhpib_common_attach(sc, desc);
/* establish the interrupt handler */
(void) intio_intr_establish(nhpibintr, sc, ia->ia_ipl, IPL_BIO);
(void)intio_intr_establish(nhpibintr, sc, ia->ia_ipl, IPL_BIO);
}
static void
@ -289,6 +289,7 @@ nhpibreset(struct hpibbus_softc *hs)
static void
nhpibifc(struct nhpibdevice *hd)
{
hd->hpib_acr = AUX_TCA;
hd->hpib_acr = AUX_CSRE;
hd->hpib_acr = AUX_SSIC;
@ -346,11 +347,11 @@ nhpibsend(struct hpibbus_softc *hs, int slave, int sec, void *ptr, int origcnt)
(void) nhpibwait(hd, MIS_BO);
#endif
}
return(origcnt);
return origcnt;
senderror:
nhpibifc(hd);
return(origcnt - cnt - 1);
return origcnt - cnt - 1;
}
static int
@ -396,12 +397,12 @@ nhpibrecv(struct hpibbus_softc *hs, int slave, int sec, void *ptr, int origcnt)
hd->hpib_data = (slave == 31) ? C_UNA_P : C_UNT_P;
(void) nhpibwait(hd, MIS_BO);
}
return(origcnt);
return origcnt;
recverror:
nhpibifc(hd);
recvbyteserror:
return(origcnt - cnt - 1);
return origcnt - cnt - 1;
}
static void
@ -519,10 +520,11 @@ nhpibintr(void *arg)
int stat1;
#ifdef lint
if (stat1 = unit) return(1);
if (stat1 = unit)
return 1;
#endif
if ((hd->hpib_ids & IDS_IR) == 0)
return(0);
return 0;
stat0 = hd->hpib_mis;
stat1 = hd->hpib_lis;
@ -553,7 +555,7 @@ nhpibintr(void *arg)
hs->sc_dev.dv_xname, stat0);
#endif
}
return(1);
return 1;
}
static int
@ -568,7 +570,7 @@ nhpibppoll(struct hpibbus_softc *hs)
DELAY(25);
ppoll = hd->hpib_cpt;
hd->hpib_acr = AUX_CPP;
return(ppoll);
return ppoll;
}
#ifdef DEBUG
@ -587,9 +589,9 @@ nhpibwait(struct nhpibdevice *hd, int x)
if (nhpibreporttimo)
printf("hpib0: %s timo\n", x==MIS_BO?"OUT":"IN");
#endif
return(-1);
return -1;
}
return(0);
return 0;
}
static void

36
sys/arch/hp300/dev/ppi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ppi.c,v 1.33 2006/03/28 17:38:25 thorpej Exp $ */
/* $NetBSD: ppi.c,v 1.34 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.33 2006/03/28 17:38:25 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.34 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -156,7 +156,7 @@ ppimatch(struct device *parent, struct cfdata *match, void *aux)
* device by mistake.
*/
if (ha->ha_id & 0x200)
return (0);
return 0;
/*
* To prevent matching all unused slots on the bus, we
@ -164,9 +164,9 @@ ppimatch(struct device *parent, struct cfdata *match, void *aux)
*/
if (match->hpibbuscf_slave == HPIBBUSCF_SLAVE_DEFAULT ||
match->hpibbuscf_punit == HPIBBUSCF_PUNIT_DEFAULT)
return (0);
return 0;
return (1);
return 1;
}
static void
@ -207,7 +207,7 @@ ppiopen(dev_t dev, int flags, int fmt, struct lwp *l)
if (unit >= ppi_cd.cd_ndevs ||
(sc = ppi_cd.cd_devs[unit]) == NULL ||
(sc->sc_flags & PPIF_ALIVE) == 0)
return (ENXIO);
return ENXIO;
#ifdef DEBUG
if (ppidebug & PDB_FOLLOW)
@ -215,13 +215,13 @@ ppiopen(dev_t dev, int flags, int fmt, struct lwp *l)
dev, flags, sc->sc_flags);
#endif
if (sc->sc_flags & PPIF_OPEN)
return (EBUSY);
return EBUSY;
sc->sc_flags |= PPIF_OPEN;
sc->sc_burst = PPI_BURST;
sc->sc_timo = ppimstohz(PPI_TIMO);
sc->sc_delay = ppimstohz(PPI_DELAY);
sc->sc_sec = -1;
return(0);
return 0;
}
static int
@ -236,7 +236,7 @@ ppiclose(dev_t dev, int flags, int fmt, struct lwp *l)
dev, flags, sc->sc_flags);
#endif
sc->sc_flags &= ~PPIF_OPEN;
return(0);
return 0;
}
static void
@ -273,7 +273,7 @@ ppiread(dev_t dev, struct uio *uio, int flags)
if (ppidebug & PDB_FOLLOW)
printf("ppiread(%x, %p)\n", dev, uio);
#endif
return (ppirw(dev, uio));
return ppirw(dev, uio);
}
static int
@ -284,7 +284,7 @@ ppiwrite(dev_t dev, struct uio *uio, int flags)
if (ppidebug & PDB_FOLLOW)
printf("ppiwrite(%x, %p)\n", dev, uio);
#endif
return (ppirw(dev, uio));
return ppirw(dev, uio);
}
static int
@ -299,7 +299,7 @@ ppirw(dev_t dev, struct uio *uio)
char *buf;
if (uio->uio_resid == 0)
return(0);
return 0;
ctlr = device_unit(device_parent(&sc->sc_dev));
slave = sc->sc_slave;
@ -442,7 +442,7 @@ again:
if (ppidebug & (PDB_FOLLOW|PDB_IO))
printf("ppirw: return %d, resid %d\n", error, uio->uio_resid);
#endif
return (error);
return error;
}
static int
@ -465,7 +465,7 @@ ppiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
upp = (struct ppiparam *)data;
if (upp->burst < PPI_BURST_MIN || upp->burst > PPI_BURST_MAX ||
upp->delay < PPI_DELAY_MIN || upp->delay > PPI_DELAY_MAX)
return(EINVAL);
return EINVAL;
pp->burst = upp->burst;
pp->timo = ppimstohz(upp->timo);
pp->delay = ppimstohz(upp->delay);
@ -474,9 +474,9 @@ ppiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
sc->sc_sec = *(int *)data;
break;
default:
return(EINVAL);
return EINVAL;
}
return (error);
return error;
}
static int
@ -487,7 +487,7 @@ ppihztoms(int h)
if (m > 0)
m = m * 1000 / hz;
return(m);
return m;
}
static int
@ -501,5 +501,5 @@ ppimstohz(int m)
if (h == 0)
h = 1000 / hz;
}
return(h);
return h;
}

137
sys/arch/hp300/dev/rd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rd.c,v 1.77 2006/06/16 23:56:58 tsutsui Exp $ */
/* $NetBSD: rd.c,v 1.78 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.77 2006/06/16 23:56:58 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.78 2006/07/21 10:01:39 tsutsui Exp $");
#include "opt_useleds.h"
#include "rnd.h"
@ -359,9 +359,9 @@ rdmatch(struct device *parent, struct cfdata *match, void *aux)
*/
delay(10000);
ha->ha_id = hpibid(device_unit(parent), ha->ha_slave);
return (rdident(parent, NULL, ha));
return rdident(parent, NULL, ha);
}
return (1);
return 1;
}
static void
@ -408,7 +408,7 @@ rdattach(struct device *parent, struct device *self, void *aux)
* attach the device into the random source list
*/
rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname,
RND_TYPE_DISK, 0);
RND_TYPE_DISK, 0);
#endif
}
@ -426,21 +426,21 @@ rdident(struct device *parent, struct rd_softc *sc,
/* Verify that we have a CS80 device. */
if ((ha->ha_id & 0x200) == 0)
return (0);
return 0;
/* Is it one of the disks we support? */
for (id = 0; id < numrdidentinfo; id++)
if (ha->ha_id == rdidentinfo[id].ri_hwid)
break;
if (id == numrdidentinfo || ha->ha_punit > rdidentinfo[id].ri_maxunum)
return (0);
return 0;
/*
* If we're just probing for the device, that's all the
* work we need to do.
*/
if (sc == NULL)
return (1);
return 1;
/*
* Reset device and collect description
@ -522,7 +522,7 @@ rdident(struct device *parent, struct rd_softc *sc,
rdidentinfo[id].ri_ntpc, rdidentinfo[id].ri_nblocks,
DEV_BSIZE);
return (1);
return 1;
}
static void
@ -584,7 +584,7 @@ rdgetinfo(dev_t dev)
*/
msg = readdisklabel(rdlabdev(dev), rdstrategy, lp, NULL);
if (msg == NULL)
return (0);
return 0;
pi = lp->d_partitions;
printf("%s: WARNING: %s\n", rs->sc_dev.dv_xname, msg);
@ -594,7 +594,7 @@ rdgetinfo(dev_t dev)
lp->d_npartitions = 3;
pi[0].p_size = 0;
return(0);
return 0;
}
static int
@ -607,7 +607,7 @@ rdopen(dev_t dev, int flags, int mode, struct lwp *l)
if (unit >= rd_cd.cd_ndevs ||
(rs = rd_cd.cd_devs[unit]) == NULL ||
(rs->sc_flags & RDF_ALIVE) == 0)
return (ENXIO);
return ENXIO;
/*
* Wait for any pending opens/closes to complete
@ -626,7 +626,7 @@ rdopen(dev_t dev, int flags, int mode, struct lwp *l)
rs->sc_flags &= ~RDF_OPENING;
wakeup((caddr_t)rs);
if (error)
return(error);
return error;
}
part = rdpart(dev);
@ -636,7 +636,7 @@ rdopen(dev_t dev, int flags, int mode, struct lwp *l)
if (part != RAW_PART &&
(part > rs->sc_dkdev.dk_label->d_npartitions ||
rs->sc_dkdev.dk_label->d_partitions[part].p_fstype == FS_UNUSED))
return (ENXIO);
return ENXIO;
/* Ensure only one open at a time. */
switch (mode) {
@ -650,7 +650,7 @@ rdopen(dev_t dev, int flags, int mode, struct lwp *l)
rs->sc_dkdev.dk_openmask =
rs->sc_dkdev.dk_copenmask | rs->sc_dkdev.dk_bopenmask;
return(0);
return 0;
}
static int
@ -685,7 +685,7 @@ rdclose(dev_t dev, int flag, int mode, struct lwp *l)
rs->sc_flags &= ~(RDF_CLOSING|RDF_WLABEL);
wakeup((caddr_t)rs);
}
return(0);
return 0;
}
static void
@ -789,13 +789,13 @@ rdfinish(struct rd_softc *rs, struct buf *bp)
biodone(bp);
hpibfree(device_parent(&rs->sc_dev), &rs->sc_hq);
if ((bp = BUFQ_PEEK(rs->sc_tab)) != NULL)
return (bp);
return bp;
rs->sc_active = 0;
if (rs->sc_flags & RDF_WANTED) {
rs->sc_flags &= ~RDF_WANTED;
wakeup((caddr_t)&rs->sc_tab);
}
return (NULL);
return NULL;
}
static void
@ -913,7 +913,7 @@ rdintr(void *arg)
#ifdef DEBUG
if (rddebug & RDB_FOLLOW)
printf("rdintr(%d): bp %p, %c, flags %x\n", unit, bp,
(bp->b_flags & B_READ) ? 'R' : 'W', rs->sc_flags);
(bp->b_flags & B_READ) ? 'R' : 'W', rs->sc_flags);
if (bp == NULL) {
printf("%s: bp == NULL\n", rs->sc_dev.dv_xname);
return;
@ -989,29 +989,29 @@ rdstatus(struct rd_softc *rs)
#ifdef DEBUG
if (rddebug & RDB_STATUS)
printf("rdstatus: send C_CMD failed %d != %d\n",
rv, sizeof(rs->sc_rsc));
rv, sizeof(rs->sc_rsc));
#endif
return(1);
return 1;
}
rv = hpibrecv(c, s, C_EXEC, &rs->sc_stat, sizeof(rs->sc_stat));
if (rv != sizeof(rs->sc_stat)) {
#ifdef DEBUG
if (rddebug & RDB_STATUS)
printf("rdstatus: send C_EXEC failed %d != %d\n",
rv, sizeof(rs->sc_stat));
rv, sizeof(rs->sc_stat));
#endif
return(1);
return 1;
}
rv = hpibrecv(c, s, C_QSTAT, &stat, 1);
if (rv != 1 || stat) {
#ifdef DEBUG
if (rddebug & RDB_STATUS)
printf("rdstatus: recv failed %d or bad stat %d\n",
rv, stat);
rv, stat);
#endif
return(1);
return 1;
}
return(0);
return 0;
}
/*
@ -1033,14 +1033,14 @@ rderror(int unit)
printf("%s: couldn't get status\n", rs->sc_dev.dv_xname);
#endif
rdreset(rs);
return(1);
return 1;
}
sp = &rs->sc_stat;
if (sp->c_fef & FEF_REXMT)
return(1);
return 1;
if (sp->c_fef & FEF_PF) {
rdreset(rs);
return(1);
return 1;
}
/*
* Unit requests release for internal maintenance.
@ -1054,12 +1054,12 @@ rderror(int unit)
int rdtimo = RDWAITC << rs->sc_errcnt;
#ifdef DEBUG
printf("%s: internal maintenance, %d second timeout\n",
rs->sc_dev.dv_xname, rdtimo);
rs->sc_dev.dv_xname, rdtimo);
rs->sc_stats.rdtimeouts++;
#endif
hpibfree(device_parent(&rs->sc_dev), &rs->sc_hq);
callout_reset(&rs->sc_restart_ch, rdtimo * hz, rdrestart, rs);
return(0);
return 0;
}
/*
* Only report error if we have reached the error reporting
@ -1067,7 +1067,7 @@ rderror(int unit)
* retry limit has been exceeded.
*/
if (rs->sc_errcnt < rderrthresh)
return(1);
return 1;
/*
* First conjure up the block number at which the error occurred.
@ -1102,7 +1102,7 @@ rderror(int unit)
if (rddebug & RDB_ERROR) {
/* status info */
printf("\n volume: %d, unit: %d\n",
(sp->c_vu>>4)&0xF, sp->c_vu&0xF);
(sp->c_vu>>4)&0xF, sp->c_vu&0xF);
rdprinterr("reject", sp->c_ref, err_reject);
rdprinterr("fault", sp->c_fef, err_fault);
rdprinterr("access", sp->c_aef, err_access);
@ -1119,31 +1119,31 @@ rderror(int unit)
printf("0x%x", *(u_short *)&rs->sc_ioc.c_nop2);
printf("0x%x", *(u_int *)&rs->sc_ioc.c_len);
printf("0x%x\n", *(u_short *)&rs->sc_ioc.c_cmd);
return(1);
return 1;
}
#endif
printf(" v%d u%d, R0x%x F0x%x A0x%x I0x%x\n",
(sp->c_vu>>4)&0xF, sp->c_vu&0xF,
sp->c_ref, sp->c_fef, sp->c_aef, sp->c_ief);
(sp->c_vu>>4)&0xF, sp->c_vu&0xF,
sp->c_ref, sp->c_fef, sp->c_aef, sp->c_ief);
printf("P1-P10: ");
printf("0x%x", *(u_int *)&sp->c_raw[0]);
printf("0x%x", *(u_int *)&sp->c_raw[4]);
printf("0x%x\n", *(u_short *)&sp->c_raw[8]);
return(1);
return 1;
}
static int
rdread(dev_t dev, struct uio *uio, int flags)
{
return (physio(rdstrategy, NULL, dev, B_READ, minphys, uio));
return physio(rdstrategy, NULL, dev, B_READ, minphys, uio);
}
static int
rdwrite(dev_t dev, struct uio *uio, int flags)
{
return (physio(rdstrategy, NULL, dev, B_WRITE, minphys, uio));
return physio(rdstrategy, NULL, dev, B_WRITE, minphys, uio);
}
static int
@ -1157,52 +1157,49 @@ rdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
switch (cmd) {
case DIOCGDINFO:
*(struct disklabel *)data = *lp;
return (0);
return 0;
case DIOCGPART:
((struct partinfo *)data)->disklab = lp;
((struct partinfo *)data)->part =
&lp->d_partitions[rdpart(dev)];
return (0);
&lp->d_partitions[rdpart(dev)];
return 0;
case DIOCWLABEL:
if ((flag & FWRITE) == 0)
return (EBADF);
return EBADF;
if (*(int *)data)
sc->sc_flags |= RDF_WLABEL;
else
sc->sc_flags &= ~RDF_WLABEL;
return (0);
return 0;
case DIOCSDINFO:
if ((flag & FWRITE) == 0)
return (EBADF);
return (setdisklabel(lp, (struct disklabel *)data,
(sc->sc_flags & RDF_WLABEL) ? 0
: sc->sc_dkdev.dk_openmask,
(struct cpu_disklabel *)0));
return EBADF;
return setdisklabel(lp, (struct disklabel *)data,
(sc->sc_flags & RDF_WLABEL) ? 0 : sc->sc_dkdev.dk_openmask,
NULL);
case DIOCWDINFO:
if ((flag & FWRITE) == 0)
return (EBADF);
return EBADF;
error = setdisklabel(lp, (struct disklabel *)data,
(sc->sc_flags & RDF_WLABEL) ? 0
: sc->sc_dkdev.dk_openmask,
(struct cpu_disklabel *)0);
(sc->sc_flags & RDF_WLABEL) ? 0 : sc->sc_dkdev.dk_openmask,
NULL);
if (error)
return (error);
return error;
flags = sc->sc_flags;
sc->sc_flags = RDF_ALIVE | RDF_WLABEL;
error = writedisklabel(rdlabdev(dev), rdstrategy, lp,
(struct cpu_disklabel *)0);
error = writedisklabel(rdlabdev(dev), rdstrategy, lp, NULL);
sc->sc_flags = flags;
return (error);
return error;
case DIOCGDEFLABEL:
rdgetdefaultlabel(sc, (struct disklabel *)data);
return (0);
return 0;
}
return(EINVAL);
return EINVAL;
}
static void
@ -1248,7 +1245,7 @@ rdsize(dev_t dev)
if (unit >= rd_cd.cd_ndevs ||
(rs = rd_cd.cd_devs[unit]) == NULL ||
(rs->sc_flags & RDF_ALIVE) == 0)
return (-1);
return -1;
/*
* We get called very early on (via swapconf)
@ -1257,14 +1254,14 @@ rdsize(dev_t dev)
*/
if (rs->sc_dkdev.dk_openmask == 0) {
if (rdopen(dev, FREAD|FWRITE, S_IFBLK, NULL))
return(-1);
return -1;
didopen = 1;
}
psize = rs->sc_dkdev.dk_label->d_partitions[rdpart(dev)].p_size *
(rs->sc_dkdev.dk_label->d_secsize / DEV_BSIZE);
if (didopen)
(void) rdclose(dev, FREAD|FWRITE, S_IFBLK, NULL);
return (psize);
(void)rdclose(dev, FREAD|FWRITE, S_IFBLK, NULL);
return psize;
}
#ifdef DEBUG
@ -1306,7 +1303,7 @@ rddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
/* Check for recursive dump; if so, punt. */
if (rddoingadump)
return (EFAULT);
return EFAULT;
rddoingadump = 1;
/* Decompose unit and partition. */
@ -1317,7 +1314,7 @@ rddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
if (unit >= rd_cd.cd_ndevs ||
(rs = rd_cd.cd_devs[unit]) == NULL ||
(rs->sc_flags & RDF_ALIVE) == 0)
return (ENXIO);
return ENXIO;
ctlr = device_unit(device_parent(&rs->sc_dev));
slave = rs->sc_slave;
@ -1328,7 +1325,7 @@ rddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
lp = rs->sc_dkdev.dk_label;
sectorsize = lp->d_secsize;
if ((size % sectorsize) != 0)
return (EFAULT);
return EFAULT;
totwrt = size / sectorsize;
blkno = dbtob(blkno) / sectorsize; /* blkno in DEV_BSIZE units */
@ -1337,7 +1334,7 @@ rddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
/* Check transfer bounds against partition size. */
if ((blkno < 0) || (blkno + totwrt) > nsects)
return (EINVAL);
return EINVAL;
/* Offset block number to start of partition. */
blkno += sectoff;
@ -1360,7 +1357,7 @@ rddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
hpibsend(ctlr, slave, C_CMD, &rs->sc_ioc.c_unit,
sizeof(rs->sc_ioc)-2);
if (hpibswait(ctlr, slave))
return (EIO);
return EIO;
/*
* Send the data.
@ -1369,7 +1366,7 @@ rddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
(void) hpibswait(ctlr, slave);
hpibrecv(ctlr, slave, C_QSTAT, &stat, 1);
if (stat)
return (EIO);
return EIO;
#else /* RD_DUMP_NOT_TRUSTED */
/* Let's just talk about this first... */
printf("%s: dump addr %p, blk %d\n", sc->sc_dev.dv_xname,
@ -1383,5 +1380,5 @@ rddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
va += sectorsize * nwrt;
}
rddoingadump = 0;
return (0);
return 0;
}

26
sys/arch/hp300/dev/rtc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtc.c,v 1.15 2005/12/11 12:17:14 christos Exp $ */
/* $NetBSD: rtc.c,v 1.16 2006/07/21 10:01:39 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.15 2005/12/11 12:17:14 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -120,9 +120,9 @@ rtcmatch(struct device *parent, struct cfdata *match, void *aux)
struct intio_attach_args *ia = aux;
if (strcmp("rtc", ia->ia_modname) != 0)
return (0);
return 0;
return (1);
return 1;
}
static void
@ -192,11 +192,11 @@ rtc_gettime(todr_chip_handle_t handle, volatile struct timeval *tv)
/* simple sanity checks */
if (dt.dt_mon > 12 || dt.dt_day > 31 ||
dt.dt_hour >= 24 || dt.dt_min >= 60 || dt.dt_sec >= 60)
return (1);
return 1;
tv->tv_sec = clock_ymdhms_to_secs(&dt);
tv->tv_usec = 0;
return (0);
return 0;
}
static int
@ -236,20 +236,22 @@ rtc_settime(todr_chip_handle_t handle, volatile struct timeval *tv)
for (i = 0; i < NUM_RTC_REGS; i++)
if (rtc_registers[i] !=
rtc_writereg(sc, i, rtc_registers[i]))
return (1);
return (0);
return 1;
return 0;
}
static int
rtc_getcal(todr_chip_handle_t handle, int *vp)
{
return (EOPNOTSUPP);
return EOPNOTSUPP;
}
static int
rtc_setcal(todr_chip_handle_t handle, int v)
{
return (EOPNOTSUPP);
return EOPNOTSUPP;
}
static uint8_t
@ -265,7 +267,7 @@ rtc_readreg(struct rtc_softc *sc, int reg)
intio_device_readcmd(bst, bsh, RTC_READ_REG, &data);
splx(s);
return (data);
return data;
}
static uint8_t
@ -282,5 +284,5 @@ rtc_writereg(struct rtc_softc *sc, int reg, uint8_t data)
intio_device_readcmd(bst, bsh, RTC_READ_REG, &tmp);
splx(s);
return (tmp);
return tmp;
}

28
sys/arch/hp300/hp300/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.80 2006/07/19 17:21:23 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.81 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@ -143,7 +143,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.80 2006/07/19 17:21:23 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.81 2006/07/21 10:01:39 tsutsui Exp $");
#include "hil.h"
#include "dvbox.h"
@ -303,10 +303,10 @@ mainbusmatch(struct device *parent, struct cfdata *match, void *aux)
/* Allow only one instance. */
if (mainbus_matched)
return (0);
return 0;
mainbus_matched = 1;
return (1);
return 1;
}
static void
@ -326,7 +326,7 @@ mainbussearch(struct device *parent, struct cfdata *cf,
if (config_match(parent, cf, NULL) > 0)
config_attach(parent, cf, NULL, NULL);
return (0);
return 0;
}
/*
@ -753,7 +753,7 @@ dev_data_lookup(struct device *dev)
for (dd = dev_data_list.lh_first; dd != NULL; dd = dd->dd_list.le_next)
if (dd->dd_dev == dev)
return (dd);
return dd;
panic("dev_data_lookup");
}
@ -902,14 +902,14 @@ dio_scan(int (*func)(bus_space_tag_t, bus_addr_t, int))
if (DIO_INHOLE(scode) || ((scode == 7) && internalhpib))
continue;
if (!dio_scode_probe(scode, func))
return (0);
return 0;
}
#else
if (!dio_scode_probe(CONSCODE, func))
return (0);
return 0;
#endif
return (1);
return 1;
}
static int
@ -926,14 +926,14 @@ dio_scode_probe(int scode,
pa = dio_scodetopa(scode);
va = iomap(pa, PAGE_SIZE);
if (va == 0)
return (1);
return 1;
if (badaddr(va)) {
iounmap(va, PAGE_SIZE);
return (1);
return 1;
}
iounmap(va, PAGE_SIZE);
return ((*func)(bst, (bus_addr_t)pa, scode));
return (*func)(bst, (bus_addr_t)pa, scode);
}
@ -974,10 +974,10 @@ iomap(caddr_t pa, int size)
EX_FAST | EX_NOWAIT | (extio_ex_malloc_safe ? EX_MALLOCOK : 0),
&kva);
if (error)
return (0);
return 0;
physaccess((caddr_t) kva, pa, size, PG_RW|PG_CI);
return ((caddr_t) kva);
return (caddr_t)kva;
}
/*

18
sys/arch/hp300/hp300/bus_space.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_space.c,v 1.11 2005/12/11 12:17:18 christos Exp $ */
/* $NetBSD: bus_space.c,v 1.12 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.11 2005/12/11 12:17:18 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.12 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -70,7 +70,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags,
* do the translation.
*/
*bshp = (bus_space_handle_t)IIOV(INTIOBASE + bpa);
return (0);
return 0;
}
if (t->bustype != HP300_BUS_SPACE_DIO)
@ -85,7 +85,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags,
EX_FAST | EX_NOWAIT | (extio_ex_malloc_safe ? EX_MALLOCOK : 0),
&kva);
if (error)
return (error);
return error;
/*
* Map the range. The range is always cache-inhibited on the hp300.
@ -96,7 +96,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags,
* All done.
*/
*bshp = (bus_space_handle_t)(kva + offset);
return (0);
return 0;
}
/* ARGSUSED */
@ -109,7 +109,7 @@ bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend,
/*
* Not meaningful on any currently-supported hp300 bus.
*/
return (EINVAL);
return EINVAL;
}
/* ARGSUSED */
@ -171,7 +171,7 @@ bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
{
*nbshp = bsh + offset;
return (0);
return 0;
}
/* ARGSUSED */
@ -185,7 +185,7 @@ hp300_bus_space_probe(bus_space_tag_t t, bus_space_handle_t bsh,
nofault = (int *)&faultbuf;
if (setjmp((label_t *)nofault)) {
nofault = NULL;
return (0);
return 0;
}
switch (sz) {
@ -207,5 +207,5 @@ hp300_bus_space_probe(bus_space_tag_t t, bus_space_handle_t bsh,
}
nofault = NULL;
return (1);
return 1;
}

8
sys/arch/hp300/hp300/dkbad.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dkbad.c,v 1.10 2005/12/11 12:17:18 christos Exp $ */
/* $NetBSD: dkbad.c,v 1.11 2006/07/21 10:01:39 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dkbad.c,v 1.10 2005/12/11 12:17:18 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: dkbad.c,v 1.11 2006/07/21 10:01:39 tsutsui Exp $");
#ifndef NOBADSECT
#include <sys/param.h>
@ -55,10 +55,10 @@ isbad(struct dkbad *bt, int cyl, int trk, int sec)
for (i = 0; i < 126; i++) {
bblk = ((long)bt->bt_bad[i].bt_cyl << 16) + bt->bt_bad[i].bt_trksec;
if (blk == bblk)
return (i);
return i;
if (blk < bblk || bblk < 0)
break;
}
return (-1);
return -1;
}
#endif

42
sys/arch/hp300/hp300/hpux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpux_machdep.c,v 1.42 2005/12/11 12:17:18 christos Exp $ */
/* $NetBSD: hpux_machdep.c,v 1.43 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpux_machdep.c,v 1.42 2005/12/11 12:17:18 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpux_machdep.c,v 1.43 2006/07/21 10:01:39 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -204,7 +204,7 @@ hpux_cpu_makecmds(struct lwp *l, struct exec_package *epp)
/* set up command for exec header */
NEW_VMCMD(&epp->ep_vmcmds, hpux_cpu_vmcmd,
sizeof(struct hpux_exec), (long)epp->ep_hdr, NULLVP, 0, 0);
return (0);
return 0;
}
/*
@ -236,7 +236,7 @@ hpux_cpu_vmcmd(struct lwp *l, struct exec_vmcmd *ev)
l->l_proc->p_md.mdp_flags &= ~MDP_CCBSTACK;
}
return (0);
return 0;
}
/*
@ -248,13 +248,13 @@ hpux_cpu_sysconf_arch(void)
switch (cputype) {
case CPU_68020:
return (HPUX_SYSCONF_CPUM020);
return HPUX_SYSCONF_CPUM020;
case CPU_68030:
return (HPUX_SYSCONF_CPUM030);
return HPUX_SYSCONF_CPUM030;
default:
return (HPUX_SYSCONF_CPUM040);
return HPUX_SYSCONF_CPUM040;
}
/* NOTREACHED */
}
@ -286,7 +286,7 @@ hpux_sys_advise(struct lwp *l, void *v, register_t *retval)
break;
}
return (error);
return error;
}
/*
@ -302,7 +302,7 @@ hpux_sys_getcontext(struct lwp *lp, void *v, register_t *retval)
int len;
if (SCARG(uap, len) <= 0)
return (EINVAL);
return EINVAL;
for (i = 0; context_table[i].str != NULL; i++)
if (context_table[i].val == fputype)
@ -320,7 +320,7 @@ hpux_sys_getcontext(struct lwp *lp, void *v, register_t *retval)
error = copyout(str, SCARG(uap, buf), len);
if (error == 0)
*retval = l;
return (0);
return 0;
}
#if 0 /* XXX This really, really doesn't work anymore. --scottr */
@ -340,7 +340,7 @@ hpux_to_bsd_uoff(int *off, int *isps, struct lwp *l)
/* u_ar0 field; procxmt puts in U_ar0 */
if ((int)off == HPUOFF(hpuxu_ar0))
return(UOFF(U_ar0));
return UOFF(U_ar0);
if (fputype) {
/* FP registers from PCB */
@ -348,10 +348,10 @@ hpux_to_bsd_uoff(int *off, int *isps, struct lwp *l)
bp = (struct bsdfp *)UOFF(u_pcb.pcb_fpregs);
if (off >= hp->hpfp_ctrl && off < &hp->hpfp_ctrl[3])
return((int)&bp->ctrl[off - hp->hpfp_ctrl]);
return (int)&bp->ctrl[off - hp->hpfp_ctrl];
if (off >= hp->hpfp_reg && off < &hp->hpfp_reg[24])
return((int)&bp->reg[off - hp->hpfp_reg]);
return (int)&bp->reg[off - hp->hpfp_reg];
}
/*
@ -397,11 +397,11 @@ hpux_to_bsd_uoff(int *off, int *isps, struct lwp *l)
*/
else
raddr = (u_int) &ar0[(int)(off - ar0)];
return((int)(raddr - (u_int)l->l_addr)); /* XXX */
return (int)(raddr - (u_int)l->l_addr); /* XXX */
}
/* everything else */
return (-1);
return -1;
}
#endif
@ -603,15 +603,15 @@ hpux_sys_sigreturn(struct lwp *l, void *v, register_t *retval)
printf("sigreturn: pid %d, scp %p\n", p->p_pid, scp);
#endif
if ((int)scp & 1)
return (EINVAL);
return EINVAL;
if (copyin(scp, &tsigc, sizeof(tsigc)))
return (EFAULT);
return EFAULT;
scp = &tsigc;
/* Make sure the user isn't pulling a fast one on us! */
if ((scp->hsc_ps & (PSL_MBZ|PSL_IPL|PSL_S)) != 0)
return (EINVAL);
return EINVAL;
/* Restore register context. */
frame = (struct frame *) l->l_md.md_regs;
@ -638,7 +638,7 @@ hpux_sys_sigreturn(struct lwp *l, void *v, register_t *retval)
* fuword failed (bogus _hsc_ap value).
*/
if (flags == -1)
return (EINVAL);
return EINVAL;
if (flags == 0 || copyin((caddr_t)rf, (caddr_t)&tstate, sizeof tstate))
goto restore;
@ -660,7 +660,7 @@ hpux_sys_sigreturn(struct lwp *l, void *v, register_t *retval)
sz = tstate.hss_frame.f_format;
if (sz > 15 || (sz = exframesize[sz]) < 0 ||
frame->f_stackadj < sz)
return (EINVAL);
return EINVAL;
frame->f_stackadj -= sz;
frame->f_format = tstate.hss_frame.f_format;
frame->f_vector = tstate.hss_frame.f_vector;
@ -714,7 +714,7 @@ hpux_sys_sigreturn(struct lwp *l, void *v, register_t *retval)
((hpuxsigdebug & SDB_KSTACK) && p->p_pid == hpuxsigpid))
printf("sigreturn(%d): returns\n", p->p_pid);
#endif
return (EJUSTRETURN);
return EJUSTRETURN;
}
/*

6
sys/arch/hp300/hp300/intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.27 2006/03/19 06:13:43 tsutsui Exp $ */
/* $NetBSD: intr.c,v 1.28 2006/07/21 10:01:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.27 2006/03/19 06:13:43 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.28 2006/07/21 10:01:39 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@ -251,7 +251,7 @@ intr_establish(int (*func)(void *), void *arg, int ipl, int priority)
compute:
/* Compute new interrupt levels. */
intr_computeipl();
return (newih);
return newih;
}
/*

36
sys/arch/hp300/hp300/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.187 2006/07/20 13:21:38 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.188 2006/07/21 10:01:40 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.187 2006/07/20 13:21:38 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.188 2006/07/21 10:01:40 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_hpux.h"
@ -801,7 +801,7 @@ cpu_dump(int (*dump)(dev_t, daddr_t, caddr_t, size_t), daddr_t *blknop)
memcpy(chdr, &cpu_kcore_hdr, sizeof(cpu_kcore_hdr_t));
error = (*dump)(dumpdev, *blknop, (caddr_t)buf, sizeof(buf));
*blknop += btodb(sizeof(buf));
return (error);
return error;
}
/*
@ -987,11 +987,11 @@ badaddr(caddr_t addr)
nofault = (int *) &faultbuf;
if (setjmp((label_t *)nofault)) {
nofault = (int *) 0;
return(1);
return 1;
}
i = *(volatile short *)addr;
nofault = (int *) 0;
return(0);
return 0;
}
int
@ -1003,11 +1003,11 @@ badbaddr(caddr_t addr)
nofault = (int *) &faultbuf;
if (setjmp((label_t *)nofault)) {
nofault = (int *) 0;
return(1);
return 1;
}
i = *(volatile char *)addr;
nofault = (int *) 0;
return(0);
return 0;
}
/*
@ -1023,17 +1023,17 @@ lookup_bootinfo(int type)
/* Check for a bootinfo record first. */
if (help == NULL)
return (NULL);
return NULL;
do {
bt = (struct btinfo_common *)help;
if (bt->type == type)
return (help);
return help;
help += bt->next;
} while (bt->next != 0 &&
(size_t)help < (size_t)bootinfo_va + BOOTINFO_SIZE);
return (NULL);
return NULL;
}
#if defined(PANICBUTTON) && !defined(DDB)
@ -1158,13 +1158,13 @@ static int
parityerror(struct frame *fp)
{
if (!gotparmem)
return(0);
return 0;
*PARREG = 0;
DELAY(10);
*PARREG = 1;
if (panicstr) {
printf("parity error after panic ignored\n");
return(1);
return 1;
}
if (!parityerrorfind())
printf("WARNING: transient parity error ignored\n");
@ -1181,7 +1181,7 @@ parityerror(struct frame *fp)
regdump((struct trapframe *)fp, 128);
panic("kernel parity error");
}
return(1);
return 1;
}
/*
@ -1199,7 +1199,9 @@ parityerrorfind(void)
int found;
#ifdef lint
i = o = pg = 0; if (i) return(0);
i = o = pg = 0;
if (i)
return 0;
#endif
/*
* If looking is true we are searching for a known parity error
@ -1246,7 +1248,7 @@ done:
pmap_update(pmap_kernel());
ecacheon();
splx(s);
return(found);
return found;
}
/*
@ -1280,12 +1282,12 @@ cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
#ifdef COMPAT_NOMID
case (MID_ZERO << 16) | ZMAGIC:
error = exec_aout_prep_oldzmagic(l, epp);
return(error);
return error;
#endif
#ifdef COMPAT_44
case (MID_HP300 << 16) | ZMAGIC:
error = exec_aout_prep_oldzmagic(l, epp);
return(error);
return error;
#endif
}
#endif /* !(defined(COMPAT_NOMID) || defined(COMPAT_44)) */

26
sys/arch/hp300/hp300/mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.43 2006/03/19 06:13:43 tsutsui Exp $ */
/* $NetBSD: mem.c,v 1.44 2006/07/21 10:01:40 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.43 2006/03/19 06:13:43 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.44 2006/07/21 10:01:40 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -122,7 +122,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
error = tsleep((caddr_t)&physlock, PZERO | PCATCH,
"mmrw", 0);
if (error)
return (error);
return error;
}
physlock = 1;
}
@ -166,7 +166,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
c = min(iov->iov_len, MAXPHYS);
if (!uvm_kernacc((caddr_t)v, c,
uio->uio_rw == UIO_READ ? B_READ : B_WRITE))
return (EFAULT);
return EFAULT;
/*
* Don't allow reading intio or dio
@ -175,9 +175,9 @@ mmrw(dev_t dev, struct uio *uio, int flags)
*/
if (ISIIOVA(v) ||
((caddr_t)v >= extiobase &&
(caddr_t)v < (extiobase +
(EIOMAPSIZE * PAGE_SIZE))))
return (EFAULT);
(caddr_t)v <
(extiobase + (EIOMAPSIZE * PAGE_SIZE))))
return EFAULT;
error = uiomove((caddr_t)v, c, uio);
continue;
@ -185,7 +185,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
case DEV_NULL:
if (uio->uio_rw == UIO_WRITE)
uio->uio_resid = 0;
return (0);
return 0;
case DEV_ZERO:
if (uio->uio_rw == UIO_WRITE) {
@ -205,7 +205,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
continue;
default:
return (ENXIO);
return ENXIO;
}
if (error)
break;
@ -220,7 +220,7 @@ unlock:
wakeup((caddr_t)&physlock);
physlock = 0;
}
return (error);
return error;
}
static paddr_t
@ -235,12 +235,12 @@ mmmmap(dev_t dev, off_t off, int prot)
* pager in mmap().
*/
if (minor(dev) != DEV_MEM)
return (-1);
return -1;
/*
* Allow access only in RAM.
*/
if ((u_int)off < lowram || (u_int)off >= 0xFFFFFFFC)
return (-1);
return (m68k_btop((u_int)off));
return -1;
return m68k_btop((u_int)off);
}

6
sys/arch/hp300/hp300/softintr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: softintr.c,v 1.8 2006/03/19 06:13:43 tsutsui Exp $ */
/* $NetBSD: softintr.c,v 1.9 2006/07/21 10:01:40 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.8 2006/03/19 06:13:43 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.9 2006/07/21 10:01:40 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -156,7 +156,7 @@ softintr_establish(int ipl, void (*func)(void *), void *arg)
LIST_INSERT_HEAD(&hsi->hsi_q, sih, sih_q);
splx(s);
}
return (sih);
return sih;
}
/*