various small netbsd-ifications

This commit is contained in:
deraadt 1994-01-14 05:05:17 +00:00
parent d22f586c29
commit 6b8ee3c10f
4 changed files with 9 additions and 15 deletions

View File

@ -100,7 +100,6 @@ void dcstart __P((struct tty *));
void dcxint __P((struct tty *)); void dcxint __P((struct tty *));
void dcPutc __P((dev_t, int)); void dcPutc __P((dev_t, int));
void dcscan __P((void *)); void dcscan __P((void *));
extern void ttrstrt __P((void *));
int dcGetc __P((dev_t)); int dcGetc __P((dev_t));
int dcparam __P((struct tty *, struct termios *)); int dcparam __P((struct tty *, struct termios *));
extern void KBDReset __P((dev_t, void (*)())); extern void KBDReset __P((dev_t, void (*)()));
@ -335,12 +334,11 @@ dcwrite(dev, uio, flag)
} }
/*ARGSUSED*/ /*ARGSUSED*/
dcioctl(dev, cmd, data, flag, p) dcioctl(dev, cmd, data, flag)
dev_t dev; dev_t dev;
int cmd; int cmd;
caddr_t data; caddr_t data;
int flag; int flag;
struct proc *p;
{ {
register struct tty *tp; register struct tty *tp;
register int unit = minor(dev); register int unit = minor(dev);
@ -348,7 +346,7 @@ dcioctl(dev, cmd, data, flag, p)
int error; int error;
tp = &dc_tty[unit]; tp = &dc_tty[unit];
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p); error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag);
if (error >= 0) if (error >= 0)
return (error); return (error);
error = ttioctl(tp, cmd, data, flag); error = ttioctl(tp, cmd, data, flag);
@ -587,7 +585,7 @@ dcxint(tp)
if (tp->t_state & TS_FLUSH) if (tp->t_state & TS_FLUSH)
tp->t_state &= ~TS_FLUSH; tp->t_state &= ~TS_FLUSH;
else { else {
ndflush(&tp->t_outq, dp->p_mem-tp->t_outq.c_cf); ndflush(&tp->t_outq, (u_char *)(dp->p_mem) - tp->t_outq.c_cf);
dp->p_end = dp->p_mem = tp->t_outq.c_cf; dp->p_end = dp->p_mem = tp->t_outq.c_cf;
} }
if (tp->t_line) if (tp->t_line)

View File

@ -120,7 +120,6 @@ SOFTWARE.
extern int pmax_boardtype; extern int pmax_boardtype;
extern int ttrstrt __P((void *));
void dtop_keyboard_repeat __P((void *)); void dtop_keyboard_repeat __P((void *));
int dtop_null_device_handler __P((dtop_device_t, dtop_message_t, int, int)); int dtop_null_device_handler __P((dtop_device_t, dtop_message_t, int, int));
int dtop_locator_handler __P((dtop_device_t, dtop_message_t, int, int)); int dtop_locator_handler __P((dtop_device_t, dtop_message_t, int, int));
@ -304,19 +303,18 @@ dtopwrite(dev, uio, flag)
} }
/*ARGSUSED*/ /*ARGSUSED*/
dtopioctl(dev, cmd, data, flag, p) dtopioctl(dev, cmd, data, flag)
dev_t dev; dev_t dev;
int cmd; int cmd;
caddr_t data; caddr_t data;
int flag; int flag;
struct proc *p;
{ {
register struct tty *tp; register struct tty *tp;
register int unit = minor(dev); register int unit = minor(dev);
int error; int error;
tp = &dtop_tty[unit]; tp = &dtop_tty[unit];
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p); error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag);
if (error >= 0) if (error >= 0)
return (error); return (error);
error = ttioctl(tp, cmd, data, flag); error = ttioctl(tp, cmd, data, flag);

View File

@ -67,7 +67,6 @@
#include <sys/tty.h> #include <sys/tty.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/proc.h> #include <sys/proc.h>

View File

@ -97,7 +97,6 @@
extern int pmax_boardtype; extern int pmax_boardtype;
extern struct consdev cn_tab; extern struct consdev cn_tab;
extern void ttrstrt __P((void *));
extern void KBDReset __P((dev_t, void (*)())); extern void KBDReset __P((dev_t, void (*)()));
extern void MouseInit __P((dev_t, void (*)(), int (*)())); extern void MouseInit __P((dev_t, void (*)(), int (*)()));
@ -420,19 +419,18 @@ sccwrite(dev, uio, flag)
} }
/*ARGSUSED*/ /*ARGSUSED*/
sccioctl(dev, cmd, data, flag, p) sccioctl(dev, cmd, data, flag)
dev_t dev; dev_t dev;
int cmd; int cmd;
caddr_t data; caddr_t data;
int flag; int flag;
struct proc *p;
{ {
register struct scc_softc *sc; register struct scc_softc *sc;
register struct tty *tp; register struct tty *tp;
int error, line; int error, line;
tp = &scc_tty[minor(dev)]; tp = &scc_tty[minor(dev)];
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p); error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag);
if (error >= 0) if (error >= 0)
return (error); return (error);
error = ttioctl(tp, cmd, data, flag); error = ttioctl(tp, cmd, data, flag);
@ -646,7 +644,8 @@ sccintr(unit)
if (tp->t_state & TS_FLUSH) if (tp->t_state & TS_FLUSH)
tp->t_state &= ~TS_FLUSH; tp->t_state &= ~TS_FLUSH;
else { else {
ndflush(&tp->t_outq, dp->p_mem-tp->t_outq.c_cf); ndflush(&tp->t_outq,
(u_char *)(dp->p_mem) - tp->t_outq.c_cf);
dp->p_end = dp->p_mem = tp->t_outq.c_cf; dp->p_end = dp->p_mem = tp->t_outq.c_cf;
} }
if (tp->t_line) if (tp->t_line)