diff options
Diffstat (limited to 'boot/efi')
| -rw-r--r-- | boot/efi/image.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/boot/efi/image.c b/boot/efi/image.c index 1ff5b76..9e7ba3d 100644 --- a/boot/efi/image.c +++ b/boot/efi/image.c @@ -14,7 +14,7 @@ #include <efi/error.h> -static int create_image_buffer(int fd, struct image_buffer *buffer) +static int create_image_buffer(int fd, struct linear_buffer *buffer) { if ((buffer->length = elf64_size_fd(fd)) == 0) { @@ -36,13 +36,13 @@ static int create_image_buffer(int fd, struct image_buffer *buffer) return 0; } -static struct image_buffer load_image(void) +static struct linear_buffer load_image(void) { const char *image_entry_path = SERVICE_FILE_PATH; int image_fd; - struct image_buffer buffer = { nullptr, 0 }; + struct linear_buffer buffer = { nullptr, 0 }; if ((image_fd = open(image_entry_path, O_RDONLY, 0)) == -1) { @@ -71,7 +71,7 @@ static struct image_buffer load_image(void) return buffer; } -kjarna_image_entry_func *image_entry_addr(struct image_buffer *buffer) +kjarna_image_entry_func *image_entry_addr(struct linear_buffer *buffer) { if (buffer->base == nullptr) { @@ -88,14 +88,15 @@ struct kjarna_boot_image get_boot_image(void) struct kjarna_boot_image image = { { nullptr, 0 }, + { nullptr, 0 }, nullptr }; - image.buffer = load_image(); + image.image_buffer = load_image(); - if (image.buffer.base != nullptr) + if (image.image_buffer.base != nullptr) { - image.entry = image_entry_addr(&image.buffer); + image.entry = image_entry_addr(&image.image_buffer); } return image; |