diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-03-07 23:06:57 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-08-13 12:38:42 +0100 |
| commit | 2dc2961f8efc6d013e88cc42244afc0ff558a2b4 (patch) | |
| tree | cf66f00a025d1a56f7cb8199177a483d93ac33d7 /drivers/staging | |
| parent | 507ed215f534a30043dac35a08ccf137166d6020 (diff) | |
| download | linux-stable-2dc2961f8efc6d013e88cc42244afc0ff558a2b4.tar.gz linux-stable-2dc2961f8efc6d013e88cc42244afc0ff558a2b4.tar.bz2 linux-stable-2dc2961f8efc6d013e88cc42244afc0ff558a2b4.zip | |
staging: speakup_soft: Fix alternate speech with other synths
commit 45ac7b31bc6c4af885cc5b5d6c534c15bcbe7643 upstream.
When switching from speakup_soft to another synth, speakup_soft would
keep calling synth_buffer_getc() from softsynthx_read.
Let's thus make synth.c export the knowledge of the current synth, so
that speakup_soft can determine whether it should be running.
speakup_soft also needs to set itself alive, otherwise the switch would
let it remain silent.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.16:
- There's no Unicode support
- Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/speakup/speakup_soft.c | 12 | ||||
| -rw-r--r-- | drivers/staging/speakup/spk_priv.h | 1 | ||||
| -rw-r--r-- | drivers/staging/speakup/synth.c | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c index 9ed726509261..c5bf6b1aa80e 100644 --- a/drivers/staging/speakup/speakup_soft.c +++ b/drivers/staging/speakup/speakup_soft.c @@ -213,10 +213,13 @@ static ssize_t softsynth_read(struct file *fp, char __user *buf, size_t count, DEFINE_WAIT(wait); spin_lock_irqsave(&speakup_info.spinlock, flags); + synth_soft.alive = 1; while (1) { prepare_to_wait(&speakup_event, &wait, TASK_INTERRUPTIBLE); - if (!synth_buffer_empty() || speakup_info.flushing) - break; + if (synth_current() == &synth_soft) { + if (!synth_buffer_empty() || speakup_info.flushing) + break; + } spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (fp->f_flags & O_NONBLOCK) { finish_wait(&speakup_event, &wait); @@ -234,6 +237,8 @@ static ssize_t softsynth_read(struct file *fp, char __user *buf, size_t count, cp = buf; init = get_initstring(); while (chars_sent < count) { + if (synth_current() != &synth_soft) + break; if (speakup_info.flushing) { speakup_info.flushing = 0; ch = '\x18'; @@ -286,7 +291,8 @@ static unsigned int softsynth_poll(struct file *fp, poll_wait(fp, &speakup_event, wait); spin_lock_irqsave(&speakup_info.spinlock, flags); - if (!synth_buffer_empty() || speakup_info.flushing) + if (synth_current() == &synth_soft && + (!synth_buffer_empty() || speakup_info.flushing)) ret = POLLIN | POLLRDNORM; spin_unlock_irqrestore(&speakup_info.spinlock, flags); return ret; diff --git a/drivers/staging/speakup/spk_priv.h b/drivers/staging/speakup/spk_priv.h index 637ba6760ec0..b669021455dd 100644 --- a/drivers/staging/speakup/spk_priv.h +++ b/drivers/staging/speakup/spk_priv.h @@ -72,6 +72,7 @@ extern int synth_request_region(u_long, u_long); extern int synth_release_region(u_long, u_long); extern int synth_add(struct spk_synth *in_synth); extern void synth_remove(struct spk_synth *in_synth); +struct spk_synth *synth_current(void); extern struct speakup_info_t speakup_info; diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c index 172cf62b1aaf..1219089af4b5 100644 --- a/drivers/staging/speakup/synth.c +++ b/drivers/staging/speakup/synth.c @@ -475,4 +475,10 @@ void synth_remove(struct spk_synth *in_synth) } EXPORT_SYMBOL_GPL(synth_remove); +struct spk_synth *synth_current(void) +{ + return synth; +} +EXPORT_SYMBOL_GPL(synth_current); + short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC|B_SYM }; |