===================================================================
RCS file: /cvs/prex-old/dev/arm/gba/console.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/dev/arm/gba/console.c	2008/06/03 10:38:41	1.1.1.1
+++ prex-old/dev/arm/gba/console.c	2008/08/13 17:12:22	1.1.1.1.2.1
@@ -39,7 +39,8 @@
 static int console_init(void);
 static int console_read(device_t, char *, size_t *, int);
 static int console_write(device_t, char *, size_t *, int);
-static int console_ioctl(device_t, int, u_long);
+static int console_ioctl(device_t, u_long, void *);
+void console_attach(struct tty **);
 
 /*
  * Driver structure
@@ -336,7 +337,7 @@
 	sched_unlock();
 }
 
-#if defined(DEBUG) && defined(CONFIG_DIAG_VBA)
+#if defined(DEBUG) && defined(CONFIG_DIAG_SCREEN)
 /*
  * Debug print handler
  */
@@ -384,10 +385,10 @@
  * I/O control
  */
 static int
-console_ioctl(device_t dev, int cmd, u_long arg)
+console_ioctl(device_t dev, u_long cmd, void *arg)
 {
 
-	return tty_ioctl(&console_tty, cmd, (void *)arg);
+	return tty_ioctl(&console_tty, cmd, arg);
 }
 
 /*
@@ -454,7 +455,7 @@
 	console_dev = device_create(&console_io, "console", DF_CHR);
 	init_font();
 	init_screen();
-#if defined(DEBUG) && defined(CONFIG_DIAG_VBA)
+#if defined(DEBUG) && defined(CONFIG_DIAG_SCREEN)
 	debug_attach(diag_print);
 #endif
 	tty_register(&console_io, &console_tty, console_output);