Okash Khawaja, on lun. 03 avril 2017 21:21:26 +0100, wrote:
> This changes the above five synths to TTY-based comms. They were chosen as a
> first pass because their serial comms are straightforward, i.e. they don't use
> serial input and don't do internal port knocking.
>
> Signed-off-by: Okash Khawaja <okash.khawaja@xxxxxxxxx>
Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
> Index: linux-staging/drivers/staging/speakup/speakup_dummy.c
> ===================================================================
> --- linux-staging.orig/drivers/staging/speakup/speakup_dummy.c
> +++ linux-staging/drivers/staging/speakup/speakup_dummy.c
> @@ -98,10 +98,10 @@ static struct spk_synth synth_dummy = {
> .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_serial_synth_immediate,
> + .io_ops = &spk_ttyio_ops,
> + .probe = spk_ttyio_synth_probe,
> + .release = spk_ttyio_release,
> + .synth_immediate = spk_ttyio_synth_immediate,
> .catch_up = spk_do_catch_up,
> .flush = spk_synth_flush,
> .is_alive = spk_synth_is_alive_restart,
> Index: linux-staging/drivers/staging/speakup/speakup_acntsa.c
> ===================================================================
> --- linux-staging.orig/drivers/staging/speakup/speakup_acntsa.c
> +++ linux-staging/drivers/staging/speakup/speakup_acntsa.c
> @@ -99,10 +99,10 @@ static struct spk_synth synth_acntsa = {
> .startup = SYNTH_START,
> .checkval = SYNTH_CHECK,
> .vars = vars,
> - .io_ops = &spk_serial_io_ops,
> + .io_ops = &spk_ttyio_ops,
> .probe = synth_probe,
> - .release = spk_serial_release,
> - .synth_immediate = spk_serial_synth_immediate,
> + .release = spk_ttyio_release,
> + .synth_immediate = spk_ttyio_synth_immediate,
> .catch_up = spk_do_catch_up,
> .flush = spk_synth_flush,
> .is_alive = spk_synth_is_alive_restart,
> @@ -125,7 +125,7 @@ static int synth_probe(struct spk_synth
> {
> int failed;
>
> - failed = spk_serial_synth_probe(synth);
> + failed = spk_ttyio_synth_probe(synth);
> if (failed == 0) {
> synth->synth_immediate(synth, "\033=R\r");
> mdelay(100);
> Index: linux-staging/drivers/staging/speakup/speakup_txprt.c
> ===================================================================
> --- linux-staging.orig/drivers/staging/speakup/speakup_txprt.c
> +++ linux-staging/drivers/staging/speakup/speakup_txprt.c
> @@ -95,10 +95,10 @@ static struct spk_synth synth_txprt = {
> .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_serial_synth_immediate,
> + .io_ops = &spk_ttyio_ops,
> + .probe = spk_ttyio_synth_probe,
> + .release = spk_ttyio_release,
> + .synth_immediate = spk_ttyio_synth_immediate,
> .catch_up = spk_do_catch_up,
> .flush = spk_synth_flush,
> .is_alive = spk_synth_is_alive_restart,
>
--
Samuel
<L> pour moi le seul qui est autorisé à fasciser, c moi :-)
_______________________________________________
Speakup mailing list
Speakup@xxxxxxxxxxxxxxxxx
http://linux-speakup.org/cgi-bin/mailman/listinfo/speakup
