|
[gkernel-commit] CVS: linux_2_5/drivers/macintosh mac_keyb.c,1.1.1.1,1.2 macserial.c,1.1.1.1,1.2
From: Jeff Garzik <jgarzik@us...> - 2001-12-30 00:28
|
Update of /cvsroot/gkernel/linux_2_5/drivers/macintosh
In directory usw-pr-cvs1:/tmp/cvs-serv4955/drivers/macintosh
Modified Files:
mac_keyb.c macserial.c
Log Message:
merge 2.5.2-pre2 and pre3
Index: mac_keyb.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_5/drivers/macintosh/mac_keyb.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- mac_keyb.c 2001/09/18 21:23:14 1.1.1.1
+++ mac_keyb.c 2001/12/30 00:27:38 1.2
@@ -256,7 +256,6 @@
#endif
extern struct kbd_struct kbd_table[];
-extern wait_queue_head_t keypress_wait;
extern void handle_scancode(unsigned char, int);
@@ -423,7 +422,6 @@
struct tty_struct *tty;
tty = console_driver.table? console_driver.table[fg_console]: NULL;
- wake_up(&keypress_wait);
if (tty) {
tty_insert_flip_char(tty, ch, 0);
con_schedule_flip(tty);
Index: macserial.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_5/drivers/macintosh/macserial.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- macserial.c 2001/10/15 20:43:24 1.1.1.1
+++ macserial.c 2001/12/30 00:27:38 1.2
@@ -2792,30 +2792,6 @@
/* Don't disable the transmitter. */
}
-/*
- * Receive character from the serial port
- */
-static int serial_console_wait_key(struct console *co)
-{
- struct mac_serial *info = zs_soft + co->index;
- int val;
-
- /* Turn of interrupts and enable the transmitter. */
- write_zsreg(info->zs_channel, R1, info->curregs[1] & ~INT_ALL_Rx);
- write_zsreg(info->zs_channel, R3, info->curregs[3] | RxENABLE);
-
- /* Wait for something in the receive buffer. */
- while((read_zsreg(info->zs_channel, 0) & Rx_CH_AV) == 0)
- eieio();
- val = read_zsdata(info->zs_channel);
-
- /* Restore the values in the registers. */
- write_zsreg(info->zs_channel, R1, info->curregs[1]);
- write_zsreg(info->zs_channel, R3, info->curregs[3]);
-
- return val;
-}
-
static kdev_t serial_console_device(struct console *c)
{
return MKDEV(TTY_MAJOR, 64 + c->index);
@@ -3006,7 +2982,6 @@
name: "ttyS",
write: serial_console_write,
device: serial_console_device,
- wait_key: serial_console_wait_key,
setup: serial_console_setup,
flags: CON_PRINTBUFFER,
index: -1,
|
| Thread | Author | Date |
|---|---|---|
| [gkernel-commit] CVS: linux_2_5/drivers/macintosh mac_keyb.c,1.1.1.1,1.2 macserial.c,1.1.1.1,1.2 | Jeff Garzik <jgarzik@us...> |