diff options
Diffstat (limited to 'kernel/bootinfo/multiboot.sats')
| -rw-r--r-- | kernel/bootinfo/multiboot.sats | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/bootinfo/multiboot.sats b/kernel/bootinfo/multiboot.sats index 0d89040..3909fdd 100644 --- a/kernel/bootinfo/multiboot.sats +++ b/kernel/bootinfo/multiboot.sats @@ -4,15 +4,15 @@ typedef tag_t = @{ size = [n : nat | n >= 8] uint n // Size of tag (not including padding) } -typedef memory_entry_t = @{ +typedef memory_area_t = @{ base_addr = Ptr1, // Start of physical address - length = uint64, // Size of memory region in bytes + length = [n : nat | n > 0 ] size_t n , // Size of memory region in bytes (64 bits) type = uint, // Variety of address range represented. 1: available RAM, 3: usable memory holding ACPI information, // 4: reserved memory (preserved on hibernation), Other: reserved area reserved = uint 0 } -typedef memory_map_t = @{ +typedef memory_areas_t = @{ tag = tag_t, entry_size = [n : nat | n > 0 && n % 8 == 0] uint n, entry_version = uint, @@ -42,7 +42,7 @@ typedef elf64_shdr_t = @{ typedef boot_info_t = @{ total_size = uint, // total size of boot information - memory_map = memory_map_t, + memory_map = memory_areas_t, elf_tag = elf_tag_t } @@ -51,7 +51,7 @@ vtypedef bootptr = [l : agz] (boot_info_t@l , boot_info_t@l -<lin,prf> void | p fun boot_info_init(p : Ptr1) : bootptr fn get_memory_mappings_n (p : !bootptr) : [n:nat] size_t n -fn get_memory_mapping (p : !bootptr, n : size_t) : memory_entry_t +fn get_memory_mapping (p : !bootptr, n : size_t) : memory_area_t fn print_memory_mappings (p : !bootptr) : void fn get_elf_headers_n (p : !bootptr) : [n:nat] size_t n |