From bdc5be605fed4eb12994b4b1324963a5527e8bd8 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 23 May 2008 16:06:35 +0000 Subject: Move TTY unrelated bits out of . For some reason, the header file also contains routines of the clists and console that are used inside the TTY layer. Because the clists are not only used by the TTY layer (example: various input drivers), we'd better move the entire clist programming interface into . Also remove a declaration of nonexistent variable. The header also contains various definitions for the console code (tty_cons.c). Also move these to , because they are not implemented inside the TTY layer. While there, create separate malloc pools for the clist and console code. Approved by: philip (mentor) --- sys/kern/tty_cons.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/kern/tty_cons.c') diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 99f6f51..ff57d82 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -66,6 +66,8 @@ __FBSDID("$FreeBSD$"); #include #include +static MALLOC_DEFINE(M_TTYCONS, "tty console", "tty console handling"); + static d_open_t cnopen; static d_close_t cnclose; static d_read_t cnread; @@ -673,7 +675,7 @@ constty_set(struct tty *tp) KASSERT(tp != NULL, ("constty_set: NULL tp")); if (consbuf == NULL) { size = consmsgbuf_size; - consbuf = malloc(size, M_TTYS, M_WAITOK); + consbuf = malloc(size, M_TTYCONS, M_WAITOK); msgbuf_init(&consmsgbuf, consbuf, size); callout_init(&conscallout, 0); } @@ -695,7 +697,7 @@ constty_clear(void) callout_stop(&conscallout); while ((c = msgbuf_getchar(&consmsgbuf)) != -1) cnputc(c); - free(consbuf, M_TTYS); + free(consbuf, M_TTYCONS); consbuf = NULL; } -- cgit v1.1