linux.git/drivers/staging/speakup/synth.c, branch v4.14

staging: speakup: fix synth caching when synth init fails

2017-06-25T14:31:22+00:00

synths[] array caches currently loaded synths. synth_add checks
synths[] before adding a new one. It however ignores the result of
do_synth_init. So when do_synth_init fails, the failed synth is still
cached. Since, as a result module loading fails too, synth_remove -
which is responsible for removing the cached synth - is never called.
Next time the failing synth is added again it succeeds because
synth_add finds it cached inside synths[].

This patch fixes this by caching a synth only after do_synth_init
succeeds.

Signed-off-by: Okash Khawaja 
Reviewed-by: Samuel Thibault 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: flush tty buffers and ensure hardware flow control

2017-05-16T12:19:41+00:00

This patch fixes the issue where TTY-migrated synths would take a while
to shut up after hitting numpad enter key. When calling synth_flush,
even though XOFF character is sent as high priority, data buffered in
TTY layer is still sent to the synth. This patch flushes that buffered
data when synth_flush is called.

It also tries to ensure that hardware flow control is enabled, by
setting CRTSCTS using tty's termios.

Reported-by: John Covici 
Signed-off-by: Okash Khawaja 
Reviewed-by: Samuel Thibault 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: make input functionality swappable

2017-05-15T10:31:43+00:00

This moves functions which take input from external synth, into struct
spk_io_ops. The calling code then uses serial implementation of those methods
through spk_io_ops. That way we can add a parallel TTY-based implementation and
simply replace serial with TTY. That is what the next patch in this series does.

speakup_decext.c has get_last_char function which reads the most recent
available character from the synth. This patch changes that by defining
read_buff_add callback method of spk_syth and letting that update the last_char
global character read from the synth. read_buff_add is called from ISR, so
there is a possibility for last_char to be stale. Therefore it is marked as
volatile. It also pulls a repeated get_index implementation into synth.c, to
be used as a utility function.

Signed-off-by: Okash Khawaja 
Reviewed-by: Samuel Thibault 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: move those functions which do outgoing serial comms, into serialio.c

2017-03-17T06:19:09+00:00

This moves spk_synth_immediate and spk_serial_synth_probe functions into
serialio.c. These functions do outgoing serial comms. The move is a step
towards collecting all serial comms in serialio.c. This also renames
spk_synth_immediate to spk_serial_synth_immediate.

Code inside those functions has not been changed. Along the way, this patch
also fixes a couple of spots which were calling spk_synth_immediate directly,
so that the calls now happen via the spk_syth struct.

Signed-off-by: Okash Khawaja 

Reviewed-by: Samuel Thibault 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: move spk_stop_serial_interrupt into synth-specific release function

2017-03-16T02:12:02+00:00

This moves call to spk_stop_serial_interrupt() function out of synth_release()
and into release() method of specific spk_synth instances. This is because
the spk_stop_serial_interrupt() call is specific to current serial i/o
implementation. Moving it into each synth's release() method gives the
decision of calling  spk_stop_serial_interrupt() to that synth.

Signed-off-by: Okash Khawaja 
Reviewed-by: Samuel Thibault 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: add spk_io_ops struct to spk_synth

2017-03-16T02:11:22+00:00

This patch adds spk_io_ops struct which contain those methods whose job is to
communicate with synth device. Currently, all comms with external synth
device use raw serial i/o. The idea is to group all methods which do the
actual communication with external device into this new struct. Then migrating
a serial-based synth over to an alternative to raw serial i/o will mean
swapping serial spk_io_ops instance with the io_ops instance of the new
method, making the migration simpler.

At the moment, this struct only contains one method, synth_out but more will
be added in future when migrating synths which require input functionality.
Also at the moment, synth_out method has one implementation which uses
serial i/o. Plan is to add an alternative.

Signed-off-by: Okash Khawaja 
Reviewed-by: Samuel Thibault 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: spk_serial_out and spk_wait_for_xmitr to take synth arg

2017-03-16T02:10:18+00:00

These two functions are always called from a context where spk_synth instance
is available. They also use the spk_synth instance but instead of taking it
as an argument, they rely on a global spk_synth instance inside synth.c which
points to the same synth as the one being passed in as argument.

Signed-off-by: Okash Khawaja 
Reviewed-by: Samuel Thibault 
Signed-off-by: Greg Kroah-Hartman

speakup: extend synth buffer to 16bit unicode characters

2017-03-09T16:28:20+00:00

This extends the synth buffer slots to 16bit, so as to hold 16bit
unicode characters.

synth_buffer_getc and synth_buffer_peek now return 16bit characters.
Speech synthesizers which do not support characters beyond latin1 can
use the synth_buffer_skip_nonlatin1() helper to skip the non-latin1
characters before getting or peeking. All synthesizers are made to use
it for now.

This makes synth_buffer_add take a 16bit character. For simplicity for
now, synth_printf is left to using latin1 formats and strings.
synth_putwc, synth_putwc_s, synth_putws and synth_putws_s helpers are
however added to put 16bit characters and strings.

Signed-off-by: Samuel Thibault 
Reviewed-by: Chris Brannon 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: (coding style) Limit line to 80 chars

2017-03-06T08:17:02+00:00

Fix checkpatch warning about line being over 80 characters.

Signed-off-by: Olav Haugan 
Signed-off-by: Greg Kroah-Hartman

staging: speakup: (coding style) Simplify comparisons to NULL

2017-03-06T08:17:01+00:00

Fix checkpatch check notices by simplifying comparisons to NULL.

Signed-off-by: Olav Haugan 
Signed-off-by: Greg Kroah-Hartman