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

Adapt to the new line discipline scheme.

This commit is contained in:
eeh 2000-11-02 00:21:03 +00:00
parent 507aaec04c
commit 23a0c49039
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/sparc64/dev/kd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kd.c,v 1.13 2000/09/21 23:14:40 eeh Exp $ */
/* $NetBSD: kd.c,v 1.14 2000/11/02 00:21:03 eeh Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -224,7 +224,7 @@ static int firstopen = 1;
splx(s);
return ((*linesw[tp->t_line].l_open)(dev, tp));
return ((*tp->t_linesw->l_open)(dev, tp));
}
int
@ -244,7 +244,7 @@ kdclose(dev, flag, mode, p)
if ((tp->t_state & TS_ISOPEN) == 0)
return 0;
(*linesw[tp->t_line].l_close)(tp, flag);
(*tp->t_linesw->l_close)(tp, flag);
ttyclose(tp);
if ((cc = kd->kd_in) != NULL)
@ -265,7 +265,7 @@ kdread(dev, uio, flag)
kd = &kd_softc; /* XXX */
tp = kd->kd_tty;
return ((*linesw[tp->t_line].l_read)(tp, uio, flag));
return ((*tp->t_linesw->l_read)(tp, uio, flag));
}
int
@ -280,7 +280,7 @@ kdwrite(dev, uio, flag)
kd = &kd_softc; /* XXX */
tp = kd->kd_tty;
return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
return ((*tp->t_linesw->l_write)(tp, uio, flag));
}
int
@ -298,7 +298,7 @@ kdioctl(dev, cmd, data, flag, p)
kd = &kd_softc; /* XXX */
tp = kd->kd_tty;
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
if (error >= 0)
return error;
error = ttioctl(tp, cmd, data, flag, p);
@ -399,7 +399,7 @@ kd_later(tpaddr)
s = spltty();
tp->t_state &= ~TS_BUSY;
(*linesw[tp->t_line].l_start)(tp);
(*tp->t_linesw->l_start)(tp);
splx(s);
}
@ -468,7 +468,7 @@ kd_cons_input(c)
if ((tp->t_state & TS_ISOPEN) == 0)
return;
(*linesw[tp->t_line].l_rint)(c, tp);
(*tp->t_linesw->l_rint)(c, tp);
}

14
sys/arch/sparc64/dev/pcons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcons.c,v 1.3 2000/07/10 20:24:23 eeh Exp $ */
/* $NetBSD: pcons.c,v 1.4 2000/11/02 00:21:03 eeh Exp $ */
/*-
* Copyright (c) 2000 Eduardo E. Horvath
@ -143,7 +143,7 @@ pconsopen(dev, flag, mode, p)
callout_reset(&sc->sc_poll_ch, 1, pcons_poll, sc);
}
return (*linesw[tp->t_line].l_open)(dev, tp);
return (*tp->t_linesw->l_open)(dev, tp);
}
int
@ -157,7 +157,7 @@ pconsclose(dev, flag, mode, p)
callout_stop(&sc->sc_poll_ch);
sc->of_flags &= ~OFPOLL;
(*linesw[tp->t_line].l_close)(tp, flag);
(*tp->t_linesw->l_close)(tp, flag);
ttyclose(tp);
return 0;
}
@ -171,7 +171,7 @@ pconsread(dev, uio, flag)
struct pconssoftc *sc = pcons_cd.cd_devs[minor(dev)];
struct tty *tp = sc->of_tty;
return (*linesw[tp->t_line].l_read)(tp, uio, flag);
return (*tp->t_linesw->l_read)(tp, uio, flag);
}
int
@ -183,7 +183,7 @@ pconswrite(dev, uio, flag)
struct pconssoftc *sc = pcons_cd.cd_devs[minor(dev)];
struct tty *tp = sc->of_tty;
return (*linesw[tp->t_line].l_write)(tp, uio, flag);
return (*tp->t_linesw->l_write)(tp, uio, flag);
}
int
@ -198,7 +198,7 @@ pconsioctl(dev, cmd, data, flag, p)
struct tty *tp = sc->of_tty;
int error;
if ((error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p)) >= 0)
if ((error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p)) >= 0)
return error;
if ((error = ttioctl(tp, cmd, data, flag, p)) >= 0)
return error;
@ -293,7 +293,7 @@ static int nplus = 0;
} else nplus = 0;
#endif
if (tp && (tp->t_state & TS_ISOPEN))
(*linesw[tp->t_line].l_rint)(ch, tp);
(*tp->t_linesw->l_rint)(ch, tp);
}
callout_reset(&sc->sc_poll_ch, 1, pcons_poll, sc);
}