From nobody Thu Sep 11 15:55:20 2025 X-Original-To: dev-commits-src-all@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 4cN2Fj0G8yz66qbp; Thu, 11 Sep 2025 15:55:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cN2Fh6gYhz3Chh; Thu, 11 Sep 2025 15:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757606121; 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=DIZR7lM8r7flhPhFFXxK5iVBuiTa/E4AU5ECSfwV+gw=; b=uShKrU5lWBUX3ocn4a7izIC2zlIv7H66/aFY8fDoJFtsYQeFA/JsRTeP0sBSGRF2ormB8Q +2xVAJOUqUdMNzXTAu42C1pznnhwNHB18rird+yLDiE/sg1WKRWRNR9WnSk92k0mP/+me3 EnogU44ks2eHc1lUWNxYYcrsADKAA0QTVbIh0NiyUA1kK2MYEXjHVsnWEMQK/wFHBcmETa MatGDj/k/d64JZxDTgzA8Ed21skBNXBdMNm62pECPw49ZbYdar2jh6HKBDz4x889Uf7AVJ a++UtGTlf9So5TawJTH753TUrdKInjZr2anflFDx7sa41r4w03btmJ4EfSfA+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757606121; 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=DIZR7lM8r7flhPhFFXxK5iVBuiTa/E4AU5ECSfwV+gw=; b=HMtumaGt1+Dpk7FoPu3+oA/gKHTd+kLe48ubrG2ytcwVPCHg1w0COxn9JWRLCX4d3cmbtF 8hqDtW0Duim/jP3u1R3Q4ccKLufesD5kwYfs3kUprs538o5GpsxaGwaU5Yvdr8VsVqJK4d 2VAmkBTOxlOThx/Dg3smQK0kQgxwDxJUK3lmrVz2r5FHVwzTCyHn7TMaA8c8hIcmSX9wcq QTHVlwXHDdmopV07iFPG0ObTKafqHaSzBtW1cEilK/i5CeeI8xU3TozR4Yee6/dm+utMhc NQyHQil+rz3XiUNI5S13gW6aM2QuYPsH8TEPRNn2DfHID/D976P3eiQcoiHdEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757606121; a=rsa-sha256; cv=none; b=em7bToeDXEcdFyJydV5G41upVlOuAux9bJ5ql3BodrJm3tMN8YeH4XPz92ZDVeWjj7woh5 4mq4dyyA4C1MWT5u0w0YcjKOE/Nz5yCDpvL5B9v9z/04MhY7wckS8dTlhonBYW/360xmXL YlVfBGSf6rSXjhE50NO52jy852DC0WXq2GXzz2jRnH9l8H9w/N6nElIQnJim4YRLo/3r6z coyPDfQoHOrY/QS7vVxOJ27XMZAny7o+nzLn+0X7Jz2KkQXKYLM6DdS6ABkuscIQ6Opbnd 5RxzCRLLLHaLlX+UZRaldUEi5VJaj24ri1+u3g1S5i/vLEEmwH0UkIqqG4q4tQ== 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 4cN2Fh69B5z1C4s; Thu, 11 Sep 2025 15:55:20 +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 58BFtK6p064038; Thu, 11 Sep 2025 15:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58BFtKUF064035; Thu, 11 Sep 2025 15:55:20 GMT (envelope-from git) Date: Thu, 11 Sep 2025 15:55:20 GMT Message-Id: <202509111555.58BFtKUF064035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: e584c46d8b60 - main - sys/efi.h: Some style(9) tweaks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e584c46d8b60662ffb1f67c41dec13f391d3f199 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e584c46d8b60662ffb1f67c41dec13f391d3f199 commit e584c46d8b60662ffb1f67c41dec13f391d3f199 Author: Zhenlei Huang AuthorDate: 2025-09-11 15:53:34 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-11 15:53:34 +0000 sys/efi.h: Some style(9) tweaks MFC after: 3 days --- sys/sys/efi.h | 67 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/sys/sys/efi.h b/sys/sys/efi.h index 89c8b15519de..f82c733898b4 100644 --- a/sys/sys/efi.h +++ b/sys/sys/efi.h @@ -40,9 +40,9 @@ {0xf2fd1544,0x9794,0x4a2c,{0x99,0x2e,0xe5,0xbb,0xcf,0x20,0xe3,0x94}} #define EFI_TABLE_ESRT \ {0xb122a263,0x3661,0x4f68,{0x99,0x29,0x78,0xf8,0xb0,0xd6,0x21,0x80}} -#define EFI_PROPERTIES_TABLE \ +#define EFI_PROPERTIES_TABLE \ {0x880aaca3,0x4adc,0x4a04,{0x90,0x79,0xb7,0x47,0x34,0x08,0x25,0xe5}} -#define EFI_MEMORY_ATTRIBUTES_TABLE \ +#define EFI_MEMORY_ATTRIBUTES_TABLE \ {0xdcfa911d,0x26eb,0x469f,{0xa2,0x20,0x38,0xb7,0xdc,0x46,0x12,0x20}} #define LINUX_EFI_MEMRESERVE_TABLE \ {0x888eb0c6,0x8ede,0x4ff5,{0xa8,0xf0,0x9a,0xee,0x5c,0xb9,0x77,0xc2}} @@ -54,7 +54,7 @@ enum efi_reset { }; typedef uint16_t efi_char; -typedef unsigned long efi_status; +typedef unsigned long efi_status; /* * This type-puns to a struct uuid, but all the EDK2 headers use this variation, @@ -62,10 +62,10 @@ typedef unsigned long efi_status; * can use EDK2 definitions both places. */ typedef struct efi_guid { - uint32_t Data1; - uint16_t Data2; - uint16_t Data3; - uint8_t Data4[8]; + uint32_t Data1; + uint16_t Data2; + uint16_t Data3; + uint8_t Data4[8]; } efi_guid_t; /* Type puns with GUID and EFI_GUID */ struct efi_cfgtbl { @@ -293,100 +293,99 @@ struct efi_ops { extern const struct efi_ops *active_efi_ops; /* Public MI EFI functions */ -static inline int efi_rt_ok(void) +static inline int +efi_rt_ok(void) { - if (active_efi_ops->rt_ok == NULL) return (ENXIO); return (active_efi_ops->rt_ok()); } -static inline int efi_get_table(efi_guid_t *guid, void **ptr) +static inline int +efi_get_table(efi_guid_t *guid, void **ptr) { - if (active_efi_ops->get_table == NULL) return (ENXIO); return (active_efi_ops->get_table(guid, ptr)); } -static inline int efi_copy_table(efi_guid_t *guid, void **buf, - size_t buf_len, size_t *table_len) +static inline int +efi_copy_table(efi_guid_t *guid, void **buf, size_t buf_len, size_t *table_len) { - if (active_efi_ops->copy_table == NULL) return (ENXIO); return (active_efi_ops->copy_table(guid, buf, buf_len, table_len)); } -static inline int efi_get_time(struct efi_tm *tm) +static inline int +efi_get_time(struct efi_tm *tm) { - if (active_efi_ops->get_time == NULL) return (ENXIO); return (active_efi_ops->get_time(tm)); } -static inline int efi_get_time_capabilities(struct efi_tmcap *tmcap) +static inline int +efi_get_time_capabilities(struct efi_tmcap *tmcap) { - if (active_efi_ops->get_time_capabilities == NULL) return (ENXIO); return (active_efi_ops->get_time_capabilities(tmcap)); } -static inline int efi_reset_system(enum efi_reset type) +static inline int +efi_reset_system(enum efi_reset type) { - if (active_efi_ops->reset_system == NULL) return (ENXIO); return (active_efi_ops->reset_system(type)); } -static inline int efi_set_time(struct efi_tm *tm) +static inline int +efi_set_time(struct efi_tm *tm) { - if (active_efi_ops->set_time == NULL) return (ENXIO); return (active_efi_ops->set_time(tm)); } -static inline int efi_get_waketime(uint8_t *enabled, uint8_t *pending, - struct efi_tm *tm) +static inline int +efi_get_waketime(uint8_t *enabled, uint8_t *pending, struct efi_tm *tm) { if (active_efi_ops->get_waketime == NULL) return (ENXIO); return (active_efi_ops->get_waketime(enabled, pending, tm)); } -static inline int efi_set_waketime(uint8_t enable, struct efi_tm *tm) +static inline int +efi_set_waketime(uint8_t enable, struct efi_tm *tm) { if (active_efi_ops->set_waketime == NULL) return (ENXIO); return (active_efi_ops->set_waketime(enable, tm)); } -static inline int efi_var_get(uint16_t *name, efi_guid_t *vendor, - uint32_t *attrib, size_t *datasize, void *data) +static inline int +efi_var_get(uint16_t *name, efi_guid_t *vendor, uint32_t *attrib, + size_t *datasize, void *data) { - if (active_efi_ops->var_get == NULL) return (ENXIO); return (active_efi_ops->var_get(name, vendor, attrib, datasize, data)); } -static inline int efi_var_nextname(size_t *namesize, uint16_t *name, - efi_guid_t *vendor) +static inline int +efi_var_nextname(size_t *namesize, uint16_t *name, efi_guid_t *vendor) { - if (active_efi_ops->var_nextname == NULL) return (ENXIO); return (active_efi_ops->var_nextname(namesize, name, vendor)); } -static inline int efi_var_set(uint16_t *name, efi_guid_t *vendor, - uint32_t attrib, size_t datasize, void *data) +static inline int +efi_var_set(uint16_t *name, efi_guid_t *vendor, uint32_t attrib, + size_t datasize, void *data) { - if (active_efi_ops->var_set == NULL) return (ENXIO); return (active_efi_ops->var_set(name, vendor, attrib, datasize, data));