Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1599881

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

Show all headers | View raw

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>

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,

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch 0/7] staging: speakup: introduce tty-based comms okash.khawaja@gmail.com - 2017-03-13 23:10 +0100
  Re: [patch 0/7] staging: speakup: introduce tty-based comms Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-03-13 23:20 +0100
    Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-13 23:30 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 00:50 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-03-14 00:50 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 01:10 +0100
    Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 01:50 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 02:20 +0100
        Re: [patch 0/7] staging: speakup: introduce tty-based comms Rob Herring <robh@kernel.org> - 2017-03-15 15:50 +0100
          Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-15 16:10 +0100
            Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-22 01:10 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-16 10:30 +0100
  Re: [patch 1/7] tty_port: allow a port to be opened with a tty that  has no file handle Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-03-13 23:20 +0100
    Re: [patch 1/7] tty_port: allow a port to be opened with a tty that  has no file handle Okash Khawaja <okash.khawaja@gmail.com> - 2017-03-13 23:40 +0100
  [patch 6/7] staging: speakup: add tty-based comms functions okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 3/7] staging: serial: add spk_io_ops struct to spk_synth okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 4/7] staging: speakup: move spk_stop_serial_interrupt into synth-specific release function okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 7/7] staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 2/7] staging: speakup: spk_serial_out and spk_wait_for_xmitr to take synth arg okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 1/7] tty_port: allow a port to be opened with a tty that has no file handle okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
    Re: [patch 1/7] tty_port: allow a port to be opened with a tty that  has no file handle Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-14 10:20 +0100
  [patch 5/7] staging: speakup: move those functions which do outgoing serial comms, into serialio.c okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 01:30 +0100

csiph-web