From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id D9F311F023F; Sat, 29 Apr 2017 15:54:17 -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 1218F1F0213 for ; Sat, 29 Apr 2017 15:54:14 -0400 (EDT) Received: by mail-wm0-x242.google.com with SMTP id d79so17107650wmi.2 for ; Sat, 29 Apr 2017 12:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:user-agent:date:from:to:cc:subject:references :mime-version:content-disposition; bh=kAId7HiReiJ8q1oFCp/Q0xg4DWw9hn8iIbnj+GGoThs=; b=u1/XRu9vsaYCHJR6M8CxXBRLOKj5GS1xw19rQtUyL3+mjkzH1woTzXXPL/yLWbP/0C e35h08OShQlafTBKXsGysVwWYKe02GzpoZhz4q3CcvBHniGuF9WV+SywAZqWqm0c0lHD DFAi3Ru6ujzuVKLdpWvQXOpkGanKlaFzOSGu20c6soI7VtNAzexBOXfCu5MFivnJzO74 tYF9/7TohNptg6JY5yI6Z91pVbkXsCmBjoBkkbjFxeIFAevFQIVdWI/iKnKxLgRGTuSr UIgrfZOhZe3O75dbmOyGQ4n8fq94wX6yisIy+MDwe673qLMAmtSuHb4oTj8S5VjG2LSM nQpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:user-agent:date:from:to:cc:subject :references:mime-version:content-disposition; bh=kAId7HiReiJ8q1oFCp/Q0xg4DWw9hn8iIbnj+GGoThs=; b=hmLZrA/IzPtrlJH639BWacLGtUVxoAeaHgIEK4n5tcIoMk57nb5GNNCWnead9dvIhr VS+DHM0gaLQtrQpxwkjoWlXJ16mes0a27MxYYqM3OLtPadMYiqSyhUE6DcLeQ5Gj0RpP gV4XEvYRHUC3sPlHfAJow0BDud2GnGltuK9GLuI8AwGbQAeJPkj9eS30ym9kgI3xNuvt ZSE/lF/gknf6/ARREnraUecJUKqa1Q/mMorN9sm8sQqqvXNeNPUmwNy7XFtv9aRmFN3Z KPpq60sx4fwgNRck1VGRIhb5PuQAFeoa9o8hfHjG6n8D9ep6oXtrzknvtOWLkGz3R+C4 n8mg== X-Gm-Message-State: AN3rC/7fKfauwd+KfTJGkFAhi/6EPAWc9JBCnWZR7Wy2ILVyQf2iEx22 LcOxXkW+xZ0kGQ== X-Received: by 10.28.206.2 with SMTP id e2mr2488895wmg.3.1493495651828; Sat, 29 Apr 2017 12:54:11 -0700 (PDT) Received: from sanghar.laptop ([2a00:23c4:7320:5e00:224:d6ff:fe76:7136]) by smtp.gmail.com with ESMTPSA id h9sm4919474wrc.28.2017.04.29.12.54.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 29 Apr 2017 12:54:11 -0700 (PDT) Received: by sanghar.laptop (sSMTP sendmail emulation); Sat, 29 Apr 2017 20:54:09 +0100 Message-Id: <20170429195409.178320091@gmail.com> User-Agent: quilt/0.65 Date: Sat, 29 Apr 2017 20:53:01 +0100 From: Okash Khawaja 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 4/6] staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio References: <20170429195257.630355823@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=04_migrate_dummy_acntsa_bns_txprt_to_ttyio 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, 29 Apr 2017 19:54:18 -0000 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-staging/drivers/staging/speakup/speakup_dummy.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_dummy.c +++ linux-staging/drivers/staging/speakup/speakup_dummy.c @@ -98,10 +98,10 @@ static struct spk_synth synth_dummy = { .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-staging/drivers/staging/speakup/speakup_acntsa.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_acntsa.c +++ linux-staging/drivers/staging/speakup/speakup_acntsa.c @@ -99,10 +99,10 @@ static struct spk_synth synth_acntsa = { .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 @@ static int synth_probe(struct spk_synth { 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-staging/drivers/staging/speakup/speakup_txprt.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_txprt.c +++ linux-staging/drivers/staging/speakup/speakup_txprt.c @@ -95,10 +95,10 @@ static struct spk_synth synth_txprt = { .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,