From 847dc1fe8878484d2be37ec71e0bf9136b71592a Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Tue, 1 Jun 2004 11:56:04 +0000 Subject: [PATCH] shift the four cdevsw functions for ttys to sys/conf.h and prototype them with the correct typedef. --- sys/sys/conf.h | 6 ++++++ sys/sys/linedisc.h | 6 ++++++ sys/sys/tty.h | 4 ---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/sys/conf.h b/sys/sys/conf.h index e79409171109..1278fadb55f6 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -352,6 +352,12 @@ int set_dumper(struct dumperinfo *); void dumpsys(struct dumperinfo *); extern int dumping; /* system is dumping */ +/* D_TTY related functions */ +d_kqfilter_t ttykqfilter; +d_poll_t ttypoll; +d_read_t ttyread; +d_write_t ttywrite; + #endif /* _KERNEL */ #endif /* !_SYS_CONF_H_ */ diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index e79409171109..1278fadb55f6 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -352,6 +352,12 @@ int set_dumper(struct dumperinfo *); void dumpsys(struct dumperinfo *); extern int dumping; /* system is dumping */ +/* D_TTY related functions */ +d_kqfilter_t ttykqfilter; +d_poll_t ttypoll; +d_read_t ttyread; +d_write_t ttywrite; + #endif /* _KERNEL */ #endif /* !_SYS_CONF_H_ */ diff --git a/sys/sys/tty.h b/sys/sys/tty.h index 17926c960c3c..f5330b9768b8 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -302,17 +302,13 @@ void ttyflush(struct tty *tp, int rw); void ttyfree(struct tty *tp); void ttyinfo(struct tty *tp); int ttyinput(int c, struct tty *tp); -int ttykqfilter(dev_t dev, struct knote *kn); int ttylclose(struct tty *tp, int flag); struct tty *ttymalloc(struct tty *tp); int ttymodem(struct tty *tp, int flag); int ttyopen(dev_t device, struct tty *tp); -int ttypoll(dev_t dev, int events, struct thread *td); -int ttyread(dev_t dev, struct uio *uio, int flag); void ttyregister(struct tty *tp); int ttysleep(struct tty *tp, void *chan, int pri, char *wmesg, int timo); int ttywait(struct tty *tp); -int ttywrite(dev_t dev, struct uio *uio, int flag); int unputc(struct clist *q); #endif /* _KERNEL */