[LinksOS CVS Commit]kernel/main start.cpp,1.2,1.3
Status: Inactive
Brought to you by:
terencevs
|
From: <ke...@to...> - 2003-01-12 21:09:53
|
Update of /cvsroot/linksos/kernel/main In directory router-internal.tossell.net:/tmp/cvs-serv2561/main Modified Files: start.cpp Log Message: Title: Core portability Changes: Made cmain a "C" function, removing mangling. Removed call to kprintf from ASM, and put it into cmain. Effects: Code should compile on other versions of g++, and only one function need be extern "C". a=kennyt Index: start.cpp =================================================================== RCS file: /cvsroot/linksos/kernel/main/start.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** start.cpp 4 Jan 2003 08:12:31 -0000 1.2 --- start.cpp 12 Jan 2003 21:09:49 -0000 1.3 *************** *** 30,34 **** ! void cmain(unsigned long magic, multiboot_info_t addr) { if(magic != MULTIBOOT_BOOTLOADER_MAGIC){ --- 30,34 ---- ! extern "C" void cmain(unsigned long magic, multiboot_info_t addr) { if(magic != MULTIBOOT_BOOTLOADER_MAGIC){ *************** *** 58,60 **** --- 58,65 ---- kprintf("LinksOS v0.0.1a kernel booted.\nI'll loop forever now.\n"); + /* Do that kool kernel stuff */ + + /* Halt */ + kprintf("Halted."); + return; } |