From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 225D0C5479D for ; Fri, 6 Jan 2023 14:55:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9C2F585640; Fri, 6 Jan 2023 15:53:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PSywypfs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23BC1854CE; Fri, 6 Jan 2023 15:53:17 +0100 (CET) Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1508685604 for ; Fri, 6 Jan 2023 15:52:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id h26so1068917ila.11 for ; Fri, 06 Jan 2023 06:52:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xLRnd9KlK91dT5qD1NPWTlgbfQ+23FHiattSvcoUGVE=; b=PSywypfstgsLeBhGD6fuqivRk0RuHXDoIhUrJotB+QEU91dXk9dL7K3grw81O12Llh TdpNLpeZWnMWcqpT2e2HNsEcA9o4gtdCHrUtZyS/EvMpwOFWtoSpEUyOwV7maS7OF7uk t9jFL+aW2lhj0/+5AH+6vqeWPfeqRHTpKmqks= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xLRnd9KlK91dT5qD1NPWTlgbfQ+23FHiattSvcoUGVE=; b=KPS0CPaHRRG91OCs+FtwZ9qRM3bD7CCwvHqXhi3hktqiAj5kRAgJQGPw2Esmhv2kLq rxVeZIyNlswLkszVT2seDM7rVuL0QLGQwQMLhf4Fo9qWZ80gzbAMZuzKnv3RgRxs5m09 zZluyMf19hOEqtT0TU4U+NpcbjZDE4TEskXxJQa0X2zcmX8SnjkyuW7f0+ge/hBM6Z95 CFP/5/soXJiasuFVgiBCui/rWyRyFIAgXpgYvGWNeAKdTH5Kp392dSswJaoIg/+vNpQH fjXRzv7oqZsSKSNpdIPaIQGJxWFE0r+krfzrQUzIek8mBW0TyYCX6zfYqGVfT/8F2NEZ +YsQ== X-Gm-Message-State: AFqh2kpF1HziKbCLTPwx60j3eyOX1LV1uxYVjPqVWzEa7PLBK4LClYYH 5F5B3QncM+VDtwL3tvQHJ59oxQT5PN2Sq7gtnW0= X-Google-Smtp-Source: AMrXdXtBDxz8eHndLUDlwEEw48iwyQitfGs+AcOELAup9m1pKh38IKboQtnFJIvhIkj389BeoxJ8SQ== X-Received: by 2002:a92:2802:0:b0:303:3163:cb0a with SMTP id l2-20020a922802000000b003033163cb0amr38086944ilf.17.1673016776575; Fri, 06 Jan 2023 06:52:56 -0800 (PST) Received: from sjg1.lan (c-71-56-217-229.hsd1.co.comcast.net. [71.56.217.229]) by smtp.gmail.com with ESMTPSA id w20-20020a05663800d400b00375783003fcsm360273jao.136.2023.01.06.06.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 06:52:56 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Tom Rini , Heinrich Schuchardt , Simon Glass Subject: [PATCH v3 07/25] menu: Use a switch statement Date: Fri, 6 Jan 2023 08:52:25 -0600 Message-Id: <20230106145243.411626-8-sjg@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230106145243.411626-1-sjg@chromium.org> References: <20230106145243.411626-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Convert the long line of if() statements to a switch() since this makes better use of the C language. Signed-off-by: Simon Glass --- (no changes since v1) common/menu.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/common/menu.c b/common/menu.c index 6842f5409d6..7db98942a61 100644 --- a/common/menu.c +++ b/common/menu.c @@ -543,22 +543,31 @@ enum bootmenu_key bootmenu_loop(struct bootmenu_data *menu, int *esc) break; } - /* enter key was pressed */ - if (c == '\r') + switch (c) { + case '\r': + /* enter key was pressed */ key = BKEY_SELECT; - - /* ^C was pressed */ - if (c == 0x3) + break; + case CTL_CH('c'): + /* ^C was pressed */ key = BKEY_QUIT; - - if (c == '+') + break; + case CTL_CH('p'): + key = BKEY_UP; + break; + case CTL_CH('n'): + key = BKEY_DOWN; + break; + case '+': key = BKEY_PLUS; - - if (c == '-') + break; + case '-': key = BKEY_MINUS; - - if (c == ' ') + break; + case ' ': key = BKEY_SPACE; + break; + } return key; } -- 2.39.0.314.g84b9a713c41-goog