UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi/x86: Align efi_uga_draw_protocol typedef names to convention 

The linux-efi subsystem uses typedefs with the _t suffix to declare
data structures that originate in the UEFI spec. Our type mangling
for mixed mode depends on this convention, so rename the UGA drawing
protocols to allow efi_call_proto() to be used with them in a
subsequent patch.

Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180720014726.24031-4-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ard Biesheuvel 2018-07-20 10:47:20 +09:00 committed by Ingo Molnar
parent 75c5a713ab
commit 0b767b16d7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/boot/compressed/eboot.c
View File

@ -321,7 +321,7 @@ static void setup_quirks(struct boot_params *boot_params)
static efi_status_t
setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)
{
struct efi_uga_draw_protocol *uga = NULL, *first_uga;
efi_uga_draw_protocol_t *uga = NULL, *first_uga;
efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
unsigned long nr_ugas;
u32 *handles = (u32 *)uga_handle;
@ -366,7 +366,7 @@ setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)
static efi_status_t
setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height)
{
struct efi_uga_draw_protocol *uga = NULL, *first_uga;
efi_uga_draw_protocol_t *uga = NULL, *first_uga;
efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
unsigned long nr_ugas;
u64 *handles = (u64 *)uga_handle;

12
arch/x86/boot/compressed/eboot.h
View File

@ -12,22 +12,22 @@
#define DESC_TYPE_CODE_DATA (1 << 0)
struct efi_uga_draw_protocol_32 {
typedef struct {
u32 get_mode;
u32 set_mode;
u32 blt;
};
} efi_uga_draw_protocol_32_t;
struct efi_uga_draw_protocol_64 {
typedef struct {
u64 get_mode;
u64 set_mode;
u64 blt;
};
} efi_uga_draw_protocol_64_t;
struct efi_uga_draw_protocol {
typedef struct {
void *get_mode;
void *set_mode;
void *blt;
};
} efi_uga_draw_protocol_t;
#endif /* BOOT_COMPRESSED_EBOOT_H */