[LinksOS CVS Commit]linksos/main Makefile,1.5,1.6 include.mk,1.1,1.2 main.c,1.3,1.4

[<ke...@to...>]

Update of /cvsroot/linksos/linksos/main
In directory router-internal.tossell.net:/tmp/cvs-serv21406/main

Modified Files:
	Makefile include.mk main.c 
Log Message:
Title: Multiboot 
Changes: Added multiboot code (bgm's). Fixed makefiles (they need more work) - changed to GNU as, added more to main.c (notices and multiboot checks)

Effects: You can boot from GRUB!

a=kennyt


Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/linksos/main/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	3 Jan 2003 21:47:38 -0000	1.5
--- Makefile	3 Jan 2003 22:32:11 -0000	1.6
***************
*** 8,12 ****
  .SUFFIXES: .asm
  
! boot: main.o
  	ld -r -o boot.o $<
  
--- 8,12 ----
  .SUFFIXES: .asm
  
! main: main.o
  	ld -r -o boot.o $<
  

Index: include.mk
===================================================================
RCS file: /cvsroot/linksos/linksos/main/include.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** include.mk	3 Jan 2003 21:47:38 -0000	1.1
--- include.mk	3 Jan 2003 22:32:11 -0000	1.2
***************
*** 1 ****
! INCDIRS += $(TOPDIR)/hal/prototypes
\ No newline at end of file
--- 1 ----
! INCDIRS += {$(TOPDIR)hal/prototypes,$(TOPDIR)boot/$(ARCH)}
\ No newline at end of file

Index: main.c
===================================================================
RCS file: /cvsroot/linksos/linksos/main/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.c	3 Jan 2003 21:47:38 -0000	1.3
--- main.c	3 Jan 2003 22:32:11 -0000	1.4
***************
*** 13,20 ****
  
  #include "kstdio.h"
  
! void main(void)
! {
    while(1);
-   kprintf("LinksOS v0.0.1a kernel booted.");
  }
--- 13,24 ----
  
  #include "kstdio.h"
+ #include "multiboot.h"
  
! void cmain(unsigned long magic, multiboot_info_t addr) {
!   if ( magic != MULTIBOOT_BOOTLOADER_MAGIC ) {
!     kprintf("Invalid bootloader magic number\n");
!     return;
!   }
!   kprintf("\n\n\nLinksOS v0.0.1a kernel booted.\nI'll loop forever now.\n");
    while(1);
  }