public inbox for speakup@linux-speakup.org
 help / color / mirror / Atom feed
From: Okash Khawaja <okash.khawaja@gmail.com>
To: samuel.thibault@ens-lyon.org
Cc: speakup@linux-speakup.org
Subject: [patch 3/6] staging: speakup: refactor spk_stop_serial_interrupt
Date: Sat, 25 Feb 2017 19:25:26 +0000	[thread overview]
Message-ID: <20170225192526.GA4507@sanghar> (raw)
In-Reply-To: <20170225192358.GA4499@sanghar>

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
a TTY-based synth implementation wouldn't need spk_stop_serial_interrupt()
call. Moving it into each synth's release() method gives the decision of
calling  spk_stop_serial_interrupt() to that synth. TTY-based synths which
follow in this patchset simply woudn't call it.

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

Index: linux-stable/drivers/staging/speakup/serialio.c
===================================================================
--- linux-stable.orig/drivers/staging/speakup/serialio.c
+++ linux-stable/drivers/staging/speakup/serialio.c
@@ -219,6 +219,7 @@
 
 void spk_serial_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts == 0)
 		return;
 	synth_release_region(speakup_info.port_tts, 8);
Index: linux-stable/drivers/staging/speakup/speakup_acntpc.c
===================================================================
--- linux-stable.orig/drivers/staging/speakup/speakup_acntpc.c
+++ linux-stable/drivers/staging/speakup/speakup_acntpc.c
@@ -303,6 +303,7 @@
 
 static void accent_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts)
 		synth_release_region(speakup_info.port_tts-1, SYNTH_IO_EXTENT);
 	speakup_info.port_tts = 0;
Index: linux-stable/drivers/staging/speakup/speakup_decpc.c
===================================================================
--- linux-stable.orig/drivers/staging/speakup/speakup_decpc.c
+++ linux-stable/drivers/staging/speakup/speakup_decpc.c
@@ -482,6 +482,7 @@
 
 static void dtpc_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts)
 		synth_release_region(speakup_info.port_tts, SYNTH_IO_EXTENT);
 	speakup_info.port_tts = 0;
Index: linux-stable/drivers/staging/speakup/speakup_dtlk.c
===================================================================
--- linux-stable.orig/drivers/staging/speakup/speakup_dtlk.c
+++ linux-stable/drivers/staging/speakup/speakup_dtlk.c
@@ -374,6 +374,7 @@
 
 static void dtlk_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts)
 		synth_release_region(speakup_info.port_tts-1, SYNTH_IO_EXTENT);
 	speakup_info.port_tts = 0;
Index: linux-stable/drivers/staging/speakup/speakup_keypc.c
===================================================================
--- linux-stable.orig/drivers/staging/speakup/speakup_keypc.c
+++ linux-stable/drivers/staging/speakup/speakup_keypc.c
@@ -305,6 +305,7 @@
 
 static void keynote_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (synth_port)
 		synth_release_region(synth_port, SYNTH_IO_EXTENT);
 	synth_port = 0;
Index: linux-stable/drivers/staging/speakup/synth.c
===================================================================
--- linux-stable.orig/drivers/staging/speakup/synth.c
+++ linux-stable/drivers/staging/speakup/synth.c
@@ -432,7 +432,6 @@
 		sysfs_remove_group(speakup_kobj, &synth->attributes);
 	for (var = synth->vars; var->var_id != MAXVARS; var++)
 		speakup_unregister_var(var->var_id);
-	spk_stop_serial_interrupt();
 	synth->release();
 	synth = NULL;
 }

  parent reply	other threads:[~ UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
 [patch 0/6] staging: speakup: Introduce TTY-based comms Okash Khawaja
 ` [patch 1/6] tty_port: allow a port to be opened with a tty that has no file handle Okash Khawaja
   ` Samuel Thibault
     ` Samuel Thibault
       ` John Covici
         ` Samuel Thibault
       ` Okash Khawaja
         ` Samuel Thibault
           ` Okash Khawaja
             ` Samuel Thibault
               ` Okash Khawaja
                 ` Samuel Thibault
                   ` Okash Khawaja
     [not found]   ` <20170225192358.GA4499@sanghar>
     ` Okash Khawaja [this message]
       ` [patch 4/6] staging: speakup: Add spk_ttyio Okash Khawaja
         ` [patch 5/6] staging: speakup: Make speakup_dummy use ttyio Okash Khawaja
           ` [patch 6/6] staging: speakup: Migrate acntsa, bns, dectlk and txprt to ttyio Okash Khawaja
             ` Samuel Thibault
             ` Samuel Thibault
               ` Samuel Thibault
                 ` Samuel Thibault
                   ` Okash Khawaja
                     ` Samuel Thibault
                       ` Okash Khawaja
                 ` Okash Khawaja
                   ` Samuel Thibault
                     ` Okash Khawaja
                       ` Samuel Thibault
             ` Samuel Thibault
             ` Samuel Thibault
               ` Okash Khawaja
                 ` Samuel Thibault
                   ` Okash Khawaja
                     ` Samuel Thibault
             ` Samuel Thibault
             ` Samuel Thibault
         ` [patch 4/6] staging: speakup: Add spk_ttyio Samuel Thibault
         ` Samuel Thibault
       ` [patch 3/6] staging: speakup: refactor spk_stop_serial_interrupt Samuel Thibault
         ` Okash Khawaja
           ` Samuel Thibault
     ` [patch 2/6] staging: speakup: Add serial_out method Samuel Thibault
     ` Samuel Thibault
       ` Okash Khawaja
         ` Samuel Thibault
 ` [patch 0/6] staging: speakup: Introduce TTY-based comms Trevor Astrope
   ` Okash Khawaja
 ` Samuel Thibault
   ` Samuel Thibault
 ` Samuel Thibault
 ` Read this first :) " Samuel Thibault
   ` Okash Khawaja
     ` Samuel Thibault

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170225192526.GA4507@sanghar \
    --to=okash.khawaja@gmail.com \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=speakup@linux-speakup.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).