From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id DF9621F04EA; Sun, 7 May 2017 14:48:18 -0400 (EDT) Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by befuddled.reisers.ca (Postfix) with ESMTPS id A5C531F04E7 for ; Sun, 7 May 2017 14:48:15 -0400 (EDT) Received: by mail-wr0-x244.google.com with SMTP id 6so5717247wrb.1 for ; Sun, 07 May 2017 11:48:15 -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=JRnppwgMDnVNQz3BLph/4AohQF4flkNIYjclg/pGWug=; b=U7lCHHzfmQCqKewJw1YAPbLPUaX+bevWYD8/ZDIaGc/iYYT2xnHcGFwdf3rPNAebva WHO336Q3qDS6CgJ3L8ws8y6gt9aEO3wCrNbAMH8ahB7YweR2Xn4W06HyaruvCKsoSi0s WknB0vF8nZCERaWUSeTQ02BqH05OObzWAM3/CyfDjkTYa6F/B6J0cNAVE+kAGHJdM1vV JOlj8uRDFhOgjy+dBORfmNfb1NIvfJFshqe1OW6TKfT4FiAO7OyIER3Iv/+mP2xiDu9A whUzCrGrPFogRNKzvIcLkn/XJWv7Ru+a9n2NZGKy7aHa+FLrIEyeNxAxIg1nPlQxHpGd nvhA== 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=JRnppwgMDnVNQz3BLph/4AohQF4flkNIYjclg/pGWug=; b=pFZK0yF4tmz+bc+Zn3bV9nDtW+komvP8T0Cj9EpyhLdyLDd2WuwsnZG3m2knKSl0lS D33/DADoXdVyRfGcqmcJ/TzCgvOniQSksJmeQIWTr/srhRcWSdv0go/dkRY8B3EP0ioZ QxL5TyhTJc3N0otH3v0yrZ6Q2v0JlqyGtziHILo8QRfURil5SBwv3FP8KPG/I6AeOlhx 7rpbhU1XQLrqQ4wDiB1C0v+gxuNZTnDtp3irpbFzQtNAiEQndD7QjWXBrD0jX/8vMTWm HmbEhEUZOCZCRR4FPHJcYkIDVZynubW1Yn/amjvJ43B2JSSDXv+VP09oirmJjKThF2Z0 tncw== X-Gm-Message-State: AN3rC/4S3ZHzLeUXXeqG1Jqaj2Q9YlDuN4EurET6mDqTK6b89jWPhJA4 HgC6oHGN8qGsEA== X-Received: by 10.223.154.226 with SMTP id a89mr38904980wrc.192.1494182885923; Sun, 07 May 2017 11:48:05 -0700 (PDT) Received: from sanghar (host109-151-51-227.range109-151.btcentralplus.com. [109.151.51.227]) by smtp.gmail.com with ESMTPSA id x64sm14144809wrb.10.2017.05.07.11.48.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 May 2017 11:48:05 -0700 (PDT) Date: Sun, 7 May 2017 19:48:03 +0100 From: Okash Khawaja To: speakup@linux-speakup.org Cc: Samuel Thibault , John Covici Subject: staging: speakup: flush tty buffers and ensure hardware flow control Message-ID: <20170507184803.GA4725@sanghar> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170505075821.rse2wsyq75pxgcrc@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: Sun, 07 May 2017 18:48:19 -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. 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 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); @@ -99,6 +101,7 @@ { int ret = 0; struct tty_struct *tty; + struct ktermios tmp_termios; ret = tty_register_ldisc(N_SPEAKUP, &spk_ttyio_ldisc_ops); if (ret) { @@ -127,6 +130,18 @@ } clear_bit(TTY_HUPPED, &tty->flags); + /* ensure hardware flow control is enabled */ + down_read(&tty->termios_rwsem); + tmp_termios = tty->termios; + up_read(&tty->termios_rwsem); + + if (!(tmp_termios.c_cflag & CRTSCTS)) { + tmp_termios.c_cflag |= CRTSCTS; + ret = tty_set_termios(tty, &tmp_termios); + if (ret) + pr_warn("speakup: Failed to set hardware flow control\n"); + } + tty_unlock(tty); ret = tty_set_ldisc(tty, N_SPEAKUP); @@ -201,6 +216,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);