Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/amiga
In directory usw-pr-cvs1:/tmp/cvs-serv23561/arch/ppc/amiga
Modified Files:
config.c
Log Message:
Synced to 2.5.X.
Index: config.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/amiga/config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.c 2001/12/26 21:08:33 1.3
+++ config.c 2002/01/20 03:54:45 1.4
@@ -101,7 +101,6 @@
extern void amiga_floppy_setup(char *, int *);
#endif
static void amiga_reset (void);
-static int amiga_wait_key (struct console *co);
extern void amiga_init_sound(void);
static void amiga_savekmsg_init(void);
static void amiga_mem_console_write(struct console *co, const char *b,
@@ -115,7 +114,6 @@
static struct console amiga_console_driver = {
name: "debug",
- wait_key: amiga_wait_key,
flags: CON_PRINTBUFFER,
index: -1,
};
@@ -710,33 +708,6 @@
}
return 0;
-}
-
-static int amiga_wait_key (struct console *co)
-{
- int i;
-
- while (1) {
- while (ciaa.pra & 0x40);
-
- /* debounce */
- for (i = 0; i < 1000; i++);
-
- if (!(ciaa.pra & 0x40))
- break;
- }
-
- /* wait for button up */
- while (1) {
- while (!(ciaa.pra & 0x40));
-
- /* debounce */
- for (i = 0; i < 1000; i++);
-
- if (ciaa.pra & 0x40)
- break;
- }
- return 0;
}
static NORET_TYPE void amiga_reset( void )
|
