cvs commit: src/sys/dev/ofw ofw_console.c src/sys/dev/zs zs.c src/sys/ia64/ia64 ssc.c

[Andrew Turner]

Poul-Henning Kamp wrote:
> NB: this may actually not compile.
The attached patch makes it compile for me on PowerPC.

It locks up when loading the console currently so I can't test it.

Andrew
> In message <200605261825.k4QIPYEB008871 at repoman.freebsd.org>, Poul-Henning Kamp
>  writes:
>   
>> phk         2006-05-26 18:25:34 UTC
>>
>>  FreeBSD src repository
>>
>>  Modified files:
>>    sys/dev/ofw          ofw_console.c 
>>    sys/dev/zs           zs.c 
>>    sys/ia64/ia64        ssc.c 
>>  Log:
>>  Update to new console api.
>>  
>>  Revision  Changes    Path
>>  1.33      +11 -28    src/sys/dev/ofw/ofw_console.c
>>  1.35      +1 -13     src/sys/dev/zs/zs.c
>>  1.27      +10 -16    src/sys/ia64/ia64/ssc.c
>>
>>     
>
>   

-------------- next part --------------
Index: ofw_console.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ofw/ofw_console.c,v
retrieving revision 1.33
diff -u -r1.33 ofw_console.c
--- ofw_console.c	26 May 2006 18:25:34 -0000	1.33
+++ ofw_console.c	29 May 2006 09:58:22 -0000
@@ -79,8 +79,7 @@
 static cn_getc_t	ofw_cngetc;
 static cn_putc_t	ofw_cnputc;
 
-CONSOLE_DRIVER(ofw)
-    ofw_cons_checkc, ofw_cons_putc, NULL);
+CONSOLE_DRIVER(ofw);
 
 static void
 cn_drvinit(void *unused)
@@ -227,7 +226,7 @@
 
 	tp = (struct tty *)v;
 
-	while ((c = ofw_cons_checkc(NULL)) != -1) {
+	while ((c = ofw_cngetc(NULL)) != -1) {
 		if (tp->t_state & TS_ISOPEN) {
 			ttyld_rint(tp, c);
 		}
@@ -237,7 +236,7 @@
 }
 
 static void
-ofw_cons_probe(struct consdev *cp)
+ofw_cnprobe(struct consdev *cp)
 {
 	int chosen;
 
@@ -269,7 +268,7 @@
 }
 
 static void
-ofw_cneterm(struct consdev *cp)
+ofw_cnterm(struct consdev *cp)
 {
 }