Changeset a35b458 in mainline for kernel/genarch/src/multiboot/multiboot2.c
- Timestamp:
- 2018-03-02T20:10:49Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- f1380b7
- Parents:
- 3061bc1
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/genarch/src/multiboot/multiboot2.c
r3061bc1 ra35b458 56 56 multiboot_extract_argument(init.tasks[init.cnt].arguments, 57 57 CONFIG_TASK_ARGUMENTS_BUFLEN, module->string); 58 58 59 59 init.cnt++; 60 60 } … … 66 66 ((uintptr_t) memmap + sizeof(*memmap)); 67 67 uint32_t pos = sizeof(*memmap); 68 68 69 69 while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) { 70 70 e820table[e820counter].base_address = entry->base_address; 71 71 e820table[e820counter].size = entry->size; 72 72 e820table[e820counter].type = entry->type; 73 73 74 74 /* Compute address of next entry. */ 75 75 entry = (multiboot2_memmap_entry_t *) 76 76 ((uintptr_t) entry + memmap->entry_size); 77 77 pos += memmap->entry_size; 78 78 79 79 e820counter++; 80 80 } … … 90 90 bfb_bpp = fbinfo->bpp; 91 91 bfb_scanline = fbinfo->scanline; 92 92 93 93 bfb_red_pos = fbinfo->rgb.red_pos; 94 94 bfb_red_size = fbinfo->rgb.red_size; 95 95 96 96 bfb_green_pos = fbinfo->rgb.green_pos; 97 97 bfb_green_size = fbinfo->rgb.green_size; 98 98 99 99 bfb_blue_pos = fbinfo->rgb.blue_pos; 100 100 bfb_blue_size = fbinfo->rgb.blue_size; … … 116 116 if (signature != MULTIBOOT2_LOADER_MAGIC) 117 117 return; 118 118 119 119 const multiboot2_tag_t *tag = (const multiboot2_tag_t *) 120 120 ALIGN_UP((uintptr_t) info + sizeof(*info), MULTIBOOT2_TAG_ALIGN); 121 121 122 122 while (tag->type != MULTIBOOT2_TAG_TERMINATOR) { 123 123 switch (tag->type) { … … 135 135 break; 136 136 } 137 137 138 138 tag = (const multiboot2_tag_t *) 139 139 ALIGN_UP((uintptr_t) tag + tag->size, MULTIBOOT2_TAG_ALIGN);
Note:
See TracChangeset
for help on using the changeset viewer.