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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73359C3A5A4 for ; Sun, 1 Sep 2019 15:53:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4ECA620674 for ; Sun, 1 Sep 2019 15:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728874AbfIAPxA (ORCPT ); Sun, 1 Sep 2019 11:53:00 -0400 Received: from pio-pvt-msa3.bahnhof.se ([79.136.2.42]:41972 "EHLO pio-pvt-msa3.bahnhof.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728616AbfIAPxA (ORCPT ); Sun, 1 Sep 2019 11:53:00 -0400 Received: from localhost (localhost [127.0.0.1]) by pio-pvt-msa3.bahnhof.se (Postfix) with ESMTP id 0C12F3F695 for ; Sun, 1 Sep 2019 17:52:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bahnhof.se Received: from pio-pvt-msa3.bahnhof.se ([127.0.0.1]) by localhost (pio-pvt-msa3.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4qlIxCNUCWes for ; Sun, 1 Sep 2019 17:52:57 +0200 (CEST) Received: from localhost (h-41-252.A163.priv.bahnhof.se [46.59.41.252]) (Authenticated sender: mb547485) by pio-pvt-msa3.bahnhof.se (Postfix) with ESMTPA id 6749D3F684 for ; Sun, 1 Sep 2019 17:52:57 +0200 (CEST) Date: Sun, 1 Sep 2019 17:52:57 +0200 From: Fredrik Noring To: linux-mips@vger.kernel.org Subject: [PATCH 042/120] MIPS: PS2: ROM: Resolve the name for the region in the ROMVER file Message-ID: <938c0cf921142d71b832d0c062503aeff71c103f.1567326213.git.noring@nocrew.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 'J' indicates Japan, 'E' indicates Europe, 'C' indicates China and 'A' and 'H' indicate the USA. Signed-off-by: Fredrik Noring --- arch/mips/include/asm/mach-ps2/rom.h | 5 ++++- arch/mips/ps2/rom.c | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/arch/mips/include/asm/mach-ps2/rom.h b/arch/mips/include/asm/mach-ps2/rom.h index 0b0e7c4162f5..43770fd62a2e 100644 --- a/arch/mips/include/asm/mach-ps2/rom.h +++ b/arch/mips/include/asm/mach-ps2/rom.h @@ -135,7 +135,8 @@ struct rom_extinfo rom_read_extinfo(const char *name, * @date.month: month ROM was created * @date.day: day ROM was created * - * The @type name can be resolved with rom_type_name(). + * The @region and @type names can be resolved with rom_region_name() and + * rom_type_name(). * * Note that the Namco System 246 arcade systems are TOOL types as well. * @@ -155,6 +156,8 @@ struct rom_ver { struct rom_ver rom_version(void); +const char *rom_region_name(char region); + const char *rom_type_name(char type); bool rom_empty_dir(const struct rom_dir dir); diff --git a/arch/mips/ps2/rom.c b/arch/mips/ps2/rom.c index 9adea705cbca..7cdc4962069e 100644 --- a/arch/mips/ps2/rom.c +++ b/arch/mips/ps2/rom.c @@ -383,6 +383,24 @@ struct rom_ver rom_version(void) } EXPORT_SYMBOL_GPL(rom_version); +/** + * rom_region_name - name for the ROM region character in the ROMVER file + * @region: &rom_ver.region region character. + * + * Context: any + * Return: ROM region name, ``"-"`` if undefined or ``"?"`` if unrecognised + */ +const char *rom_region_name(char region) +{ + return region == 'J' ? "Japan" : + region == 'E' ? "Europe" : + region == 'C' ? "China" : + region == 'A' ? "USA" : + region == 'H' ? "USA" : + region == '-' ? "-" : "?"; +} +EXPORT_SYMBOL_GPL(rom_region_name); + /** * rom_type_name - name for the ROM type character in the ROMVER file in ROM0 * @type: &rom_ver.type type character. @@ -675,8 +693,8 @@ static int __init ps2_rom_init(void) rom1_dir = rom_dir_init("rom1", ROM1_BASE, ROM1_SIZE); v = rom_version(); - pr_info("rom0: Version %04x %c %s %04d-%02d-%02d\n", - v.number, v.region, rom_type_name(v.type), + pr_info("rom0: Version %04x %s %s %04d-%02d-%02d\n", + v.number, rom_region_name(v.region), rom_type_name(v.type), v.date.year, v.date.month, v.date.day); return 0; -- 2.21.0