[patch 7/8] staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio

[Samuel Thibault]

okash.khawaja at gmail.com, on dim. 12 mars 2017 12:16:51 +0000, 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 at gmail.com>

Reviewed-by: Samuel Thibault <samuel.thibault at ens-lyon.org>

> Index: linux-4.10.1/drivers/staging/speakup/speakup_dummy.c
> ===================================================================
> --- linux-4.10.1.orig/drivers/staging/speakup/speakup_dummy.c
> +++ linux-4.10.1/drivers/staging/speakup/speakup_dummy.c
> @@ -98,10 +98,10 @@
>  	.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-4.10.1/drivers/staging/speakup/speakup_acntsa.c
> ===================================================================
> --- linux-4.10.1.orig/drivers/staging/speakup/speakup_acntsa.c
> +++ linux-4.10.1/drivers/staging/speakup/speakup_acntsa.c
> @@ -99,10 +99,10 @@
>  	.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 @@
>  {
>  	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-4.10.1/drivers/staging/speakup/speakup_txprt.c
> ===================================================================
> --- linux-4.10.1.orig/drivers/staging/speakup/speakup_txprt.c
> +++ linux-4.10.1/drivers/staging/speakup/speakup_txprt.c
> @@ -95,10 +95,10 @@
>  	.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
 SL> Au fait elle est mieux ma signature maintenant ?
 Oui. T'enlève encore les conneries que t'as écrit dedans et c'est bon.
 -+- JB in <http://neuneu.mine.nu> : Le neueuttoyage par le vide -+-