Chameleon

Chameleon Commit Details

Date:2011-05-27 19:19:31 (9 years 6 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

branches/azimutz/Cleancut/i386/boot2/modules.c
9292
9393
9494
95
96
97
98
99
100
95101
102
96103
97104
98105
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
branches/azimutz/Cleancut/i386/boot2/modules.h
44
55
66
7
78
89
910
......
5354
5455
5556
57
5658
5759
5860
*
*/
#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);
branches/azimutz/Cleancut/i386/modules/MakeInc.dir
141141
142142
143143
144
144
145145
146146
147147
.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)" >> $@
branches/azimutz/Cleancut/i386/modules/Makefile
6363
6464
6565
66
6667
6768
6869
$(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() {" >> $@
branches/azimutz/Cleancut/TODO
11
22
3
34
45
56
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

Archive Download the corresponding diff file

Revision: 898