speakup: Fix wait_for_xmitr for ttyio case
Samuel Thibault
maintainerPATCH v2 1/2 speakup: Fix wait_for_xmitr for ttyio case
This was missed while introducing the tty-based serial access.
The only remaining use of wait_for_xmitr with tty-based access is in spk_synth_is_alive_restart to check whether the synth can be restarted. With tty-based this is up to the tty layer to cope with the buffering etc. so we can just say yes.
Signed-off-by Samuel Thibault <[email protected]>
drivers/accessibility/speakup/serialio.c +5 -3
@@ -32,6 +32,7 @@ static void spk_serial_tiocmset(unsignedstatic unsigned char spk_serial_in (void );static unsigned char spk_serial_in_nowait (void );static void spk_serial_flush_buffer (void ); +static int spk_serial_wait_for_xmitr (struct spk_synth *in_synth);struct spk_io_ops spk_serial_io_ops = { .synth_out = spk_serial_out,
@@ -40,6 +41,7 @@ struct spk_io_ops spk_serial_io_ops = { .synth_in = spk_serial_in, .synth_in_nowait = spk_serial_in_nowait, .flush_buffer = spk_serial_flush_buffer, + .wait_for_xmitr = spk_serial_wait_for_xmitr, };EXPORT_SYMBOL_GPL (spk_serial_io_ops);
@@ -211,7 +213,7 @@ void spk_stop_serial_interrupt(void) }EXPORT_SYMBOL_GPL (spk_stop_serial_interrupt); -int spk_wait_for_xmitr (struct spk_synth *in_synth) +static int spk_serial_wait_for_xmitr (struct spk_synth *in_synth) {int tmout =SPK_XMITR_TIMEOUT ;
@@ -280,7 +282,7 @@ static void spk_serial_flush_buffer(voidstatic int spk_serial_out (struct spk_synth *in_synth,const char ch) { -if (in_synth->alive &&spk_wait_for_xmitr (in_synth)) { +if (in_synth->alive &&spk_serial_wait_for_xmitr (in_synth)) {outb_p (ch, speakup_info.port_tts);return 1 ; }
@@ -295,7 +297,7 @@ const char *spk_serial_synth_immediate(swhile ((ch = *buff)) {if (ch =='\n' ) ch = synth->procspeech; -if (spk_wait_for_xmitr (synth)) +if (spk_serial_wait_for_xmitr (synth))outb (ch, speakup_info.port_tts);else return buff;
drivers/accessibility/speakup/spk_priv.h +0 -1
@@ -34,7 +34,6 @@const struct old_serial_port *spk_serial_init (int index);void spk_stop_serial_interrupt (void ); -int spk_wait_for_xmitr (struct spk_synth *in_synth);void spk_serial_release (void );void spk_ttyio_release (void );void spk_ttyio_register_ldisc (void );
drivers/accessibility/speakup/spk_ttyio.c +7 -0
@@ -116,6 +116,7 @@ static void spk_ttyio_tiocmset(unsignedstatic unsigned char spk_ttyio_in (void );static unsigned char spk_ttyio_in_nowait (void );static void spk_ttyio_flush_buffer (void ); +static int spk_ttyio_wait_for_xmitr (struct spk_synth *in_synth);struct spk_io_ops spk_ttyio_ops = { .synth_out = spk_ttyio_out,
@@ -125,6 +126,7 @@ struct spk_io_ops spk_ttyio_ops = { .synth_in = spk_ttyio_in, .synth_in_nowait = spk_ttyio_in_nowait, .flush_buffer = spk_ttyio_flush_buffer, + .wait_for_xmitr = spk_ttyio_wait_for_xmitr, };EXPORT_SYMBOL_GPL (spk_ttyio_ops);
@@ -286,6 +288,11 @@ static void spk_ttyio_tiocmset(unsignedmutex_unlock (&speakup_tty_mutex); } +static int spk_ttyio_wait_for_xmitr (struct spk_synth *in_synth) +{ +return 1 ; +} +static unsigned char ttyio_in (int timeout) {struct spk_ldisc_data *ldisc_data = speakup_tty->disc_data;
drivers/accessibility/speakup/spk_types.h +1 -0
@@ -158,6 +158,7 @@ struct spk_io_ops {unsigned char (*synth_in)(void );unsigned char (*synth_in_nowait)(void );void (*flush_buffer)(void ); +int (*wait_for_xmitr)(struct spk_synth *synth); };struct spk_synth {
drivers/accessibility/speakup/synth.c +1 -1
@@ -159,7 +159,7 @@ int spk_synth_is_alive_restart(struct sp {if (synth->alive)return 1 ; -if (spk_wait_for_xmitr (synth) >0 ) { +if (synth->io_ops->wait_for_xmitr (synth) >0 ) {/* restart */ synth->alive =1 ;synth_printf ("%s" , synth->init);
Samuel Thibault
maintainerPATCH v2 2/2 speakup: only build serialio when ISA is enabled
Drivers using serialio were already made available in Kconfig only under the ISA condition.
Signed-off-by Samuel Thibault <[email protected]>
drivers/accessibility/speakup/Makefile +1 -1
@@ -25,8 +25,8 @@ speakup-y := \ keyhelp.o \ kobjects.o \ selection.o \ - serialio.o \ spk_ttyio.o \ synth.o \ thread.o \ varhandlers.o +speakup-$(CONFIG_SPEAKUP_SERIALIO) += serialio.o
drivers/accessibility/speakup/Kconfig +9 -4
@@ -42,6 +42,11 @@ config SPEAKUP one of the listed synthesizers, you should say n. if SPEAKUP + +config SPEAKUP_SERIALIO + def_bool y + depends on ISA || COMPILE_TEST + config SPEAKUP_SYNTH_ACNTSA tristate "Accent SA synthesizer support" help
@@ -52,7 +57,7 @@ config SPEAKUP_SYNTH_ACNTSA config SPEAKUP_SYNTH_ACNTPC tristate "Accent PC synthesizer support" - depends on ISA || COMPILE_TEST + depends on SPEAKUP_SERIALIO help This is the Speakup driver for the accent pc synthesizer. You can say y to build it into the kernel,
@@ -104,7 +109,7 @@ config SPEAKUP_SYNTH_DECEXT config SPEAKUP_SYNTH_DECPC depends on m - depends on ISA || COMPILE_TEST + depends on SPEAKUP_SERIALIO tristate "DECtalk PC (big ISA card) synthesizer support" help
@@ -127,7 +132,7 @@ config SPEAKUP_SYNTH_DECPC config SPEAKUP_SYNTH_DTLK tristate "DoubleTalk PC synthesizer support" - depends on ISA || COMPILE_TEST + depends on SPEAKUP_SERIALIO help This is the Speakup driver for the internal DoubleTalk
@@ -138,7 +143,7 @@ config SPEAKUP_SYNTH_DTLK config SPEAKUP_SYNTH_KEYPC tristate "Keynote Gold PC synthesizer support" - depends on ISA || COMPILE_TEST + depends on SPEAKUP_SERIALIO help This is the Speakup driver for the Keynote Gold