diff options
| -rw-r--r-- | api/loader/efi/shim.h | 18 | ||||
| -rw-r--r-- | kc/core/memory/memory.c | 2 | ||||
| -rw-r--r-- | kc/core/memory/page_early.c | 3 | ||||
| -rw-r--r-- | loader/main_efi.c | 4 |
4 files changed, 14 insertions, 13 deletions
diff --git a/api/loader/efi/shim.h b/api/loader/efi/shim.h index b91d9fd..8901077 100644 --- a/api/loader/efi/shim.h +++ b/api/loader/efi/shim.h @@ -25,12 +25,12 @@ struct efi_loader_image UINTN buffer_size; }; -typedef EFI_STATUS (EFIAPI *efi_image_func)(struct efi_loader_image *image); -typedef EFI_STATUS (EFIAPI *efi_page_alloc_func)( +typedef EFI_STATUS (EFIAPI efi_image_func)(struct efi_loader_image *image); +typedef EFI_STATUS (EFIAPI efi_page_alloc_func)( EFI_MEMORY_TYPE type, UINTN size, EFI_PHYSICAL_ADDRESS *base); -typedef EFI_STATUS (EFIAPI *efi_page_free_func)( +typedef EFI_STATUS (EFIAPI efi_page_free_func)( EFI_PHYSICAL_ADDRESS base, UINTN size); @@ -39,14 +39,14 @@ struct efi_loader_interface EFI_HANDLE image_handle; EFI_SYSTEM_TABLE *system_table; - efi_page_alloc_func page_alloc; - efi_page_free_func page_free; + efi_page_alloc_func *page_alloc; + efi_page_free_func *page_free; - efi_image_func image_open; - efi_image_func image_alloc; - efi_image_func image_load; + efi_image_func *image_open; + efi_image_func *image_alloc; + efi_image_func *image_load; }; typedef EFI_STATUS -(__attribute__((sysv_abi)) *efi_shim_entry_func)(struct efi_loader_interface *interface); +(__attribute__((sysv_abi)) efi_shim_entry_func)(struct efi_loader_interface *interface); diff --git a/kc/core/memory/memory.c b/kc/core/memory/memory.c index 63631ff..1c6fabb 100644 --- a/kc/core/memory/memory.c +++ b/kc/core/memory/memory.c @@ -587,7 +587,7 @@ void *vm_alloc_at(void *address, size_t size, enum vm_alloc_flags flags) node, object, address, - (void *)((char *)address + size)); + (char *)address + size); } return address; diff --git a/kc/core/memory/page_early.c b/kc/core/memory/page_early.c index 144e8ea..9ac90d2 100644 --- a/kc/core/memory/page_early.c +++ b/kc/core/memory/page_early.c @@ -20,7 +20,7 @@ void page_early_init(void) early_state.last = &boot_data->memory.entries[boot_data->memory.count]; early_state.current = early_state.first; - kprintf("memory ranges\n"); + /*kprintf("memory ranges\n"); struct memory_range *current = early_state.first; @@ -30,6 +30,7 @@ void page_early_init(void) current++; } while (current != early_state.last); + */ } void page_early_final(void) diff --git a/loader/main_efi.c b/loader/main_efi.c index e49fad6..df156e3 100644 --- a/loader/main_efi.c +++ b/loader/main_efi.c @@ -465,9 +465,9 @@ static EFI_STATUS enter_shim(void) { EFI_STATUS status = EFI_ABORTED; Elf64_Ehdr *ehdr = (Elf64_Ehdr *)shim_image.buffer_base; - efi_shim_entry_func entry; + efi_shim_entry_func *entry; - entry = (efi_shim_entry_func)(shim_image.buffer_base + ehdr->e_entry); + entry = (efi_shim_entry_func *)(shim_image.buffer_base + ehdr->e_entry); kprintf("entering shim @%p\r\n", entry); status = entry(&loader_interface); |