From patchwork Wed Jul 8 00:11:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 29553 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id F15DDB709C for ; Wed, 8 Jul 2009 10:20:28 +1000 (EST) Received: by ozlabs.org (Postfix) id A6D31DE2A5; Wed, 8 Jul 2009 10:19:32 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id A52F6DE29A for ; Wed, 8 Jul 2009 10:19:32 +1000 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0CC82DDFB6; Wed, 8 Jul 2009 10:18:13 +1000 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1/Sq7U2XRPwoZk+4zoIaQBIq3aJPO+7CbU@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n680I60V026500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 8 Jul 2009 00:18:06 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n680I6SF026499; Wed, 8 Jul 2009 00:18:06 GMT Message-Id: <20090708001135.615501647@am.sony.com> User-Agent: quilt/0.47-1 Date: Tue, 07 Jul 2009 17:11:44 -0700 From: Geoff Levand To: Jeremy Kerr In-Reply-To: <20090708001134.934244536@am.sony.com> References: <20090708001134.934244536@am.sony.com> Content-Disposition: inline; filename=ked-remove-ctrl-b.diff X-Virus-Scanned: ClamAV 0.93.3/9541/Tue Jul 7 17:31:53 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Wed, 08 Jul 2009 00:18:06 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 10/31] petitboot: Remove ked ctrl-B hot key X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Remove ked ctrl-B hot key. It is just as easy to hit enter twice. Signed-off-by: Geoff Levand --- ui/ncurses/nc-ked.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) --- a/ui/ncurses/nc-ked.c +++ b/ui/ncurses/nc-ked.c @@ -189,6 +189,7 @@ static struct pb_kexec_data *ked_prepare static void ked_process_key(struct nc_scr *scr) { struct ked *ked = ked_from_scr(scr); + struct pb_kexec_data *kd; while (1) { int c = getch(); @@ -204,29 +205,17 @@ static void ked_process_key(struct nc_sc break; /* hot keys */ - case 2: { /* CTRL-B */ - struct pb_kexec_data *kd; - - form_driver(ked->ncf, REQ_VALIDATION); - kd = ked_prepare_data(ked); - ked->on_exit(ked, ked_boot, kd); - nc_flush_keys(); - return; - } case 27: /* ESC */ ked->on_exit(ked, ked_cancel, NULL); nc_flush_keys(); return; case '\n': - case '\r': { - struct pb_kexec_data *kd; - + case '\r': form_driver(ked->ncf, REQ_VALIDATION); kd = ked_prepare_data(ked); ked->on_exit(ked, ked_update, kd); nc_flush_keys(); return; - } /* insert mode */ case KEY_IC: @@ -334,7 +323,7 @@ struct ked *ked_init(void *ui_ctx, const ked->scr.frame.title = talloc_strdup(ked, "Petitboot Option Editor"); ked->scr.frame.help = talloc_strdup(ked, - "ESC=cancel, Enter=accept, Ctrl-b=boot"); + "ESC=cancel, Enter=accept"); ked->on_exit = on_exit;