Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd697e29 authored by Okash Khawaja's avatar Okash Khawaja Committed by Greg Kroah-Hartman
Browse files

staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio 



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: default avatarOkash Khawaja <okash.khawaja@gmail.com>
Reviewed-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ab92da3

drivers/staging/speakup/speakup_acntsa.c

+4 −4
Original line number Diff line number Diff line
@@ -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 *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);

drivers/staging/speakup/speakup_dummy.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

drivers/staging/speakup/speakup_txprt.c

+4 −4
Original line number Diff line number Diff line
@@ -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,