[LinksOS CVS Commit]linksos/main start.c,NONE,1.1 Makefile,1.8,1.9 main.c,1.4,NONE

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

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

Modified Files:
	Makefile 
Added Files:
	start.c 
Removed Files:
	main.c 
Log Message:
Title: Naming conflict 
Changes: Conflicting main.o files. - main.o changed to start.o

Effects: Should compile

a=kennyt


--- NEW FILE: start.c ---
/****************************************************************************\
**	filename:	main.c														**
**	creation date:	11/29/2002, 0134 MST									**
**	author:	Charles Banas													**
**  version: 0.01															**
******************************************************************************
**	revision history:														**
**		11/29/2002 - 0134 MST - Charles Banas								**
**			put something in main() just to make sure we get there.			**
**      12/22/2002 - 1132 MST - Charles Banas								**
**			changed boot message.											**
\****************************************************************************/

#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);
}

Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/linksos/main/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	3 Jan 2003 23:00:24 -0000	1.8
--- Makefile	3 Jan 2003 23:06:18 -0000	1.9
***************
*** 8,13 ****
  .SUFFIXES: .asm
  
! main: main.o
! 	ld -r -o boot.o $<
  
  .c.o:
--- 8,13 ----
  .SUFFIXES: .asm
  
! main: start.o
! 	ld -r -o main $<
  
  .c.o:

--- main.c DELETED ---