[patch 8/8] staging: speakup: migrate ltlk to use ttyio

okash.khawaja at gmail.com okash.khawaja at gmail.com
Sun Mar 12 08:16:52 EDT 2017


This patch migrates ltlk from serial io to ttyio. Since ttyio doesn't yet
support input, this patch disables interrogating the synth for info which
it does when loaded. This is not a required functionality and intention is
to re-enable it once we have input support in ttyio.

Signed-off-by: Okash Khawaja <okash.khawaja at gmail.com>

Index: linux-4.10.1/drivers/staging/speakup/speakup_ltlk.c
===================================================================
--- linux-4.10.1.orig/drivers/staging/speakup/speakup_ltlk.c
+++ linux-4.10.1/drivers/staging/speakup/speakup_ltlk.c
@@ -111,10 +111,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,
@@ -133,6 +133,7 @@
 	},
 };
 
+#if 0
 /* interrogate the LiteTalk and print its settings */
 static void synth_interrogate(struct spk_synth *synth)
 {
@@ -154,14 +155,20 @@
 	rom_v[i] = 0;
 	pr_info("%s: ROM version: %s\n", synth->long_name, rom_v);
 }
+#endif
 
 static int synth_probe(struct spk_synth *synth)
 {
 	int failed = 0;
 
-	failed = spk_serial_synth_probe(synth);
+	failed = spk_ttyio_synth_probe(synth);
+
+//     TODO: uncomment after adding input functions to spk_ttyio
+#if 0
 	if (failed == 0)
 		synth_interrogate(synth);
+#endif
+
 	synth->alive = !failed;
 	return failed;
 }



More information about the Speakup mailing list