Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754278AbdCMWK2 (ORCPT ); Mon, 13 Mar 2017 18:10:28 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33380 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752623AbdCMWJk (ORCPT ); Mon, 13 Mar 2017 18:09:40 -0400 Message-Id: <20170313220936.665256820@gmail.com> User-Agent: quilt/0.63-1 Date: Mon, 13 Mar 2017 22:05:58 +0000 From: okash.khawaja@gmail.com To: Greg Kroah-Hartman , Jiri Slaby , Samuel Thibault , linux-kernel@vger.kernel.org Cc: William Hubbs , Chris Brannon , Kirk Reiser , speakup@linux-speakup.org, devel@driverdev.osuosl.org, Okash Khawaja Subject: [patch 7/7] staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio References: <20170313220551.312820470@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=07_migrate_dummy_acntsa_bns_txprt_to_ttyio Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2671 Lines: 73 This changes the above five synths to TTY-based comms. They were chosen as a first pass because their serial comms are straightforward, i.e. they don't use serial input and don't do internal port knocking. Signed-off-by: Okash Khawaja Reviewed-by: Samuel Thibault Index: linux-4.10.1/drivers/staging/speakup/speakup_dummy.c =================================================================== --- linux-4.10.1.orig/drivers/staging/speakup/speakup_dummy.c +++ linux-4.10.1/drivers/staging/speakup/speakup_dummy.c @@ -98,10 +98,10 @@ .startup = SYNTH_START, .checkval = SYNTH_CHECK, .vars = vars, - .io_ops = &spk_serial_io_ops, - .probe = spk_serial_synth_probe, - .release = spk_serial_release, - .synth_immediate = spk_serial_synth_immediate, + .io_ops = &spk_ttyio_ops, + .probe = spk_ttyio_synth_probe, + .release = spk_ttyio_release, + .synth_immediate = spk_ttyio_synth_immediate, .catch_up = spk_do_catch_up, .flush = spk_synth_flush, .is_alive = spk_synth_is_alive_restart, Index: linux-4.10.1/drivers/staging/speakup/speakup_acntsa.c =================================================================== --- linux-4.10.1.orig/drivers/staging/speakup/speakup_acntsa.c +++ linux-4.10.1/drivers/staging/speakup/speakup_acntsa.c @@ -99,10 +99,10 @@ .startup = SYNTH_START, .checkval = SYNTH_CHECK, .vars = vars, - .io_ops = &spk_serial_io_ops, + .io_ops = &spk_ttyio_ops, .probe = synth_probe, - .release = spk_serial_release, - .synth_immediate = spk_serial_synth_immediate, + .release = spk_ttyio_release, + .synth_immediate = spk_ttyio_synth_immediate, .catch_up = spk_do_catch_up, .flush = spk_synth_flush, .is_alive = spk_synth_is_alive_restart, @@ -125,7 +125,7 @@ { int failed; - failed = spk_serial_synth_probe(synth); + failed = spk_ttyio_synth_probe(synth); if (failed == 0) { synth->synth_immediate(synth, "\033=R\r"); mdelay(100); Index: linux-4.10.1/drivers/staging/speakup/speakup_txprt.c =================================================================== --- linux-4.10.1.orig/drivers/staging/speakup/speakup_txprt.c +++ linux-4.10.1/drivers/staging/speakup/speakup_txprt.c @@ -95,10 +95,10 @@ .startup = SYNTH_START, .checkval = SYNTH_CHECK, .vars = vars, - .io_ops = &spk_serial_io_ops, - .probe = spk_serial_synth_probe, - .release = spk_serial_release, - .synth_immediate = spk_serial_synth_immediate, + .io_ops = &spk_ttyio_ops, + .probe = spk_ttyio_synth_probe, + .release = spk_ttyio_release, + .synth_immediate = spk_ttyio_synth_immediate, .catch_up = spk_do_catch_up, .flush = spk_synth_flush, .is_alive = spk_synth_is_alive_restart,