staging: speakup: move those functions which do outgoing serial comms, into serialio.c

[linux-2.6-block.git] / drivers / staging / speakup / speakup_apollo.c

diff --git a/drivers/staging/speakup/speakup_apollo.c b/drivers/staging/speakup/speakup_apollo.c
index 3f43f8105bc07a0f37584a4bb38b1ae26e361338..9cfdbbfb9742f3bf8d8be76658f9d5db676f94b7 100644 (file)
--- a/drivers/staging/speakup/speakup_apollo.c
+++ b/drivers/staging/speakup/speakup_apollo.c
@@ -108,9 +108,10 @@ static struct spk_synth synth_apollo = {
        .startup = SYNTH_START,
        .checkval = SYNTH_CHECK,
        .vars = vars,
+       .io_ops = &spk_serial_io_ops,
        .probe = spk_serial_synth_probe,
        .release = spk_serial_release,
-       .synth_immediate = spk_synth_immediate,
+       .synth_immediate = spk_serial_synth_immediate,
        .catch_up = do_catch_up,
        .flush = spk_synth_flush,
        .is_alive = spk_synth_is_alive_restart,
@@ -160,6 +161,7 @@ static void do_catch_up(struct spk_synth *synth)
                        synth->flush(synth);
                        continue;
                }
+               synth_buffer_skip_nonlatin1();
                if (synth_buffer_empty()) {
                        spin_unlock_irqrestore(&speakup_info.spinlock, flags);
                        break;
@@ -168,7 +170,7 @@ static void do_catch_up(struct spk_synth *synth)
                set_current_state(TASK_INTERRUPTIBLE);
                full_time_val = full_time->u.n.value;
                spin_unlock_irqrestore(&speakup_info.spinlock, flags);
-               if (!spk_serial_out(ch)) {
+               if (!synth->io_ops->synth_out(synth, ch)) {
                        outb(UART_MCR_DTR, speakup_info.port_tts + UART_MCR);
                        outb(UART_MCR_DTR | UART_MCR_RTS,
                                        speakup_info.port_tts + UART_MCR);
@@ -181,7 +183,7 @@ static void do_catch_up(struct spk_synth *synth)
                        full_time_val = full_time->u.n.value;
                        delay_time_val = delay_time->u.n.value;
                        spin_unlock_irqrestore(&speakup_info.spinlock, flags);
-                       if (spk_serial_out(synth->procspeech))
+                       if (synth->io_ops->synth_out(synth, synth->procspeech))
                                schedule_timeout(msecs_to_jiffies
                                                 (delay_time_val));
                        else
@@ -194,7 +196,7 @@ static void do_catch_up(struct spk_synth *synth)
                synth_buffer_getc();
                spin_unlock_irqrestore(&speakup_info.spinlock, flags);
        }
-       spk_serial_out(PROCSPEECH);
+       synth->io_ops->synth_out(synth, PROCSPEECH);
 }
 
 module_param_named(ser, synth_apollo.ser, int, 0444);