Commit c20f0856 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k update (part 48)

console.wait_key was removed
parent 65458d5a
...@@ -235,20 +235,6 @@ void mac_scca_console_write (struct console *co, const char *str, ...@@ -235,20 +235,6 @@ void mac_scca_console_write (struct console *co, const char *str,
} }
} }
#if defined(CONFIG_SERIAL_CONSOLE) || defined(DEBUG_SERIAL)
int mac_sccb_console_wait_key(struct console *co)
{
int i;
do {
for( i = uSEC; i > 0; --i )
barrier();
} while( !(scc.cha_b_ctrl & 0x01) ); /* wait for rx buf filled */
for( i = uSEC; i > 0; --i )
barrier();
return( scc.cha_b_data );
}
#endif
/* The following two functions do a quick'n'dirty initialization of the MFP or /* The following two functions do a quick'n'dirty initialization of the MFP or
* SCC serial ports. They're used by the debugging interface, kgdb, and the * SCC serial ports. They're used by the debugging interface, kgdb, and the
...@@ -390,9 +376,6 @@ void __init mac_debug_init(void) ...@@ -390,9 +376,6 @@ void __init mac_debug_init(void)
/* Mac printer port */ /* Mac printer port */
mac_init_scc_port( B9600|CS8, 1 ); mac_init_scc_port( B9600|CS8, 1 );
mac_console_driver.write = mac_sccb_console_write; mac_console_driver.write = mac_sccb_console_write;
#ifdef CONFIG_SERIAL_CONSOLE
mac_console_driver.wait_key = mac_sccb_console_wait_key;
#endif
scc_port = 1; scc_port = 1;
} }
#endif #endif
......
...@@ -2306,43 +2306,17 @@ static void serial_console_write(struct console *co, const char *s, ...@@ -2306,43 +2306,17 @@ static void serial_console_write(struct console *co, const char *s,
custom.intena = IF_SETCLR | (intena & IF_TBE); custom.intena = IF_SETCLR | (intena & IF_TBE);
} }
/*
* Receive character from the serial port
*/
static int serial_console_wait_key(struct console *co)
{
unsigned short intena = custom.intenar;
int ch;
custom.intena = IF_RBF;
while (!(custom.intreqr & IF_RBF))
barrier();
ch = custom.serdatr & 0xff;
custom.intreq = IF_RBF;
custom.intena = IF_SETCLR | (intena & IF_RBF);
return ch;
}
static kdev_t serial_console_device(struct console *c) static kdev_t serial_console_device(struct console *c)
{ {
return mk_kdev(TTY_MAJOR, 64); return mk_kdev(TTY_MAJOR, 64);
} }
static struct console sercons = { static struct console sercons = {
"ttyS", .name = "ttyS",
serial_console_write, .write = serial_console_write,
NULL, .device = serial_console_device,
serial_console_device, .flags = CON_PRINTBUFFER,
serial_console_wait_key, .index = -1,
NULL,
NULL,
CON_PRINTBUFFER,
-1,
0,
NULL
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment