Subversion Repositories HelenOS

Rev

Rev 2787 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2787 Rev 3597
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 
 
 36 
 
37 
bootinfo_t bootinfo;
 37 
extern bootinfo_t binfo;
38 
component_t components[COMPONENTS];
 38 
component_t components[COMPONENTS];
39 
 
 39 
 
40 
char *release = RELEASE;
 40 
char *release = RELEASE;
41 
 
 41 
 
42 
void write(const char *str, const int len)
 42 
void write(const char *str, const int len)
Line 67... Line 67...
67 
{
 67 
{
68 
 
 68 
 
69 
    int ii;
 69 
    int ii;
70 
   
 70 
   
71 
   
 71 
   
- 
 
 72 
    bootinfo_t *bootinfo=&binfo;
- 
 
 73 
   
72 
    //for(ii=0;ii<KERNEL_SIZE;ii++) ((char *)(0x100000))[ii] = ((char *)KERNEL_START)[ii+1];
 74 
    //for(ii=0;ii<KERNEL_SIZE;ii++) ((char *)(0x100000))[ii] = ((char *)KERNEL_START)[ii+1];
73 
   
 75 
   
74 
   
 76 
   
75 
    //((int *)(0x100000))[0]++;
 77 
    //((int *)(0x100000))[0]++;
76 
   
 78 
   
Line 90... Line 92...
90 
    for (i = 0; i < COMPONENTS; i++)
 92 
    for (i = 0; i < COMPONENTS; i++)
91 
        printf(" %P: %s image (size %d bytes)\n", components[i].start,
 93 
        printf(" %P: %s image (size %d bytes)\n", components[i].start,
92 
            components[i].name, components[i].size);
 94 
            components[i].name, components[i].size);
93 
 
 95 
 
94 
 
 96 
 
95 
    bootinfo.taskmap.count = 0;
 97 
    bootinfo->taskmap.count = 0;
96 
    for (i = 0; i < COMPONENTS; i++) {
 98 
    for (i = 0; i < COMPONENTS; i++) {
97 
 
 99 
 
98 
        if (i > 0) {
 100 
        if (i > 0) {
99 
            bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = components[i].start;
 101 
            bootinfo->taskmap.tasks[bootinfo->taskmap.count].addr = components[i].start;
100 
            bootinfo.taskmap.tasks[bootinfo.taskmap.count].size = components[i].size;
 102 
            bootinfo->taskmap.tasks[bootinfo->taskmap.count].size = components[i].size;
101 
            bootinfo.taskmap.count++;
 103 
            bootinfo->taskmap.count++;
102 
        }
 104 
        }
103 
    }
 105 
    }
104 
 
 106 
 
105 
 
 - 
 
106 
    jump_to_kernel(&bootinfo);
 107 
    jump_to_kernel(bootinfo);
107 
 
 108 
 
108 
 
 109 
 
109 
}
 110 
}
110 
 
 111