diff options
| author | Jan Janssen <medhefgo@web.de> | 2022-09-29 09:09:52 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-09-29 10:30:37 +0200 |
| commit | 957dfcc96d5f7febc58c3d1d6f969bda854fb98b (patch) | |
| tree | ec0faaea2ff682ebb4573ef30433e9eb3c2cf226 | |
| parent | resolved: paranoia: restrict socket mode as much as we can (diff) | |
| download | systemd-957dfcc96d5f7febc58c3d1d6f969bda854fb98b.tar.xz systemd-957dfcc96d5f7febc58c3d1d6f969bda854fb98b.zip | |
stub: Remove unused function parameter
| -rw-r--r-- | src/boot/efi/splash.c | 17 | ||||
| -rw-r--r-- | src/boot/efi/splash.h | 2 | ||||
| -rw-r--r-- | src/boot/efi/stub.c | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/boot/efi/splash.c b/src/boot/efi/splash.c index 1f805cf983..5bc1084e62 100644 --- a/src/boot/efi/splash.c +++ b/src/boot/efi/splash.c @@ -254,8 +254,8 @@ static EFI_STATUS bmp_to_blt( return EFI_SUCCESS; } -EFI_STATUS graphics_splash(const uint8_t *content, UINTN len, const EFI_GRAPHICS_OUTPUT_BLT_PIXEL *background) { - EFI_GRAPHICS_OUTPUT_BLT_PIXEL pixel = {}; +EFI_STATUS graphics_splash(const uint8_t *content, UINTN len) { + EFI_GRAPHICS_OUTPUT_BLT_PIXEL background = {}; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput = NULL; struct bmp_dib *dib; struct bmp_map *map; @@ -270,13 +270,10 @@ EFI_STATUS graphics_splash(const uint8_t *content, UINTN len, const EFI_GRAPHICS assert(content); - if (!background) { - if (strcaseeq16(u"Apple", ST->FirmwareVendor)) { - pixel.Red = 0xc0; - pixel.Green = 0xc0; - pixel.Blue = 0xc0; - } - background = &pixel; + if (strcaseeq16(ST->FirmwareVendor, u"Apple")) { + background.Red = 0xc0; + background.Green = 0xc0; + background.Blue = 0xc0; } err = BS->LocateProtocol(&GraphicsOutputProtocol, NULL, (void **) &GraphicsOutput); @@ -293,7 +290,7 @@ EFI_STATUS graphics_splash(const uint8_t *content, UINTN len, const EFI_GRAPHICS y_pos = (GraphicsOutput->Mode->Info->VerticalResolution - dib->y) / 2; err = GraphicsOutput->Blt( - GraphicsOutput, (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)background, + GraphicsOutput, &background, EfiBltVideoFill, 0, 0, 0, 0, GraphicsOutput->Mode->Info->HorizontalResolution, GraphicsOutput->Mode->Info->VerticalResolution, 0); diff --git a/src/boot/efi/splash.h b/src/boot/efi/splash.h index ec36451ff0..2e502e5c36 100644 --- a/src/boot/efi/splash.h +++ b/src/boot/efi/splash.h @@ -3,4 +3,4 @@ #include <efi.h> -EFI_STATUS graphics_splash(const uint8_t *content, UINTN len, const EFI_GRAPHICS_OUTPUT_BLT_PIXEL *background); +EFI_STATUS graphics_splash(const uint8_t *content, UINTN len); diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c index 2c68ee925f..b4395c2307 100644 --- a/src/boot/efi/stub.c +++ b/src/boot/efi/stub.c @@ -210,7 +210,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { (void) efivar_set_uint_string(LOADER_GUID, L"StubPcrKernelImage", TPM_PCR_INDEX_KERNEL_IMAGE, 0); /* Show splash screen as early as possible */ - graphics_splash((const uint8_t*) loaded_image->ImageBase + addrs[UNIFIED_SECTION_SPLASH], szs[UNIFIED_SECTION_SPLASH], NULL); + graphics_splash((const uint8_t*) loaded_image->ImageBase + addrs[UNIFIED_SECTION_SPLASH], szs[UNIFIED_SECTION_SPLASH]); if (szs[UNIFIED_SECTION_CMDLINE] > 0) { cmdline = (char *) loaded_image->ImageBase + addrs[UNIFIED_SECTION_CMDLINE]; |