From nobody Thu Jan 23 17:27:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yf7DW3yMWz5lDKy; Thu, 23 Jan 2025 17:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yf7DW0jQxz43Sd; Thu, 23 Jan 2025 17:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737653243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PjpFMXlJildRisZnN+U4nrAYOWZ5Jh/fo1A47qyf4ec=; b=gGuSPuzR7xodxEC4wsJG1iFcocDeTznImSn4iq8Bzl7fZEeGwVbyTV3VcE+eDOk9+8XExS PsHHmE+Eq+Y7hQIq9KxbysYD0373J+IJb3j6LEYH4/9HbFLumTBs63bBH45GqWDvSmXTv7 33W4Bd9HKAiHmdUEj8OcjlEswGUcRWmUxYdIWksBzDbnwQEWFFjVDog8vwJ+XSOhA2REub W9WljiQa9tOVG2iMmKXkywzD8QlHY8gb1HIblAzvT3yg3f5X9Zuf9xZzYsA9IajfULWW6d 18t5vM8ZM/xbt7DKSK7VDjFC167wbTsfgnLYpzsRJltJoMgZWjqRh+CvyE3t5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737653243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PjpFMXlJildRisZnN+U4nrAYOWZ5Jh/fo1A47qyf4ec=; b=CHJuhp7QiCaJaDjCMdIgJQnsyV12PDWdSBhcPvWrtyzwxfGiUzW3CT2Lyx7j+Q52WRMH2T jkTO3drPkC+uS/wi32iJ+nZCiQTVPMPUjMGS6RvUIY3yhK0CWroTivvEh8S21WqsTENHAJ TiD+O/7PDtJ5OG97YWCxKpxo+HZzgAMIP86xGB+PuOc+DPhxoyqNzWNVGj0Td4wEF1j9qZ m2tSJILoeEDLkYnHkno1zK/kEe6N8sqOxKDZR8XyzVKGOWI72wWAYzXLDLdznpe0MRd/ed 2nkeatP26qcWK0bAvO4MO1G57YAPNWDQ+zcI5Y4sKBS7pPhX4YOlYwB35qk7Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737653243; a=rsa-sha256; cv=none; b=RN9UzDbafIuLFGqchiz+L2M9UaX1Jfpk5H+685f3s2lqxQ/QdnTZgAit4IiGpQiZd8XzrT LWkIavQ/TVBDMD1+Rfjl+OxLhupoLMivNWp0u0rXWJQee/n0k2NVy1KLafnfZieDVzLvMR x3Px5vdie0oJMGSz36cu3pvl1o66l5awqGP1TKluuUXESYpXsfdQCBirQr0VSxt9YOeGik jjBkGRPNrjE4QIvWHcxlAuqsk2mMqnL+YyZ2aeXwFbc3t2PBUjJ6oopmm/cVzDz52rBjEc oAefu947pGCt0h5wNJsTxdMo0ps10r9Jvv5gSqcj5AFV1ogcBr8RzvxtreWLhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yf7DW0B7CzpWd; Thu, 23 Jan 2025 17:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50NHRMfP022312; Thu, 23 Jan 2025 17:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NHRMAn022309; Thu, 23 Jan 2025 17:27:22 GMT (envelope-from git) Date: Thu, 23 Jan 2025 17:27:22 GMT Message-Id: <202501231727.50NHRMAn022309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7eb3273a7b58 - main - stand/efi: Use hex values to get the uart type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb3273a7b5854bcd4b1ff727d50e22774122987 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb3273a7b5854bcd4b1ff727d50e22774122987 commit 7eb3273a7b5854bcd4b1ff727d50e22774122987 Author: Andrew Turner AuthorDate: 2025-01-23 17:10:54 +0000 Commit: Andrew Turner CommitDate: 2025-01-23 17:26:25 +0000 stand/efi: Use hex values to get the uart type To keep the SPCR uart type to name map aligned always use the hex value as an index in the types array. Reviewed by: manu, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48525 --- stand/efi/loader/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 213089961704..6dcdb4cb3334 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -798,10 +798,10 @@ static const char * acpi_uart_type(UINT8 t) { static const char *types[] = { - [0] = "ns8250", /* Full 16550 */ - [1] = "ns8250", /* DBGP Rev 1 16550 subset */ - [3] = "pl011", /* Arm PL011 */ - [5] = "ns8250", /* Nvidia 16550 */ + [0x00] = "ns8250", /* Full 16550 */ + [0x01] = "ns8250", /* DBGP Rev 1 16550 subset */ + [0x03] = "pl011", /* Arm PL011 */ + [0x05] = "ns8250", /* Nvidia 16550 */ [0x12] = "ns8250", /* 16550 defined in SerialPort */ };