From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id A2B441EFD46; Sat, 19 Nov 2016 10:46:10 -0500 (EST) 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 836D41EFC1C for ; Sat, 19 Nov 2016 10:46:06 -0500 (EST) Received: by mail-wm0-x242.google.com with SMTP id u144so13925478wmu.0 for ; Sat, 19 Nov 2016 07:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :in-reply-to:user-agent; bh=eGseeoCBHNfj/C/wUcS17mEBshb0txyKEdaiT7l5iaQ=; b=mbMp5iKwDgdGHg4QrPba5eeGWVwALtLzLUOx79BPCdc7VzFIzWlETi7DfmYOGVRaUd rYfL0pzm6n1Mkhp3q7wbS1+l4sxhrfrqrPHIsbt8xkPmhyFq1rRa0gJKbchLBIKwEjl4 Ljm6rpD1PlvnL1vsXezPHKIycEfxdP4Jgzj5bknXy3jxThd8anKm6YM7FFQRBB74UX3m RrZBPXC0OKRgCIUWcyjxBIsfP4f3+iHp4+0ymNGsbaff72TPhOsJQLXHdkpEXO8Yr9/0 KtMa0mR2N4snjQZx0WA0fvGaZ4Mn7lZzrBZJuFqkc8H1KznFoeOx/gJGpz6Sftf9OdDs 2ZYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:in-reply-to:user-agent; bh=eGseeoCBHNfj/C/wUcS17mEBshb0txyKEdaiT7l5iaQ=; b=YYS/ReA45eWpydr2WN+htGyWTl9lCJzqT4EOwGR9xINOd+IXKId4RyWyEeVOIJXBNw VMRXcD44Y3mGsx/kjw1bMee+WOfSZ8lSbffv0xX439wLPnBQMWCKjjyYUiKDQ0YRzc+/ Q0KSfkZWQhjgHSVCs9Se6AKyXm9OLmHmVajTvkBtHHZL7n468IAfBztbVXNHc04bArfP IOC64I/pXpcGR4xjPziFTyj9m2nz9/YcKU++KjGhhvsACgHHvx7g7Ax5+fzzuNN2F9qE 2DuPOrJ27xxP+RqB4/lmh3i07vl9nqSo1clzxY1jmGyyGCmcNRxL/byzs/XDtDoH31R2 C+RA== X-Gm-Message-State: AKaTC01hGIkQ2B0B6Tb5OLY+1w5bo1Y/4aFcfVAyLAdwrizWwwJMehHRtFZP95ePOZk52w== X-Received: by 10.28.104.213 with SMTP id d204mr3785280wmc.101.1479570365528; Sat, 19 Nov 2016 07:46:05 -0800 (PST) Received: from sanghar (cpc91372-watf11-2-0-cust614.15-2.cable.virginm.net. [86.14.2.103]) by smtp.gmail.com with ESMTPSA id f10sm14770241wjl.28.2016.11.19.07.46.04 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Nov 2016 07:46:05 -0800 (PST) Date: Sat, 19 Nov 2016 15:46:04 +0000 From: Okash Khawaja To: kirk@reisers.ca, samuel.thibault@ens-lyon.org, david.a.borowski@gmail.com, chris@the-brannons.com, w.d.hubbs@gmail.com, gregkh@linuxfoundation.org Cc: speakup@linux-speakup.org, devel@driverdev.osuosl.org Subject: [PATCH 1/3] staging: speakup: add serial_out() method to spk_synth Message-ID: <20161119154604.GA962@sanghar> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161119154328.GA946@sanghar> User-Agent: Mutt/1.7.1 (2016-10-04) 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: Sat, 19 Nov 2016 15:46:10 -0000 This does two things: 1. add serial_out() method to spk_synth 2. replace calls to spk_serial_out() in spk_do_catch_up() and spk_synth_flush() with calls to serial_out() spk_do_catch_up() and spk_synth_flush() are the only functions through which speakup_dummy calls into spk_serial_out(). Calls to spk_serial_out() in other drivers can stay for now. Signed-off-by: Okash Khawaja --- drivers/staging/speakup/spk_types.h | 1 + drivers/staging/speakup/synth.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/speakup/spk_types.h b/drivers/staging/speakup/spk_types.h index e8ff5d7..56dc7df 100644 --- a/drivers/staging/speakup/spk_types.h +++ b/drivers/staging/speakup/spk_types.h @@ -168,6 +168,7 @@ struct spk_synth { int *default_vol; int (*probe)(struct spk_synth *synth); void (*release)(void); + int (*serial_out)(const char ch); const char *(*synth_immediate)(struct spk_synth *synth, const char *buff); void (*catch_up)(struct spk_synth *synth); diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c index 4f462c3..cef6591 100644 --- a/drivers/staging/speakup/synth.c +++ b/drivers/staging/speakup/synth.c @@ -118,7 +118,7 @@ void spk_do_catch_up(struct spk_synth *synth) spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (ch == '\n') ch = synth->procspeech; - if (!spk_serial_out(ch)) { + if (!synth->serial_out(ch)) { schedule_timeout(msecs_to_jiffies(full_time_val)); continue; } @@ -128,7 +128,7 @@ void spk_do_catch_up(struct spk_synth *synth) delay_time_val = delay_time->u.n.value; full_time_val = full_time->u.n.value; spin_unlock_irqrestore(&speakup_info.spinlock, flags); - if (spk_serial_out(synth->procspeech)) + if (synth->serial_out(synth->procspeech)) schedule_timeout( msecs_to_jiffies(delay_time_val)); else @@ -141,7 +141,7 @@ void spk_do_catch_up(struct spk_synth *synth) synth_buffer_getc(); spin_unlock_irqrestore(&speakup_info.spinlock, flags); } - spk_serial_out(synth->procspeech); + synth->serial_out(synth->procspeech); } EXPORT_SYMBOL_GPL(spk_do_catch_up); @@ -164,7 +164,7 @@ EXPORT_SYMBOL_GPL(spk_synth_immediate); void spk_synth_flush(struct spk_synth *synth) { - spk_serial_out(synth->clear); + synth->serial_out(synth->clear); } EXPORT_SYMBOL_GPL(spk_synth_flush); -- 2.10.2