From 2580af6c44c6b6dd9f714e764a0f74958bb20ea2 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 17 Jul 2008 00:04:01 +0000
Subject: 2008-07-15  Barry deFreese  <bddebian@comcast.net>

* device/chario.c: Include <vm/vm_user.h>
	* device/device_init.c (chario_init): Remove prototype.
	* device/tty.h (ttyinput_many, tty_cts, tty_get_status,
	tty_set_status, tty_flush, ttrstrt, ttstart, ttyclose, tty_portdeath,
	chario_init): Add prototypes.
---
 device/chario.c      |  1 +
 device/device_init.c |  1 -
 device/tty.h         | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

(limited to 'device')

diff --git a/device/chario.c b/device/chario.c
index 8108d21..9793d34 100644
--- a/device/chario.c
+++ b/device/chario.c
@@ -43,6 +43,7 @@
 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_user.h>
 
 #include <device/device_types.h>
 #include <device/io_req.h>
diff --git a/device/device_init.c b/device/device_init.c
index 4f57fc2..a2e4967 100644
--- a/device/device_init.c
+++ b/device/device_init.c
@@ -43,7 +43,6 @@ extern void	mach_device_init();
 extern void	dev_lookup_init();
 extern void	net_io_init();
 extern void	device_pager_init();
-extern void	chario_init(void);
 
 extern void	io_done_thread();
 extern void	net_thread();
diff --git a/device/tty.h b/device/tty.h
index 9422996..0ffab2c 100644
--- a/device/tty.h
+++ b/device/tty.h
@@ -104,10 +104,19 @@ extern void ttyinput(
 	unsigned int	c,
 	struct tty *	tp);
 
+extern void ttyinput_many(
+	struct tty *	tp,
+	unsigned char *	chars,
+	int		count);
+
 extern boolean_t ttymodem(
 	struct tty *	tp,
 	boolean_t	carrier_up);
 
+extern void tty_cts(
+	struct tty *	tp,
+	boolean_t	cts_up);
+
 extern void tty_queue_completion(
 	queue_t		queue);
 #define	tt_open_wakeup(tp) \
@@ -124,6 +133,35 @@ short	tthiwat[NSPEEDS], ttlowat[NSPEEDS];
 #define	TTHIWAT(tp)	tthiwat[(tp)->t_ospeed]
 #define	TTLOWAT(tp)	ttlowat[(tp)->t_ospeed]
 
+extern io_return_t tty_get_status(
+	struct tty *	tp,
+	dev_flavor_t	flavor,
+	int *		data,
+	natural_t *	count);
+
+extern io_return_t tty_set_status(
+	struct tty *	tp,
+	dev_flavor_t	flavor,
+	int *		data,
+	natural_t	count);
+
+extern void tty_flush(
+	struct tty *	tp,
+	int		rw);
+
+extern void ttrstrt(
+	struct tty *	tp);
+
+extern void ttstart(
+	struct tty *	tp);
+
+extern void ttyclose(
+	struct tty *	tp);
+
+extern boolean_t tty_portdeath(
+	struct tty *	tp,
+	ipc_port_t	port);
+
 /* internal state bits */
 #define	TS_INIT		0x00000001	/* tty structure initialized */
 #define	TS_TIMEOUT	0x00000002	/* delay timeout in progress */
@@ -200,4 +238,6 @@ struct ldisc_switch {
 
 extern struct ldisc_switch	linesw[];
 
+extern void chario_init(void);
+
 #endif	/* _DEVICE_TTY_H_ */
-- 
cgit v1.2.3