summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Ramesa <mpr@hi.t-com.hr>2013-12-05 22:03:12 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-12-08 23:55:06 +0900
commit255638fec41bf310aa90cddd238e2251caadfc92 (patch)
tree17eb850211a99e54fbe790538a6d37e2db80131d
parentc2eebf318505a4c5b83ebff6e2d1974ce5bbf146 (diff)
device/tty.h, chario.h: move prototype
Now that we have device/chario.h move the chario_init() prototype from device/tty.h to device/chario.h. * device/chario.h (chario_init): Add prototype. * device/device_init.c: Include device/chario.h. * device/tty.h (chario_init): Remove prototype.
-rw-r--r--device/chario.h2
-rw-r--r--device/device_init.c1
-rw-r--r--device/tty.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/device/chario.h b/device/chario.h
index 2dbf09f..52105a2 100644
--- a/device/chario.h
+++ b/device/chario.h
@@ -21,6 +21,8 @@
#include <device/tty.h>
+extern void chario_init(void);
+
void queue_delayed_reply(
queue_t qh,
io_req_t ior,
diff --git a/device/device_init.c b/device/device_init.c
index 701898b..b2c8b88 100644
--- a/device/device_init.c
+++ b/device/device_init.c
@@ -40,6 +40,7 @@
#include <device/tty.h>
#include <device/ds_routines.h>
#include <device/net_io.h>
+#include <device/chario.h>
ipc_port_t master_device_port;
diff --git a/device/tty.h b/device/tty.h
index dcc7711..2fafa42 100644
--- a/device/tty.h
+++ b/device/tty.h
@@ -234,6 +234,4 @@ struct ldisc_switch {
extern struct ldisc_switch linesw[];
-extern void chario_init(void);
-
#endif /* _DEVICE_TTY_H_ */