Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/hp300/dev/dcm.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/hp300/dev/dcm.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.68 retrieving revision 1.68.8.4 diff -u -p -r1.68 -r1.68.8.4 --- src/sys/arch/hp300/dev/dcm.c 2005/12/11 12:17:13 1.68 +++ src/sys/arch/hp300/dev/dcm.c 2006/09/14 12:31:09 1.68.8.4 @@ -1,4 +1,4 @@ -/* $NetBSD: dcm.c,v 1.68 2005/12/11 12:17:13 christos Exp $ */ +/* $NetBSD: dcm.c,v 1.68.8.4 2006/09/14 12:31:09 yamt Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -123,7 +123,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.68 2005/12/11 12:17:13 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.68.8.4 2006/09/14 12:31:09 yamt Exp $"); #include "opt_kgdb.h" @@ -139,6 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.68 #include #include #include +#include #include @@ -385,10 +386,10 @@ dcmmatch(struct device *parent, struct c switch (da->da_id) { case DIO_DEVICE_ID_DCM: case DIO_DEVICE_ID_DCMREM: - return (1); + return 1; } - return (0); + return 0; } static void @@ -397,7 +398,7 @@ dcmattach(struct device *parent, struct struct dcm_softc *sc = (struct dcm_softc *)self; struct dio_attach_args *da = aux; struct dcmdevice *dcm; - int brd = self->dv_unit; + int brd = device_unit(self); int scode = da->da_scode; int i, mbits, code; @@ -438,8 +439,8 @@ dcmattach(struct device *parent, struct } /* Extract configuration info from flags. */ - sc->sc_softCAR = self->dv_cfdata->cf_flags & DCM_SOFTCAR; - sc->sc_flags |= self->dv_cfdata->cf_flags & DCM_FLAGMASK; + sc->sc_softCAR = device_cfdata(self)->cf_flags & DCM_SOFTCAR; + sc->sc_flags |= device_cfdata(self)->cf_flags & DCM_FLAGMASK; /* Mark our unit as configured. */ sc->sc_flags |= DCM_ACTIVE; @@ -534,10 +535,10 @@ dcmopen(dev_t dev, int flag, int mode, s 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(); @@ -551,8 +552,9 @@ dcmopen(dev_t dev, int flag, int mode, s if ((tp->t_state & TS_ISOPEN) && (tp->t_state & TS_XCLUDE) && - suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0) - return (EBUSY); + kauth_authorize_generic(l->l_cred, KAUTH_GENERIC_ISSUSER, + &l->l_acflag) != 0) + return EBUSY; s = spltty(); @@ -608,7 +610,7 @@ dcmopen(dev_t dev, int flag, int mode, s error = (*tp->t_linesw->l_open)(dev, tp); bad: - return (error); + return error; } /*ARGSUSED*/ @@ -645,7 +647,7 @@ dcmclose(dev_t dev, int flag, int mode, ttyfree(tp); sc->sc_tty[port] == NULL; #endif - return (0); + return 0; } static int @@ -662,7 +664,7 @@ dcmread(dev_t dev, struct uio *uio, int 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 @@ -679,7 +681,7 @@ dcmwrite(dev_t dev, struct uio *uio, int 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 @@ -696,7 +698,7 @@ dcmpoll(dev_t dev, int events, struct lw 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 * @@ -711,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 @@ -720,7 +722,7 @@ dcmintr(void *arg) struct dcm_softc *sc = arg; struct dcmdevice *dcm = sc->sc_dcm; struct dcmischeme *dis = &sc->sc_scheme; - int brd = sc->sc_dev.dv_unit; + int brd = device_unit(&sc->sc_dev); int code, i; int pcnd[4], mcode, mcnd[4]; @@ -731,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; @@ -788,7 +790,7 @@ dcmintr(void *arg) * See if it is time to check/change the interrupt rate. */ if (dcmistype < 0 && - (i = time.tv_sec - dis->dis_time) >= dcminterval) { + (i = time_second - dis->dis_time) >= dcminterval) { /* * If currently per-character and averaged over 70 interrupts * per-second (66 is threshold of 600 baud) in last interval, @@ -812,9 +814,9 @@ dcmintr(void *arg) dcmrint(sc); } dis->dis_intr = dis->dis_char = 0; - dis->dis_time = time.tv_sec; + dis->dis_time = time_second; } - return (1); + return 1; } /* @@ -1018,11 +1020,11 @@ dcmioctl(dev_t dev, u_long cmd, caddr_t 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: @@ -1086,9 +1088,10 @@ dcmioctl(dev_t dev, u_long cmd, caddr_t case TIOCSFLAGS: { int userbits; - error = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag); + error = kauth_authorize_generic(l->l_cred, + KAUTH_GENERIC_ISSUSER, &l->l_acflag); if (error) - return (EPERM); + return EPERM; userbits = *(int *)data; @@ -1104,9 +1107,9 @@ dcmioctl(dev_t dev, u_long cmd, caddr_t } default: - return (EPASSTHROUGH); + return EPASSTHROUGH; } - return (0); + return 0; } static int @@ -1126,14 +1129,14 @@ dcmparam(struct tty *tp, struct termios /* 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; @@ -1183,7 +1186,7 @@ dcmparam(struct tty *tp, struct termios * XXX why do we do this? */ DELAY(16 * DCM_USPERCH(tp->t_ospeed)); - return (0); + return 0; } static void @@ -1384,7 +1387,7 @@ dcmmctl(dev_t dev, int bits, int how) DELAY(10); /* delay until done */ splx(s); } - return (bits); + return bits; } /* @@ -1530,7 +1533,7 @@ dcmselftest(struct dcm_softc *sc) out: splx(s); - return (rv); + return rv; } /* @@ -1546,7 +1549,7 @@ dcmcnattach(bus_space_tag_t bst, bus_add 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; @@ -1596,11 +1599,11 @@ dcmcnattach(bus_space_tag_t bst, bus_add #endif - return (0); + return 0; error: bus_space_unmap(bst, bsh, DIOCSIZE); - return (1); + return 1; } /* ARGSUSED */ @@ -1632,7 +1635,7 @@ dcmcngetc(dev_t dev) stat = fifo->data_stat; pp->r_head = (head + 2) & RX_MASK; splx(s); - return (c); + return c; } /*