Rev 3883 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3883 | Rev 4031 | ||
|---|---|---|---|
| Line 32... | Line 32... | ||
| 32 | #include "asm.h" |
32 | #include "asm.h" |
| 33 | #include "_components.h" |
33 | #include "_components.h" |
| 34 | #include <align.h> |
34 | #include <align.h> |
| 35 | #include <balloc.h> |
35 | #include <balloc.h> |
| 36 | #include <macros.h> |
36 | #include <macros.h> |
| - | 37 | #include <string.h> |
|
| 37 | 38 | ||
| 38 | extern bootinfo_t binfo; |
39 | extern bootinfo_t binfo; |
| 39 | component_t components[COMPONENTS]; |
40 | component_t components[COMPONENTS]; |
| 40 | 41 | ||
| 41 | char *release = STRING(RELEASE); |
42 | char *release = STRING(RELEASE); |
| Line 122... | Line 123... | ||
| 122 | if (i > 0) { |
123 | if (i > 0) { |
| 123 | bootinfo->taskmap.tasks[bootinfo->taskmap.count].addr = |
124 | bootinfo->taskmap.tasks[bootinfo->taskmap.count].addr = |
| 124 | components[i].start; |
125 | components[i].start; |
| 125 | bootinfo->taskmap.tasks[bootinfo->taskmap.count].size = |
126 | bootinfo->taskmap.tasks[bootinfo->taskmap.count].size = |
| 126 | components[i].size; |
127 | components[i].size; |
| - | 128 | strncpy(bootinfo->taskmap.tasks[ |
|
| - | 129 | bootinfo->taskmap.count].name, |
|
| - | 130 | components[i].name, BOOTINFO_TASK_NAME_BUFLEN); |
|
| 127 | bootinfo->taskmap.count++; |
131 | bootinfo->taskmap.count++; |
| 128 | } |
132 | } |
| 129 | } |
133 | } |
| 130 | 134 | ||
| 131 | jump_to_kernel(bootinfo); |
135 | jump_to_kernel(bootinfo); |