mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
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: Okash Khawaja <okash.khawaja@gmail.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1ab92da32e
commit
bd697e2996
3 changed files with 12 additions and 12 deletions
|
@ -99,10 +99,10 @@ static struct spk_synth synth_acntsa = {
|
||||||
.startup = SYNTH_START,
|
.startup = SYNTH_START,
|
||||||
.checkval = SYNTH_CHECK,
|
.checkval = SYNTH_CHECK,
|
||||||
.vars = vars,
|
.vars = vars,
|
||||||
.io_ops = &spk_serial_io_ops,
|
.io_ops = &spk_ttyio_ops,
|
||||||
.probe = synth_probe,
|
.probe = synth_probe,
|
||||||
.release = spk_serial_release,
|
.release = spk_ttyio_release,
|
||||||
.synth_immediate = spk_serial_synth_immediate,
|
.synth_immediate = spk_ttyio_synth_immediate,
|
||||||
.catch_up = spk_do_catch_up,
|
.catch_up = spk_do_catch_up,
|
||||||
.flush = spk_synth_flush,
|
.flush = spk_synth_flush,
|
||||||
.is_alive = spk_synth_is_alive_restart,
|
.is_alive = spk_synth_is_alive_restart,
|
||||||
|
@ -125,7 +125,7 @@ static int synth_probe(struct spk_synth *synth)
|
||||||
{
|
{
|
||||||
int failed;
|
int failed;
|
||||||
|
|
||||||
failed = spk_serial_synth_probe(synth);
|
failed = spk_ttyio_synth_probe(synth);
|
||||||
if (failed == 0) {
|
if (failed == 0) {
|
||||||
synth->synth_immediate(synth, "\033=R\r");
|
synth->synth_immediate(synth, "\033=R\r");
|
||||||
mdelay(100);
|
mdelay(100);
|
||||||
|
|
|
@ -98,10 +98,10 @@ static struct spk_synth synth_dummy = {
|
||||||
.startup = SYNTH_START,
|
.startup = SYNTH_START,
|
||||||
.checkval = SYNTH_CHECK,
|
.checkval = SYNTH_CHECK,
|
||||||
.vars = vars,
|
.vars = vars,
|
||||||
.io_ops = &spk_serial_io_ops,
|
.io_ops = &spk_ttyio_ops,
|
||||||
.probe = spk_serial_synth_probe,
|
.probe = spk_ttyio_synth_probe,
|
||||||
.release = spk_serial_release,
|
.release = spk_ttyio_release,
|
||||||
.synth_immediate = spk_serial_synth_immediate,
|
.synth_immediate = spk_ttyio_synth_immediate,
|
||||||
.catch_up = spk_do_catch_up,
|
.catch_up = spk_do_catch_up,
|
||||||
.flush = spk_synth_flush,
|
.flush = spk_synth_flush,
|
||||||
.is_alive = spk_synth_is_alive_restart,
|
.is_alive = spk_synth_is_alive_restart,
|
||||||
|
|
|
@ -95,10 +95,10 @@ static struct spk_synth synth_txprt = {
|
||||||
.startup = SYNTH_START,
|
.startup = SYNTH_START,
|
||||||
.checkval = SYNTH_CHECK,
|
.checkval = SYNTH_CHECK,
|
||||||
.vars = vars,
|
.vars = vars,
|
||||||
.io_ops = &spk_serial_io_ops,
|
.io_ops = &spk_ttyio_ops,
|
||||||
.probe = spk_serial_synth_probe,
|
.probe = spk_ttyio_synth_probe,
|
||||||
.release = spk_serial_release,
|
.release = spk_ttyio_release,
|
||||||
.synth_immediate = spk_serial_synth_immediate,
|
.synth_immediate = spk_ttyio_synth_immediate,
|
||||||
.catch_up = spk_do_catch_up,
|
.catch_up = spk_do_catch_up,
|
||||||
.flush = spk_synth_flush,
|
.flush = spk_synth_flush,
|
||||||
.is_alive = spk_synth_is_alive_restart,
|
.is_alive = spk_synth_is_alive_restart,
|
||||||
|
|
Loading…
Reference in a new issue