Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv16408/drivers/char
Modified Files:
dz.c
Log Message:
Merge with 2.5.69
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dz.c 16 Jul 2003 23:03:26 -0000 1.10
+++ dz.c 28 Aug 2003 00:42:08 -0000 1.11
@@ -1141,8 +1141,8 @@
*/
shutdown(info);
- if (tty->driver.flush_buffer)
- tty->driver.flush_buffer (tty);
+ if (tty->driver->flush_buffer)
+ tty->driver->flush_buffer (tty);
if (tty->ldisc.flush_buffer)
tty->ldisc.flush_buffer (tty);
tty->closing = 0;
@@ -1212,7 +1212,7 @@
* If this is a callout device, then just make sure the normal
* device isn't being used.
*/
- if (tty->driver.subtype == SERIAL_TYPE_CALLOUT) {
+ if (tty->driver->subtype == SERIAL_TYPE_CALLOUT) {
if (info->flags & DZ_NORMAL_ACTIVE)
return -EBUSY;
@@ -1300,7 +1300,7 @@
struct dz_serial *info;
int retval, line;
- line = minor(tty->device) - tty->driver.minor_start;
+ line = tty->index;
/*
* The dz lines for the mouse/keyboard must be opened using their
@@ -1330,7 +1330,7 @@
return retval;
if ((info->count == 1) && (info->flags & DZ_SPLIT_TERMIOS)) {
- if (tty->driver.subtype == SERIAL_TYPE_NORMAL)
+ if (tty->driver->subtype == SERIAL_TYPE_NORMAL)
*tty->termios = info->normal_termios;
else
*tty->termios = info->callout_termios;
@@ -1366,7 +1366,7 @@
#if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
serial_driver.name = "ttyS";
#else
- serial_driver.name = "tts/%d";
+ serial_driver.name = "tts/";
#endif
#endif /* config_vax */
serial_driver.major = TTY_MAJOR;
@@ -1408,7 +1408,7 @@
#if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
callout_driver.name = "cua";
#else
- callout_driver.name = "cua/%d";
+ callout_driver.name = "cua/";
#endif
callout_driver.major = TTYAUX_MAJOR;
callout_driver.subtype = SERIAL_TYPE_CALLOUT;
@@ -1462,10 +1462,8 @@
info->port, SERIAL);
#endif
- tty_register_device(&serial_driver,
- serial_driver.minor_start + info->line);
- tty_register_device(&callout_driver,
- callout_driver.minor_start + info->line);
+ tty_register_device(&serial_driver, info->line);
+ tty_register_device(&callout_driver, info->line);
}
/* Reset the chip */
@@ -1614,9 +1612,10 @@
}
}
-static kdev_t dz_console_device(struct console *c)
+static struct tty_driver *dz_console_device(struct console *c, int *index)
{
- return mk_kdev(TTY_MAJOR, 64 + c->index);
+ *index = c->index;
+ return &serial_driver;
}
static int __init dz_console_setup(struct console *co, char *options)
|
