Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/amiga/dev Make these compile again, plus minor aest...
details: https://anonhg.NetBSD.org/src/rev/efe02eb21667
branches: trunk
changeset: 502174:efe02eb21667
user: aymeric <aymeric%NetBSD.org@localhost>
date: Sat Jan 13 02:09:27 2001 +0000
description:
Make these compile again, plus minor aesthetic changes.
diffstat:
sys/arch/amiga/dev/ite.c | 24 ++++++++++++------------
sys/arch/amiga/dev/mfc.c | 22 +++++++++++-----------
sys/arch/amiga/dev/msc.c | 24 ++++++++++++------------
sys/arch/amiga/dev/ser.c | 22 +++++++++++-----------
4 files changed, 46 insertions(+), 46 deletions(-)
diffs (truncated from 375 to 300 lines):
diff -r 3c5c0e8fa022 -r efe02eb21667 sys/arch/amiga/dev/ite.c
--- a/sys/arch/amiga/dev/ite.c Sat Jan 13 02:08:15 2001 +0000
+++ b/sys/arch/amiga/dev/ite.c Sat Jan 13 02:09:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.54 2000/11/02 00:28:01 eeh Exp $ */
+/* $NetBSD: ite.c,v 1.55 2001/01/13 02:09:27 aymeric Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -473,7 +473,7 @@
if (error)
goto bad;
- error = (*tp->t_linesw->l_open) (dev, tp);
+ error = tp->t_linesw->l_open(dev, tp);
if (error)
goto bad;
@@ -498,7 +498,7 @@
tp = getitesp(dev)->tp;
KDASSERT(tp);
- (*tp->t_linesw->l_close) (tp, flag);
+ tp->t_linesw->l_close(tp, flag);
ttyclose(tp);
ite_off(dev, 0);
return (0);
@@ -515,7 +515,7 @@
tp = getitesp(dev)->tp;
KDASSERT(tp);
- return ((*tp->t_linesw->l_read) (tp, uio, flag));
+ return tp->t_linesw->l_read(tp, uio, flag);
}
int
@@ -529,7 +529,7 @@
tp = getitesp(dev)->tp;
KDASSERT(tp);
- return ((*tp->t_linesw->l_write) (tp, uio, flag));
+ return tp->t_linesw->l_write(tp, uio, flag);
}
struct tty *
@@ -566,7 +566,7 @@
KDASSERT(tp);
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, addr, flag, p);
+ error = tp->t_linesw->l_ioctl(tp, cmd, addr, flag, p);
if (error >= 0)
return (error);
error = ttioctl(tp, cmd, addr, flag, p);
@@ -1026,9 +1026,9 @@
* keypad-appmode sends SS3 followed by the above
* translated character
*/
- (*linesw[kbd_tty->t_line].l_rint) (27, kbd_tty);
- (*linesw[kbd_tty->t_line].l_rint) ('O', kbd_tty);
- (*linesw[kbd_tty->t_line].l_rint) (out[cp - in], kbd_tty);
+ kbd_tty->t_linesw->l_rint(27, kbd_tty);
+ kbd_tty->t_linesw->l_rint('O', kbd_tty);
+ kbd_tty->t_linesw->l_rint(out[cp - in], kbd_tty);
splx(s);
return;
} else {
@@ -1057,11 +1057,11 @@
* in the default keymap
*/
for (i = *str++; i; i--)
- (*linesw[kbd_tty->t_line].l_rint) (*str++, kbd_tty);
+ kbd_tty->t_linesw->l_rint(*str++, kbd_tty);
splx(s);
return;
}
- (*linesw[kbd_tty->t_line].l_rint) (code, kbd_tty);
+ kbd_tty->t_linesw->l_rint(code, kbd_tty);
splx(s);
return;
@@ -1077,7 +1077,7 @@
kbd_tty = kbd_ite->tp;
KDASSERT(kbd_tty);
while (*str)
- (*linesw[kbd_tty->t_line].l_rint) (*str++, kbd_tty);
+ kbd_tty->t_linesw->l_rint(*str++, kbd_tty);
}
static void
diff -r 3c5c0e8fa022 -r efe02eb21667 sys/arch/amiga/dev/mfc.c
--- a/sys/arch/amiga/dev/mfc.c Sat Jan 13 02:08:15 2001 +0000
+++ b/sys/arch/amiga/dev/mfc.c Sat Jan 13 02:09:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfc.c,v 1.21 2000/11/02 00:28:01 eeh Exp $ */
+/* $NetBSD: mfc.c,v 1.22 2001/01/13 02:09:27 aymeric Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -552,7 +552,7 @@
* use of the tty with a dialin open waiting.
*/
tp->t_dev = dev;
- return((*tp->t_linesw->l_open)(dev, tp));
+ return tp->t_linesw->l_open(dev, tp);
}
/*ARGSUSED*/
@@ -570,7 +570,7 @@
unit = dev & 31;
tp = sc->sc_tty;
- (*tp->t_linesw->l_close)(tp, flag);
+ tp->t_linesw->l_close(tp, flag);
sc->sc_duart->ch_cr = 0x70; /* stop break */
scc->imask &= ~(0x7 << ((unit & 1) * 4));
@@ -610,7 +610,7 @@
struct tty *tp = sc->sc_tty;
if (tp == NULL)
return(ENXIO);
- return((*tp->t_linesw->l_read)(tp, uio, flag));
+ return tp->t_linesw->l_read(tp, uio, flag);
}
int
@@ -624,7 +624,7 @@
if (tp == NULL)
return(ENXIO);
- return((*tp->t_linesw->l_write)(tp, uio, flag));
+ return tp->t_linesw->l_write(tp, uio, flag);
}
struct tty *
@@ -652,7 +652,7 @@
if (!tp)
return ENXIO;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = tp->t_linesw->l_ioctl(tp, cmd, data, flag, p);
if (error >= 0)
return(error);
@@ -1008,7 +1008,7 @@
tp->t_state &= ~(TS_BUSY | TS_FLUSH);
scc->imask &= ~0x01;
regs->du_imr = scc->imask;
- add_sicallback (tp->t_line ?
+ add_sicallback (tp->t_linesw ?
(sifunc_t)tp->t_linesw->l_start
: (sifunc_t)mfcsstart, tp, NULL);
@@ -1023,7 +1023,7 @@
tp->t_state &= ~(TS_BUSY | TS_FLUSH);
scc->imask &= ~0x10;
regs->du_imr = scc->imask;
- add_sicallback (tp->t_line ?
+ add_sicallback (tp->t_linesw ?
(sifunc_t)tp->t_linesw->l_start
: (sifunc_t)mfcsstart, tp, NULL);
}
@@ -1116,7 +1116,7 @@
log(LOG_WARNING, "%s: fifo overflow\n",
((struct mfcs_softc *)mfcs_cd.cd_devs[unit])->sc_dev.dv_xname);
- (*tp->t_linesw->l_rint)(c, tp);
+ tp->t_linesw->l_rint(c, tp);
}
/*
@@ -1159,8 +1159,8 @@
if ((istat & (0x10 << (unit & 1))) && /* CD changed */
(SWFLAGS(tp->t_dev) & TIOCFLAG_SOFTCAR) == 0) {
if (stat & (0x10 << (unit & 1)))
- (*tp->t_linesw->l_modem)(tp, 1);
- else if ((*tp->t_linesw->l_modem)(tp, 0) == 0) {
+ tp->t_linesw->l_modem(tp, 1);
+ else if (tp->t_linesw->l_modem(tp, 0) == 0) {
sc->sc_regs->du_btrst = 0x0a << (unit & 1);
}
}
diff -r 3c5c0e8fa022 -r efe02eb21667 sys/arch/amiga/dev/msc.c
--- a/sys/arch/amiga/dev/msc.c Sat Jan 13 02:08:15 2001 +0000
+++ b/sys/arch/amiga/dev/msc.c Sat Jan 13 02:09:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msc.c,v 1.16 2000/11/02 00:28:01 eeh Exp $ */
+/* $NetBSD: msc.c,v 1.17 2001/01/13 02:09:27 aymeric Exp $ */
/*
* Copyright (c) 1993 Zik.
@@ -418,7 +418,7 @@
*/
tp->t_dev = dev;
- return((*tp->t_linesw->l_open)(dev, tp));
+ return tp->t_linesw->l_open(dev, tp);
}
@@ -447,7 +447,7 @@
ms = &msc->board->Status[msc->port];
tp = msc_tty[MSCTTY(dev)];
- (*tp->t_linesw->l_close)(tp, flag);
+ tp->t_linesw->l_close(tp, flag);
(void) mscmctl(dev, 0, DMSET);
@@ -475,7 +475,7 @@
if (! tp)
return ENXIO;
- return((*tp->t_linesw->l_read)(tp, uio, flag));
+ return tp->t_linesw->l_read(tp, uio, flag);
}
@@ -492,7 +492,7 @@
if (! tp)
return ENXIO;
- return ((*tp->t_linesw->l_write)(tp, uio, flag));
+ return tp->t_linesw->l_write(tp, uio, flag);
}
@@ -560,7 +560,7 @@
if (MSCDIALIN(tp->t_dev))
#endif
{
- if ((*tp->t_linesw->l_modem)(tp, 0) == 0) {
+ if (tp->t_linesw->l_modem(tp, 0) == 0) {
/* clear RTS and DTR, bitbucket output */
ms = &msc->board->Status[msc->port];
ms->Command = (ms->Command & ~MSCCMD_CMask) |
@@ -579,7 +579,7 @@
if ((tp = msc_tty[MSCTTYSLOT(MSCSLOTUL(unit, i))]) &&
(tp->t_state & TS_ISOPEN) && tp->t_wopen == 0) {
if (MSCDIALIN(tp->t_dev))
- (*tp->t_linesw->l_modem)(tp, 1);
+ tp->t_linesw->l_modem(tp, 1);
} /* if tp valid and port open */
} /* CD on/off */
} /* if CD changed for this line */
@@ -625,7 +625,7 @@
case MSCINCTL_EVENT:
switch (ibuf[bufpos++]) {
case MSCEVENT_Break:
- (*tp->t_linesw->l_rint)(TTY_FE, tp);
+ tp->t_linesw->l_rint(TTY_FE, tp);
break;
default:
@@ -638,7 +638,7 @@
if (tp->t_state & TS_TBLOCK) {
goto NoRoomForYa;
}
- (*tp->t_linesw->l_rint)((int)ibuf[bufpos++], tp);
+ tp->t_linesw->l_rint((int)ibuf[bufpos++], tp);
break;
default:
@@ -661,8 +661,8 @@
if (tp->t_state & TS_BUSY) {
if (bufpos < IOBUFLOWWATER) {
tp->t_state &= ~TS_BUSY; /* not busy any more */
- if (tp->t_line)
- (*tp->t_linesw->l_start)(tp);
+ if (tp->t_linesw)
+ tp->t_linesw->l_start(tp);
else
mscstart(tp);
}
@@ -757,7 +757,7 @@
if (!(tp = msc_tty[MSCTTY(dev)]))
return ENXIO;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = tp->t_linesw->l_ioctl(tp, cmd, data, flag, p);
if (error >= 0)
return (error);
diff -r 3c5c0e8fa022 -r efe02eb21667 sys/arch/amiga/dev/ser.c
--- a/sys/arch/amiga/dev/ser.c Sat Jan 13 02:08:15 2001 +0000
+++ b/sys/arch/amiga/dev/ser.c Sat Jan 13 02:09:27 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.54 2000/11/02 00:28:01 eeh Exp $ */
+/* $NetBSD: ser.c,v 1.55 2001/01/13 02:09:27 aymeric Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -347,7 +347,7 @@
if (error)
goto bad;
- error = (*tp->t_linesw->l_open)(dev, tp);
+ error = tp->t_linesw->l_open(dev, tp);
if (error)
goto bad;
Home |
Main Index |
Thread Index |
Old Index