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

Date:

2011-05-27 19:19:31 (12 years 10 months ago)

Author:

Azimutz

Commit:

898

Parents:

897

Message:

Merge trunk (r896).

Changes:

M	/branches/azimutz/Cleancut/i386/boot2/modules.h
M	/branches/azimutz/Cleancut/i386/modules/Makefile
M	/branches/azimutz/Cleancut
M	/branches/azimutz/Cleancut/TODO
M	/branches/azimutz/Cleancut/i386/modules/MakeInc.dir
M	/branches/azimutz/Cleancut/i386/boot2/modules.c

File differences

-92
93 93
94 94
95
96
97
98
99
100
95 101
102
96 103
97 104
98 105
+␉return retVal;␊
}␊
␊
void start_built_in_module(char* name, void(*start_function)(void))␊
{␊
    start_function();␊
    // Notify the module system that this module really exists, specificaly, let other module link with it␊
    module_loaded(name /*, moduleName, moduleVersion, moduleCompat*/);␊
}␊
␊
␊
/*␊
 * Load all modules in the /Extra/modules/ directory␊
 * Module depencdies will be loaded first␊
 ␉return retVal;␊
 }␊
 ␊
+void start_built_in_module(char* name, void(*start_function)(void))␊
+{␊
+    start_function();␊
+    // Notify the module system that this module really exists, specificaly, let other module link with it␊
+    module_loaded(name /*, moduleName, moduleVersion, moduleCompat*/);␊
+}␊
 ␊
+␊
 /*␊
  * Load all modules in the /Extra/modules/ directory␊
  * Module depencdies will be loaded first␊

-4
5 5
6 6
7
7 8
8 9
9 10
... ...
53 54
54 55
55 56
57
56 58
57 59
58 60
+ *␊
 */␊
␊
#include <saio_types.h>␊
#include <mach-o/loader.h>␊
#include <mach-o/nlist.h>␊
␊

int init_module_system();␊
void load_all_modules();␊
␊
void start_built_in_module(char* name, void(*start_function)(void));␊
␊
␊
int load_module(char* module);␊
 ...
  *␊
  */␊
 ␊
+#include <saio_types.h>␊
 #include <mach-o/loader.h>␊
 #include <mach-o/nlist.h>␊
 ␊
 int init_module_system();␊
 void load_all_modules();␊
 ␊
+void start_built_in_module(char* name, void(*start_function)(void));␊
 ␊
 ␊
 int load_module(char* module);␊

-141
142 142
143 143
144 
144
145 145
146 146
147 147
+.PHONY: $(SYMROOT)/boot_modules.c␊
␊
$(SYMROOT)/boot_modules.c: ␊
␉@echo "\t$(MODULE_START)(); // $(MODULE_NAME)" >> $@␊
␉@echo "\tstart_built_in_module(\"$(MODULE_NAME)\", &$(MODULE_START));" >> $@␊
␉␊
$(SYMROOT)/boot_modules.h:␊
␉@echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@␊
 .PHONY: $(SYMROOT)/boot_modules.c␊
 ␊
 $(SYMROOT)/boot_modules.c: ␊
-␉@echo "\t$(MODULE_START)(); // $(MODULE_NAME)" >> $@␊
+␉@echo "\tstart_built_in_module(\"$(MODULE_NAME)\", &$(MODULE_START));" >> $@␊
 ␉␊
 $(SYMROOT)/boot_modules.h:␊
 ␉@echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@␊

-63
64 64
65 65
66
66 67
67 68
68 69
+␊
$(SYMROOT)/boot_modules.c: ${OBJROOT} ${SYMROOT}/modules/ ${OBJROOT} $(addprefix $(OBJROOT)/, ${MODULE_OBJS})␊
␉@echo "// Autogenerated - do not modify" > $@␊
␉@echo "#include <modules.h>" >> $@␊
␉@echo "#include \"boot_modules.h\"" >> $@␊
␉@echo "void start_built_in_modules() {" >> $@␊
␊
 ␊
 $(SYMROOT)/boot_modules.c: ${OBJROOT} ${SYMROOT}/modules/ ${OBJROOT} $(addprefix $(OBJROOT)/, ${MODULE_OBJS})␊
 ␉@echo "// Autogenerated - do not modify" > $@␊
+␉@echo "#include <modules.h>" >> $@␊
 ␉@echo "#include \"boot_modules.h\"" >> $@␊
 ␉@echo "void start_built_in_modules() {" >> $@␊
 ␊

-1
2 2
3
3 4
4 5
5 6
+TODO List for Chameleon Boot Loader␊
====================================␊
- Create a dummy module for any modules that are compiled in. This is needed for linking modules with dependencies that are not compiled in.␊
- Fix the module system when booting chameleon with multiboot. Cleanup the xcode 4 fix.␊
␊
- Integrate Prasys current work on options and quick shortcut modified version of 18seven␊␊
 TODO List for Chameleon Boot Loader␊
 ====================================␊
+- Create a dummy module for any modules that are compiled in. This is needed for linking modules with dependencies that are not compiled in.␊
 - Fix the module system when booting chameleon with multiboot. Cleanup the xcode 4 fix.␊
 ␊
 - Integrate Prasys current work on options and quick shortcut modified version of 18seven␊␊