Commit 3aa30df3 authored by Hinko Kocevar's avatar Hinko Kocevar Committed by Jesper Nilsson

cris: compile fixes for 2.6.26-rc5

Add dummy ops for serial debug port.
Add setting of c_ispeed/c_ospeed as suggested by Alan Cox.
Signed-off-by: default avatarHinko Kocevar <hinko.kocevar@cetrtapot.si>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 543cf4cb
...@@ -426,12 +426,18 @@ static int dummy_write(struct tty_struct * tty, ...@@ -426,12 +426,18 @@ static int dummy_write(struct tty_struct * tty,
return count; return count;
} }
static int static int dummy_write_room(struct tty_struct *tty)
dummy_write_room(struct tty_struct *tty)
{ {
return 8192; return 8192;
} }
static const struct tty_operations dummy_ops = {
.open = dummy_open,
.close = dummy_close,
.write = dummy_write,
.write_room = dummy_write_room,
};
void __init void __init
init_dummy_console(void) init_dummy_console(void)
{ {
...@@ -444,14 +450,14 @@ init_dummy_console(void) ...@@ -444,14 +450,14 @@ init_dummy_console(void)
dummy_driver.type = TTY_DRIVER_TYPE_SERIAL; dummy_driver.type = TTY_DRIVER_TYPE_SERIAL;
dummy_driver.subtype = SERIAL_TYPE_NORMAL; dummy_driver.subtype = SERIAL_TYPE_NORMAL;
dummy_driver.init_termios = tty_std_termios; dummy_driver.init_termios = tty_std_termios;
/* Normally B9600 default... */
dummy_driver.init_termios.c_cflag = dummy_driver.init_termios.c_cflag =
B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ B115200 | CS8 | CREAD | HUPCL | CLOCAL;
dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
dummy_driver.init_termios.c_ispeed = 115200;
dummy_driver.init_termios.c_ospeed = 115200;
dummy_driver.open = dummy_open; dummy_driver.ops = &dummy_ops;
dummy_driver.close = dummy_close;
dummy_driver.write = dummy_write;
dummy_driver.write_room = dummy_write_room;
if (tty_register_driver(&dummy_driver)) if (tty_register_driver(&dummy_driver))
panic("Couldn't register dummy serial driver\n"); panic("Couldn't register dummy serial driver\n");
} }
......
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