Braille screen reader fixes:
- console_cmdline's brl_options field is only required when braille
console support is enabled.
- Use strlcpy to copy the console name.
- braille console support depends on VT support.
Signed-off-by: Samuel Thibault <[EMAIL PROTECTED]>
--- linux-2.6.24.1-orig/kernel/printk.c 2008-02-21 12:09:06.000000000 +0100
+++ linux-2.6.24.1-perso/kernel/printk.c 2008-02-23 12:57:42.000000000
+0100
@@ -105,7 +105,9 @@ struct console_cmdline
char name[8]; /* Name of the driver */
int index; /* Minor dev. to use */
char *options; /* Options for the driver */
+#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
char *brl_options; /* Options for braille driver */
+#endif
};
#define MAX_CMDLINECONSOLES 8
@@ -789,10 +791,11 @@ static int __add_preferred_console
if (!brl_options)
selected_console = i;
c = &console_cmdline[i];
- memcpy(c->name, name, sizeof(c->name));
- c->name[sizeof(c->name) - 1] = 0;
+ strlcpy(c->name, name, sizeof(c->name));
c->options = options;
+#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
c->brl_options = brl_options;
+#endif
c->index = idx;
return 0;
}
--- linux-2.6.24.1-orig/drivers/accessibility/Kconfig 2008-02-23
13:32:38.000000000 +0100
+++ linux-2.6.24.1-perso/drivers/accessibility/Kconfig 2008-02-23
13:23:21.000000000 +0100
@@ -8,6 +8,7 @@ menuconfig ACCESSIBILITY
if ACCESSIBILITY
config A11Y_BRAILLE_CONSOLE
bool "Console on braille device"
+ depends on VT
depends on SERIAL_CORE_CONSOLE
---help---
Enables console output on a braille device connected to a 8250
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
