system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-16 06:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

stub: Remove unused function parameter

Browse source
This commit is contained in:
Jan Janssen 2022-09-29 09:09:52 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 1aefb25f37
commit 957dfcc96d
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/boot/efi/splash.c
View file

@ -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);

2
src/boot/efi/splash.h
View file

@ -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);

2
src/boot/efi/stub.c
View file

@ -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];