Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1q9oE5-000690-T6 for mharc-grub-devel@gnu.org; Thu, 15 Jun 2023 10:45:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9oE4-00068n-2r for grub-devel@gnu.org; Thu, 15 Jun 2023 10:45:28 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9oE1-00064c-7O for grub-devel@gnu.org; Thu, 15 Jun 2023 10:45:27 -0400 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35FEOIS8026731; Thu, 15 Jun 2023 14:45:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-type : mime-version; s=corp-2023-03-30; bh=SawQV2h+aGFzPJsNl/GO5Q3eKqTpewhuJO6609L0fhA=; b=GbB/0Y9QzYEWZScqpGQfGm6lNKEnS0OBQZzDA2oW8Z2xAHOc/To1YyWjd+bv4HfItoz4 JGphr+FuZkGmqBOdArSkobqK0QtoF0PPARuys07GcnfROVaqQVgJBFvrjCHwWzSI9dl1 5Ou0Q87rzu5CSemFlg0pvv+D0KZwzOxp/uNxYt6YEwSitabPiDFd+Zcw6/lYWgUZU1uR fcqP2YqWPvMgyPKcuRMQVf6PaBBODV5bd4tLKrG4SZ7zVCot2xGtFxMxBwu5rraeQJxH IJIkLbJIwalxl8SMxSCtNlbiiDPtM6c3sIM2FWtuC/KTHxsf3cVbbIPSuEXzA2VWzPDm 1w== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3r4hqut7vb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Jun 2023 14:45:14 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35FDMtlJ040475; Thu, 15 Jun 2023 14:45:14 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2172.outbound.protection.outlook.com [104.47.59.172]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3r4fm6rh2a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Jun 2023 14:45:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iRgcHJOGa5nYskPV2BVGbSDTVCiEu0A99qoi0k5B8dj4iYIM46KnCrKOgTA5BOSLp5ipl2dr1lpymD7oe+OnRKX/3yClOtW0xvPWi5XftQlGRZLYq5qE33oCwOWmpebQsF4h9ZpUsXY4M2d2FYD5AS9ubKPnddxsR7Nn6/Jvbb2UCxfRtMqLvqVxQzh0ttYY4xj7P/OVxFs0OrJn67RTvv3Pp6nzPwsulVsCDbmUg41PmpdXggsOF+RrWt6UuJHajlT4hQpYNjdVQ0fY+2ZKNk3tzxkQF4pcqgNyXTw8yoTFx4+X8pkivNIdR+iJ1HL+rSqGIl+3YvP42FSkgNI5nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SawQV2h+aGFzPJsNl/GO5Q3eKqTpewhuJO6609L0fhA=; b=a5VeLpG3qu0jB9YrT4lOjlJmpRdJB5z/raeNXa17aBmO8tV2JumWwiJIyIoHeO6dMMzRNhifmOEHWeJlI69K7eBFdXMfCdtDaQIgOt9fT/J4u1VUCRdy4KqkGayPPUr6j2no7aBvr/z8SVZnD9xIMSjUpoIwhtKeqOU25XVpYANkobv21bWM6c26BibPYRgMzeG7u98rnR23wx/trSdHMCjf+GXIdlF6htN4aP7PKW7tmCaSKHsn2BYreqlWDCRA42uh/eE70xRSUko0DdCepRc2LrAAb033yUj51kGlInBr7WNw4zUQqctk/kCtX/sDwn3GvUblegcdGfNZmbebqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SawQV2h+aGFzPJsNl/GO5Q3eKqTpewhuJO6609L0fhA=; b=vYg8pm7y6DHF3NCYc2XKejojsvtd8paQIxzChVgvBzGYBehpYMzEsqfd1NWsneXILUNtQ4cWXEaTZYUaShPGLkivJ44GHEcdqtXFBdHHeosIee5ltZtWANgK8h1SfOZgaocvoe84p6uU1jrA+7+ePvZfuWUr+fGrsTNq48OecNk= Received: from BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) by DS7PR10MB5151.namprd10.prod.outlook.com (2603:10b6:5:3a4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.27; Thu, 15 Jun 2023 14:45:11 +0000 Received: from BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6]) by BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6%2]) with mapi id 15.20.6500.026; Thu, 15 Jun 2023 14:45:05 +0000 From: Daniel Kiper To: grub-devel@gnu.org Cc: antiz@archlinux.org, ardb@kernel.org, development@efficientek.com, list@eworm.de Subject: [PATCH] efi: Add missing __grub_efi_api attributes Date: Thu, 15 Jun 2023 16:45:00 +0200 Message-Id: <20230615144500.13001-1-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 Content-Type: text/plain X-ClientProxiedBy: BE1P281CA0029.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:15::19) To BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN0PR10MB4822:EE_|DS7PR10MB5151:EE_ X-MS-Office365-Filtering-Correlation-Id: d51da9b6-ad35-4552-093d-08db6daf1bbe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: evuqehom4pdmw3/8prpWxwtydJxXTMLS2+f6PvUEm8AVH/pbwIEDabfP3AgEhwaghdCdTNMj0+yJKDdRIq9BQmjhKbewH7TWmt5yC2u6mQ15oeBDXxiBO0ks3xOh4UJxzibwgnCeZ9i3ehMmhbR2kvuMG3hxTK0wWAm47pe58Z5YXvTl4LlOKIgtCF3v78ApIo3GAzXRFiBOVhveuqaaQNJexJXeDYTaiiFxKSsgCbHHMetE8rC1CoULoxt6zkyGyGCAJQLcRNbXxm7KpxqNssZsKtMS0Vuv435wNVqTvQMMCChZv0M65Qy0jBctLScm/DS/rbS2rFhZwV7TorxpLN8hIXlXVmWprxh2IU3denTJ+kS1tc1Au9BzCsGfTD+cGhu7ENU3kOvjnMDCay4Z+mDQvyLIGpKqtZdno3o9ragaqhQSnpKjfzlbu9BUyYeUFyKART78ZFJI2HW/aAcxvTwO90J4C37d6QYgPOPOQT0S+9qxmu6wV1ODtmFrAt1NcvPenMdfHBX/Yo5cx3CFxpFxQhbiVGhoTl52OqkmygnvjpcCIUEhmD0VC5JSqEMx X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN0PR10MB4822.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(376002)(346002)(136003)(39860400002)(366004)(396003)(451199021)(5660300002)(38100700002)(2616005)(83380400001)(6506007)(1076003)(186003)(2906002)(26005)(6512007)(44832011)(478600001)(66556008)(6916009)(66946007)(66476007)(316002)(6666004)(8936002)(6486002)(8676002)(41300700001)(86362001)(36756003)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MtHc2ySMykmXzMP3Fr3qBbxNhln6kdxo4u3SxAMmGSzuwlEjOiimoMHkutwl?= =?us-ascii?Q?4vpSwN8lMBeIIfGGekwGyLeWdqUMZ5naZzvHk6GYYFfFK3VwQGlCDoJ+oyPA?= =?us-ascii?Q?6CCQc+1HHEpWX6kLp4DLPwHFQ70dtiHScYdbo/cF6YF6/57+w/MvsjPZQE31?= =?us-ascii?Q?ZwN9lKPLnV0vzWtyLvY4OMzK4bnArXlfwKsVo7nVghvTiLY264yvX4mMJ7cr?= =?us-ascii?Q?qQVOlXfwu1RAOljlgEEDFEHduwSMw9eHpqg+udyZvf90nYvu9PUbd5OWfwvN?= =?us-ascii?Q?C819d7J9qOho6UlIQhyt5jNjg3yY5127mJhC16E8aGfmzgWENxMRAhpBrPQ9?= =?us-ascii?Q?zodrgmtiQvT7jbf8zzeLbmDhzunY5O2+If1PeBs7VX2tWD0rdbxlaQlxJKVY?= =?us-ascii?Q?lDnd1JTml32Q1pg6GXXeJy5SwAz/SFrKG52+1T4aMwwSMKglJMk66rhBXg9j?= =?us-ascii?Q?IxKaWEURVTr865zm66qp/3MnYFLZzbgfAEPmbQPCI/UbrKF68jXjCNyT3ZnJ?= =?us-ascii?Q?sBnczOK/Luh7NCHRKBSaxk+72Wdy+1F33eyw+BmObe2VCPtmCn3es3LQlk0J?= =?us-ascii?Q?7s3YVyqGeGXvVa3aSf1pYeYocjZP1xWRioayf2IRv/Oiqo8e/OT8hEoDN53e?= =?us-ascii?Q?Ilrl6xZ9zBtOB1gJozaAxHo/i9BirZfLJDQI/DFMC2LtxoXoL3XAxsIhuW0+?= =?us-ascii?Q?p/ubizmrUgasc6UTHQQDsJO0GC6ZUrMId3WiQP5qjw792AGv/a2X4n+oBV63?= =?us-ascii?Q?t/5Mi3SJv340Ly6TlhnyM0Vc9xDESW36a131iKdUy4IXq01OE7aLpRSwhQnb?= =?us-ascii?Q?joaVKYx+SUs8XC1uUy9vcRRkC8FNcqv2t1HyNlCKvtQbO1GMA0b2tJ9etcjr?= =?us-ascii?Q?6RZ0K5CwhB2iam3ucTq2fKpFSumunglQACoswnjpf9AanzrZ5qDWI8AKWsx/?= =?us-ascii?Q?XEbLTXzdgtui1nyMsVNvhVMI3EpQlsInBEqUd7MEG/xatiBdPFPkn2YlwcfO?= =?us-ascii?Q?gSk8wZ9YHMfVUY8oKrL1ETrO0I5FFDM3Mwu3DGkDo8zPnEHBxv/rHZUfSUnX?= =?us-ascii?Q?y6tFDBHWISht8lk9asQvMkMuhFjLuA0UcQl/e/6gWI8q8DA/zrouP+geXGqx?= =?us-ascii?Q?1ftdOaVI8zHEhRNc8gLpzntumSD61A1l+M0NU0MLcdx5zAQSeHeyFEoIXkRk?= =?us-ascii?Q?MKOLji7xGX6oNZEx1V66arQPQYYOgjXCxNqu0TcO5+RBTbFYQYXUPcnyActt?= =?us-ascii?Q?PUAzs7aJXMvFQK04dT0taBbMdewAf0E+1kTBDFf2XacNSzDnLQF4QakEV74V?= =?us-ascii?Q?UK3RlP3Te8QFIdo7e0pqJbt42p0hxa6bRp6Om9XvIIwAV0LL7crR5zzjUba9?= =?us-ascii?Q?oZ8DN3k61ia8q6wLpeje1cKNzpmKo8v7xTEG36LYKeBCI0JvAoBKxn0qH390?= =?us-ascii?Q?uHQz9MqET9IwGlc7usHBeuYBJsBFQ/AB7qbCgmiWdOzI5+T+GXoIoednJ3oU?= =?us-ascii?Q?W4WXFpQoGryq6ivfLYPxGqCoDW0a0+ED66Ps/TiBFB56AzKJqRd24KjxmGwf?= =?us-ascii?Q?yOgY/uatVaNSq7ws0i2oogwzvZo8kClGrRRMbNuc?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IR5fmsUYEnTsXcPsq0UCkB38VH7rPcQoNNoZ/eXJ8T1DEL8Ec4zNwv+GAzvppfCurfaFl25nsvKvy0IuY0OP/kaucsPJE6dOSG9xGBlyYGM1dHALml6ZQe6xp9GrwOMuBTPDR8/LZOOw7l6qKLNuEQyXnC6OOvjSmYO5YtnmDRslNB7BFBxa5mmMC4jOL0cWC6KHv7ZX0fBwIekj5SLXNWjjrbFeGiKbHPQbl6AJmDmCaovSEqHubysinkowkm0NyBTNgMoghtTURsncWaGoSYgR44EzPfy6U7CTeM9KkSgAXQ5NuovfKBeQRvXiyYLxC+QO0DYgDnP4/3o9k2w5TG+P0EKDPc0G3ICVdJbIRicbEtDM+NhPaIR5WQN//wdclSQXJRLyfdWDMXJbOyz2SwvZ8Jim6nF0A8nkmoXvQe/ddZx6Icmj3p7qZEzuPK8DPG6WTgA3f2j3zkXPlWswy1usTlwQQdEhT4QaRYEtuFA2D7b0X4riD1LKDayER7Wxwd3KqkHPOaZ7UHNgA2LUaQqz22MJQSig2OwFVMoXHS14dgSbGoekwNGcNIXfyf7yQRgdVUobH7tt4z19upAdQEumTCqfTRuLTpZaJbqylmQ191THgvIfnV3HO3L6saSLNLUkOeXwLKrvMxC0gQZTe4yZCNpoVwqyG+gVtCdNYL/12kHYX5GAOblnSII/kUm+C1LeFc68cFshvBuZTtOQrKIilQNI1c9+vOAMqDvmNicxFOmro9fufGFqcfeIxJdIP7XcDTY8RdIMbZdP7wAhVS9jN8zYClmwwKew1z//Pz8/hvHFyVmpA9ffGg9jCnValCwoeYw4w4fewdGogKouIvU3fySV7NdsteSObHbViSg6wrfvy5/487n7peucnpBm X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d51da9b6-ad35-4552-093d-08db6daf1bbe X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB4822.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 14:45:05.7271 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PNV1iaMa81ROlu9mGZp4tFSy8lM6bFQQOzOgzg3EZPqCXEi10BlCRXMj7dqAnScpfgbUUGJFNZKk1QmcKYjP9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5151 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-15_11,2023-06-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306150129 X-Proofpoint-ORIG-GUID: VL1QYwbbCs73sqStkGunU5R9djnXHTn5 X-Proofpoint-GUID: VL1QYwbbCs73sqStkGunU5R9djnXHTn5 Received-SPF: pass client-ip=205.220.165.32; envelope-from=daniel.kiper@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jun 2023 14:45:28 -0000 The commit bb4aa6e06 (efi: Drop all uses of efi_call_XX() wrappers) did not add some __grub_efi_api attributes to the EFI calls. Lack of them led to hangs on x86_64-efi target. So, let's add missing __grub_efi_api attributes. Fixes: bb4aa6e06 (efi: Drop all uses of efi_call_XX() wrappers) Reported-by: Christian Hesse Reported-by: Robin Candau Signed-off-by: Daniel Kiper --- include/grub/efi/cc.h | 30 ++++++++++++++-------------- include/grub/efi/console_control.h | 16 +++++++-------- include/grub/efi/graphics_output.h | 32 +++++++++++++++--------------- include/grub/efi/uga_draw.h | 40 +++++++++++++++++++------------------- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/include/grub/efi/cc.h b/include/grub/efi/cc.h index 896030689..978e0cdfe 100644 --- a/include/grub/efi/cc.h +++ b/include/grub/efi/cc.h @@ -124,27 +124,27 @@ typedef struct grub_efi_cc_boot_service_capability grub_efi_cc_boot_service_capa struct grub_efi_cc_protocol { grub_efi_status_t - (*get_capability) (struct grub_efi_cc_protocol *this, - grub_efi_cc_boot_service_capability_t *ProtocolCapability); + (__grub_efi_api *get_capability) (struct grub_efi_cc_protocol *this, + grub_efi_cc_boot_service_capability_t *ProtocolCapability); grub_efi_status_t - (*get_event_log) (struct grub_efi_cc_protocol *this, - grub_efi_cc_event_log_format_t EventLogFormat, - grub_efi_physical_address_t *EventLogLocation, - grub_efi_physical_address_t *EventLogLastEntry, - grub_efi_boolean_t *EventLogTruncated); + (__grub_efi_api *get_event_log) (struct grub_efi_cc_protocol *this, + grub_efi_cc_event_log_format_t EventLogFormat, + grub_efi_physical_address_t *EventLogLocation, + grub_efi_physical_address_t *EventLogLastEntry, + grub_efi_boolean_t *EventLogTruncated); grub_efi_status_t - (*hash_log_extend_event) (struct grub_efi_cc_protocol *this, - grub_efi_uint64_t Flags, - grub_efi_physical_address_t DataToHash, - grub_efi_uint64_t DataToHashLen, - grub_efi_cc_event_t *EfiCcEvent); + (__grub_efi_api *hash_log_extend_event) (struct grub_efi_cc_protocol *this, + grub_efi_uint64_t Flags, + grub_efi_physical_address_t DataToHash, + grub_efi_uint64_t DataToHashLen, + grub_efi_cc_event_t *EfiCcEvent); grub_efi_status_t - (*map_pcr_to_mr_index) (struct grub_efi_cc_protocol *this, - grub_efi_uint32_t PcrIndex, - grub_efi_cc_mr_index_t *MrIndex); + (__grub_efi_api *map_pcr_to_mr_index) (struct grub_efi_cc_protocol *this, + grub_efi_uint32_t PcrIndex, + grub_efi_cc_mr_index_t *MrIndex); }; typedef struct grub_efi_cc_protocol grub_efi_cc_protocol_t; diff --git a/include/grub/efi/console_control.h b/include/grub/efi/console_control.h index bb5fd038e..008ac5896 100644 --- a/include/grub/efi/console_control.h +++ b/include/grub/efi/console_control.h @@ -41,18 +41,18 @@ typedef enum grub_efi_screen_mode grub_efi_screen_mode_t; struct grub_efi_console_control_protocol { grub_efi_status_t - (*get_mode) (struct grub_efi_console_control_protocol *this, - grub_efi_screen_mode_t *mode, - grub_efi_boolean_t *uga_exists, - grub_efi_boolean_t *std_in_locked); + (__grub_efi_api *get_mode) (struct grub_efi_console_control_protocol *this, + grub_efi_screen_mode_t *mode, + grub_efi_boolean_t *uga_exists, + grub_efi_boolean_t *std_in_locked); grub_efi_status_t - (*set_mode) (struct grub_efi_console_control_protocol *this, - grub_efi_screen_mode_t mode); + (__grub_efi_api *set_mode) (struct grub_efi_console_control_protocol *this, + grub_efi_screen_mode_t mode); grub_efi_status_t - (*lock_std_in) (struct grub_efi_console_control_protocol *this, - grub_efi_char16_t *password); + (__grub_efi_api *lock_std_in) (struct grub_efi_console_control_protocol *this, + grub_efi_char16_t *password); }; typedef struct grub_efi_console_control_protocol grub_efi_console_control_protocol_t; diff --git a/include/grub/efi/graphics_output.h b/include/grub/efi/graphics_output.h index e4388127c..044e786b8 100644 --- a/include/grub/efi/graphics_output.h +++ b/include/grub/efi/graphics_output.h @@ -83,26 +83,26 @@ struct grub_efi_gop_mode struct grub_efi_gop; typedef grub_efi_status_t -(*grub_efi_gop_query_mode_t) (struct grub_efi_gop *this, - grub_efi_uint32_t mode_number, - grub_efi_uintn_t *size_of_info, - struct grub_efi_gop_mode_info **info); +(__grub_efi_api *grub_efi_gop_query_mode_t) (struct grub_efi_gop *this, + grub_efi_uint32_t mode_number, + grub_efi_uintn_t *size_of_info, + struct grub_efi_gop_mode_info **info); typedef grub_efi_status_t -(*grub_efi_gop_set_mode_t) (struct grub_efi_gop *this, - grub_efi_uint32_t mode_number); +(__grub_efi_api *grub_efi_gop_set_mode_t) (struct grub_efi_gop *this, + grub_efi_uint32_t mode_number); typedef grub_efi_status_t -(*grub_efi_gop_blt_t) (struct grub_efi_gop *this, - void *buffer, - grub_efi_uintn_t operation, - grub_efi_uintn_t sx, - grub_efi_uintn_t sy, - grub_efi_uintn_t dx, - grub_efi_uintn_t dy, - grub_efi_uintn_t width, - grub_efi_uintn_t height, - grub_efi_uintn_t delta); +(__grub_efi_api *grub_efi_gop_blt_t) (struct grub_efi_gop *this, + void *buffer, + grub_efi_uintn_t operation, + grub_efi_uintn_t sx, + grub_efi_uintn_t sy, + grub_efi_uintn_t dx, + grub_efi_uintn_t dy, + grub_efi_uintn_t width, + grub_efi_uintn_t height, + grub_efi_uintn_t delta); struct grub_efi_gop { diff --git a/include/grub/efi/uga_draw.h b/include/grub/efi/uga_draw.h index a31f2672e..1ea157a7e 100644 --- a/include/grub/efi/uga_draw.h +++ b/include/grub/efi/uga_draw.h @@ -46,30 +46,30 @@ struct grub_efi_uga_pixel struct grub_efi_uga_draw_protocol { grub_efi_status_t - (*get_mode) (struct grub_efi_uga_draw_protocol *this, - grub_uint32_t *width, - grub_uint32_t *height, - grub_uint32_t *depth, - grub_uint32_t *refresh_rate); + (__grub_efi_api *get_mode) (struct grub_efi_uga_draw_protocol *this, + grub_uint32_t *width, + grub_uint32_t *height, + grub_uint32_t *depth, + grub_uint32_t *refresh_rate); grub_efi_status_t - (*set_mode) (struct grub_efi_uga_draw_protocol *this, - grub_uint32_t width, - grub_uint32_t height, - grub_uint32_t depth, - grub_uint32_t refresh_rate); + (__grub_efi_api *set_mode) (struct grub_efi_uga_draw_protocol *this, + grub_uint32_t width, + grub_uint32_t height, + grub_uint32_t depth, + grub_uint32_t refresh_rate); grub_efi_status_t - (*blt) (struct grub_efi_uga_draw_protocol *this, - struct grub_efi_uga_pixel *blt_buffer, - enum grub_efi_uga_blt_operation blt_operation, - grub_efi_uintn_t src_x, - grub_efi_uintn_t src_y, - grub_efi_uintn_t dest_x, - grub_efi_uintn_t dest_y, - grub_efi_uintn_t width, - grub_efi_uintn_t height, - grub_efi_uintn_t delta); + (__grub_efi_api *blt) (struct grub_efi_uga_draw_protocol *this, + struct grub_efi_uga_pixel *blt_buffer, + enum grub_efi_uga_blt_operation blt_operation, + grub_efi_uintn_t src_x, + grub_efi_uintn_t src_y, + grub_efi_uintn_t dest_x, + grub_efi_uintn_t dest_y, + grub_efi_uintn_t width, + grub_efi_uintn_t height, + grub_efi_uintn_t delta); }; typedef struct grub_efi_uga_draw_protocol grub_efi_uga_draw_protocol_t; -- 2.11.0