Chameleon

Chameleon Commit Details

Date:2011-05-29 03:25:25 (12 years 10 months ago)
Author:Evan Lojewski
Commit:909
Parents: 908
Message:Updated Kerneel Start hook for lion + prelion. Added backa few @'s
Changes:
M/trunk/i386/modules/Makefile
M/trunk/i386/boot2/boot.c
M/trunk/i386/modules/MakeInc.dir

File differences

trunk/i386/boot2/boot.c
191191
192192
193193
194
194
195
196
197
198
199
200
201
202
195203
196204
197205
......
205213
206214
207215
208
216
209217
210218
211219
␉␊
␉usb_loop();␊
␉␊
␉execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL);␉// Notify modules that the kernel is about to be started␊
if (checkOSVersion("10.7"))␊
{␊
execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL);␉// Notify modules that the kernel is about to be started␊
}␊
else␊
{␊
execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgsPreLion, NULL, NULL);␉// Notify modules that the kernel is about to be started␊
␊
}␊
␉// If we were in text mode, switch to graphics mode.␊
␉// This will draw the boot graphics unless we are in␊
␉// verbose mode.␊
␉␊
␉finalizeBootStruct();␊
␉␊
␉if (checkOSVersion("10.7")) {␊
if (checkOSVersion("10.7")) {␊
␉␉␊
␉␉// Masking out so that Lion doesn't doublefault␊
␉␉outb(0x21, 0xff);␉/* Maskout all interrupts Pic1 */␊
trunk/i386/modules/MakeInc.dir
161161
162162
163163
164
164
165165
166166
167
167
168168
169169
170170
.PHONY: $(SRCROOT)/sym/i386/boot_modules.c␊
␊
$(SRCROOT)/sym/i386/boot_modules.c: ␊
␉echo "\tstart_built_in_module(\"$(MODULE_NAME)\", &$(MODULE_START));" >> $@␊
␉@echo "\tstart_built_in_module(\"$(MODULE_NAME)\", &$(MODULE_START));" >> $@␊
␉␊
$(SRCROOT)/sym/i386/boot_modules.h:␊
␉echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@␊
␉@echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@␊
␊
␊
#dependencies␊
trunk/i386/modules/Makefile
5959
6060
6161
62
62
6363
6464
6565
......
6767
6868
6969
70
70
7171
7272
␊
$(SYMROOT)/boot_modules.c: ${OBJROOT} ${SYMROOT}/modules/ ${OBJROOT} $(addprefix $(OBJROOT)/, ${MODULE_OBJS})␊
ifeq ($(BUILT_IN),yes)␊
␉echo "// Autogenerated - do not modify" > $@␊
␉@echo "// Autogenerated - do not modify" > $@␊
␉@echo "#include <modules.h>" >> $@␊
␉@echo "#include \"boot_modules.h\"" >> $@␊
␉@echo "void start_built_in_modules() {" >> $@␊
␊
$(SYMROOT)/boot_modules.h: ${OBJROOT} ${SYMROOT}/modules/ ${OBJROOT} $(addprefix $(OBJROOT)/, ${MODULE_OBJS})␊
ifeq ($(BUILT_IN),yes)␊
␉echo "// Autogenerated - do not modify" > $@␊
␉@echo "// Autogenerated - do not modify" > $@␊
␉@echo "void start_built_in_modules(); " > $@␊
endif␊

Archive Download the corresponding diff file

Revision: 909