Chameleon Commit Details - 1312 - Chameleon open source boot loader project.

Date:

2011-08-06 23:22:48 (12 years 8 months ago)

Author:

Evan Lojewski

Commit:

1312

Parents:

1311

Message:

Update malloc_init in i386 boot file

Changes:

M	/branches/xZenu/src/arch/i386/boot2/boot.c

File differences

-53
54 54
55 55
56
56 57
57 58
58 59
... ...
89 90
90 91
91 92
92 
93
93 94
94 95
95 96
+#include <stdio.h>␊
␊
#include "boot.h"␊
#include "memory.h"␊
␊
extern void init_module_system();␊
extern int execute_hook(const char* name, void*, void*, void*, void*);␊

void initialize_runtime(void)␊
{␊
␉zeroBSS();␊
␉malloc_init(ZALLOC_ADDR, ZALLOC_LEN, 16384, malloc_error);␊
␉malloc_init((void*)ZALLOC_ADDR, ZALLOC_LEN, 16384, malloc_error);␊
}␊
␊
//==========================================================================␊
 ...
 #include <stdio.h>␊
 ␊
 #include "boot.h"␊
+#include "memory.h"␊
 ␊
 extern void init_module_system();␊
 extern int execute_hook(const char* name, void*, void*, void*, void*);␊
 void initialize_runtime(void)␊
 {␊
 ␉zeroBSS();␊
-␉malloc_init(ZALLOC_ADDR, ZALLOC_LEN, 16384, malloc_error);␊
+␉malloc_init((void*)ZALLOC_ADDR, ZALLOC_LEN, 16384, malloc_error);␊
 }␊
 ␊
 //==========================================================================␊