patch-2.4.20 linux-2.4.20/drivers/char/amiserial.c
Next file: linux-2.4.20/drivers/char/console.c
Previous file: linux-2.4.20/drivers/char/amd7xx_tco.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/char/amiserial.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/drivers/char/amiserial.c linux-2.4.20/drivers/char/amiserial.c
@@ -2054,8 +2054,8 @@
return ret;
}
-int rs_read_proc(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int rs_read_proc(char *page, char **start, off_t off, int count,
+ int *eof, void *data)
{
int len = 0, l;
off_t begin = 0;
@@ -2306,43 +2306,17 @@
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)
{
return MKDEV(TTY_MAJOR, 64);
}
static struct console sercons = {
- "ttyS",
- serial_console_write,
- NULL,
- serial_console_device,
- serial_console_wait_key,
- NULL,
- NULL,
- CON_PRINTBUFFER,
- -1,
- 0,
- NULL
+ name: "ttyS",
+ write: serial_console_write,
+ device: serial_console_device,
+ flags: CON_PRINTBUFFER,
+ index: -1,
};
/*
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)