提交 5b19208a 编写于 作者: G Greg Kroah-Hartman

Staging: speakup: fix speakup core to build properly

The vc_data structure changed to move the tty structure off to the port,
so change the code to handle this.  Now the code will build properly,
and hopefully work as well.

Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 c6e3fd22
...@@ -28,8 +28,8 @@ void speakup_start_ttys(void) ...@@ -28,8 +28,8 @@ void speakup_start_ttys(void)
for (i = 0; i < MAX_NR_CONSOLES; i++) { for (i = 0; i < MAX_NR_CONSOLES; i++) {
if (speakup_console[i] && speakup_console[i]->tty_stopped) if (speakup_console[i] && speakup_console[i]->tty_stopped)
continue; continue;
if ((vc_cons[i].d != NULL) && (vc_cons[i].d->vc_tty != NULL)) if ((vc_cons[i].d != NULL) && (vc_cons[i].d->port.tty != NULL))
start_tty(vc_cons[i].d->vc_tty); start_tty(vc_cons[i].d->port.tty);
} }
} }
EXPORT_SYMBOL_GPL(speakup_start_ttys); EXPORT_SYMBOL_GPL(speakup_start_ttys);
...@@ -39,9 +39,8 @@ static void speakup_stop_ttys(void) ...@@ -39,9 +39,8 @@ static void speakup_stop_ttys(void)
int i; int i;
for (i = 0; i < MAX_NR_CONSOLES; i++) for (i = 0; i < MAX_NR_CONSOLES; i++)
if ((vc_cons[i].d != NULL) && (vc_cons[i].d->vc_tty != NULL)) if ((vc_cons[i].d != NULL) && (vc_cons[i].d->port.tty != NULL))
stop_tty(vc_cons[i].d->vc_tty); stop_tty(vc_cons[i].d->port.tty);
return;
} }
static int synth_buffer_free(void) static int synth_buffer_free(void)
......
...@@ -2010,7 +2010,7 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym, ...@@ -2010,7 +2010,7 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
return 0; return 0;
spk_lock(flags); spk_lock(flags);
tty = vc->vc_tty; tty = vc->port.tty;
if (type >= 0xf0) if (type >= 0xf0)
type -= 0xf0; type -= 0xf0;
if (type == KT_PAD && if (type == KT_PAD &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册