From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id 5FF231EFEE8; Mon, 1 May 2017 14:02:30 -0400 (EDT) Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by befuddled.reisers.ca (Postfix) with ESMTPS id 1A0D81EFEDA for ; Mon, 1 May 2017 14:02:28 -0400 (EDT) Received: by mail-wm0-x242.google.com with SMTP id d79so24733111wmi.2 for ; Mon, 01 May 2017 11:02:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :in-reply-to:user-agent; bh=soccb4+MYAXFlaQmnXsXiMBUmqxkgxmvVtyxYpnHVAY=; b=GCPWSfLfr1J/jKOxfX2F14AJypJfvEPOiOjdpXl6nSOkmVFIJqQvvmq6uwpWJetyKZ KpxypCI3uI6V9FnKjLzhVQrwwpskBzLuwdYsmNj71bhPRNZYlgloTzes6bJ+Ju0ApuBw o6/ShK3NsWqnAbXa71KZOL5z9yf70WFDGU62W4P9Gdtq9ipDn7TwcXuXfgIb5bY0btTL GlZ2kQE1eW2LAcbSAdGl8/lW+9o4Y/cyopkL/1u3ShY90Z0vYuuK3039MoRSqKYY8dzp zh4QFdpNYB3XUArTgVyKlp+zrKfnQAADFAVlEDZdFp98VCABU7X3V5IsFSnzbGyzoIa9 QHQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:in-reply-to:user-agent; bh=soccb4+MYAXFlaQmnXsXiMBUmqxkgxmvVtyxYpnHVAY=; b=jhZjEdAcarI7RveIjpNvOlqRR2nvw/1IlWUH7tvEiSZX7/azKm+br88KzyXMuM36bA Zl7OREDE6O53RVWFp9z7NITrc96SvX55zKPThFmk94nhtqaS73YvnRkTInCLdR8GdaAO e6O1eB814VdXBaSl4y5Cezzbrornye4IcUtXXBQSIgUQYzo/0c4ow+ucsUK6qvil1tdi uvhFKQ/ZP5R7cE0UowXRawG/tJVNQGnVni/pVF8PbQFgFTQssMDaehlQu/dhOb/X6tmS EpwYuwF2sEAUjPZtAn55GRMLU8nOnsZlu8wCt3pGE9R28mQlQokmzg2VIYEY5wbaGtf9 xRyw== X-Gm-Message-State: AN3rC/7jJm69Si1JuWf8ASLbUt1Q9IPFIYjweIstxHYVEzGeAxhPAD/3 Cxaud/IVWlFjtg== X-Received: by 10.28.213.72 with SMTP id m69mr6928755wmg.9.1493661731317; Mon, 01 May 2017 11:02:11 -0700 (PDT) Received: from sanghar ([2a00:23c4:7320:5e00:224:d6ff:fe76:7136]) by smtp.gmail.com with ESMTPSA id l81sm11525368wmi.22.2017.05.01.11.02.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 May 2017 11:02:10 -0700 (PDT) Date: Mon, 1 May 2017 19:02:08 +0100 From: Okash Khawaja To: Samuel Thibault , John Covici Cc: speakup@linux-speakup.org Subject: staging: speakup: flush tty buffers Message-ID: <20170501180208.GA4197@sanghar> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170501093320.fqjvxcoz6zloa4eg@var.youpi.perso.aquilenet.fr> User-Agent: Mutt/1.8.2 (2017-04-18) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 X-BeenThere: speakup@linux-speakup.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Speakup is a screen review system for Linux." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2017 18:02:30 -0000 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. Reported-by: John Covici Signed-off-by: Okash Khawaja Index: linux-staging/drivers/staging/speakup/serialio.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/serialio.c +++ linux-staging/drivers/staging/speakup/serialio.c @@ -30,6 +30,7 @@ static void spk_serial_tiocmset(unsigned int set, unsigned int clear); static unsigned char spk_serial_in(void); static unsigned char spk_serial_in_nowait(void); +static void spk_serial_flush_buffer(void); struct spk_io_ops spk_serial_io_ops = { .synth_out = spk_serial_out, @@ -37,6 +38,7 @@ .tiocmset = spk_serial_tiocmset, .synth_in = spk_serial_in, .synth_in_nowait = spk_serial_in_nowait, + .flush_buffer = spk_serial_flush_buffer, }; EXPORT_SYMBOL_GPL(spk_serial_io_ops); @@ -268,6 +270,11 @@ return inb_p(speakup_info.port_tts + UART_RX); } +static void spk_serial_flush_buffer(void) +{ + /* TODO: flush the UART 16550 buffer */ +} + static int spk_serial_out(struct spk_synth *in_synth, const char ch) { if (in_synth->alive && spk_wait_for_xmitr(in_synth)) { Index: linux-staging/drivers/staging/speakup/spk_ttyio.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/spk_ttyio.c +++ linux-staging/drivers/staging/speakup/spk_ttyio.c @@ -85,6 +85,7 @@ static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear); static unsigned char spk_ttyio_in(void); static unsigned char spk_ttyio_in_nowait(void); +static void spk_ttyio_flush_buffer(void); struct spk_io_ops spk_ttyio_ops = { .synth_out = spk_ttyio_out, @@ -92,6 +93,7 @@ .tiocmset = spk_ttyio_tiocmset, .synth_in = spk_ttyio_in, .synth_in_nowait = spk_ttyio_in_nowait, + .flush_buffer = spk_ttyio_flush_buffer, }; EXPORT_SYMBOL_GPL(spk_ttyio_ops); @@ -201,6 +203,11 @@ return (rv == 0xff) ? 0 : rv; } +static void spk_ttyio_flush_buffer(void) +{ + speakup_tty->ops->flush_buffer(speakup_tty); +} + int spk_ttyio_synth_probe(struct spk_synth *synth) { int rv = spk_ttyio_initialise_ldisc(synth->ser); Index: linux-staging/drivers/staging/speakup/spk_types.h =================================================================== --- linux-staging.orig/drivers/staging/speakup/spk_types.h +++ linux-staging/drivers/staging/speakup/spk_types.h @@ -154,6 +154,7 @@ void (*tiocmset)(unsigned int set, unsigned int clear); unsigned char (*synth_in)(void); unsigned char (*synth_in_nowait)(void); + void (*flush_buffer)(void); }; struct spk_synth { Index: linux-staging/drivers/staging/speakup/speakup_audptr.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_audptr.c +++ linux-staging/drivers/staging/speakup/speakup_audptr.c @@ -127,6 +127,7 @@ static void synth_flush(struct spk_synth *synth) { + synth->io_ops->flush_buffer(); synth->io_ops->send_xchar(SYNTH_CLEAR); synth->io_ops->synth_out(synth, PROCSPEECH); } Index: linux-staging/drivers/staging/speakup/speakup_decext.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_decext.c +++ linux-staging/drivers/staging/speakup/speakup_decext.c @@ -221,6 +221,7 @@ static void synth_flush(struct spk_synth *synth) { in_escape = 0; + synth->io_ops->flush_buffer(); synth->synth_immediate(synth, "\033P;10z\033\\"); } Index: linux-staging/drivers/staging/speakup/speakup_dectlk.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_dectlk.c +++ linux-staging/drivers/staging/speakup/speakup_dectlk.c @@ -293,6 +293,7 @@ synth->io_ops->synth_out(synth, ']'); in_escape = 0; is_flushing = 1; + synth->io_ops->flush_buffer(); synth->io_ops->synth_out(synth, SYNTH_CLEAR); } Index: linux-staging/drivers/staging/speakup/speakup_spkout.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_spkout.c +++ linux-staging/drivers/staging/speakup/speakup_spkout.c @@ -125,6 +125,7 @@ static void synth_flush(struct spk_synth *synth) { + synth->io_ops->flush_buffer(); synth->io_ops->send_xchar(SYNTH_CLEAR); } Index: linux-staging/drivers/staging/speakup/synth.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/synth.c +++ linux-staging/drivers/staging/speakup/synth.c @@ -120,6 +120,7 @@ void spk_synth_flush(struct spk_synth *synth) { + synth->io_ops->flush_buffer(); synth->io_ops->synth_out(synth, synth->clear); } EXPORT_SYMBOL_GPL(spk_synth_flush);