バグ修正,メッセージング機能向上

[vaneos/vaneosmain.git] / Kernel / boot.c

diff --git a/Kernel/boot.c b/Kernel/boot.c
index 59246e7..6954ca5 100644 (file)
--- a/Kernel/boot.c
+++ b/Kernel/boot.c
@@ -1,6 +1,6 @@
 /*!
-       \file boot.c
-       \Desc Kernel and Setting.
+       boot.c
+       Kernel and Setting.
        (C) 2013-2014 VOSystems.
 */
 
@@ -15,13 +15,14 @@
 
 #include<multiboot.h>
 #include<VaneOS.h>
+#include<GDT_IDT.h>
 #include<KeyBoard.h>
 #include<Interrupt.h>
-#include<GDT_IDT.h>
 #include<stdio.h>
 #include<scancode.h>
 #include<memory.h>
 #include<Graphic.h>
+#include<Message.h>
 
 /*PROTOTYPE*/
 void outPortByte( unsigned short address, unsigned char value );
@@ -37,9 +38,9 @@ void hlt(void);
        
        Set All & Call shell
        (C)2014 VOSystems.
-       \create 2014/09/23
-       \update 2014/09/27
-       \author 2m
+       create 2014/09/23
+       update 2014/10/15
+       author VOSystems
 */
 void cstart(unsigned long magic, unsigned long addr)
 {
@@ -47,7 +48,6 @@ void cstart(unsigned long magic, unsigned long addr)
        char cmd[100]={0};
        struct MEMMAN *memman=(struct MEMMAN*)MEMMAN_ADDR;
        multiboot_info_t *mbi;
-       drive_info *drv;
        
        mbi = (multiboot_info_t *) addr;
                
@@ -103,8 +103,8 @@ void cstart(unsigned long magic, unsigned long addr)
        keyboardEnableKBD();
        printOK("Init Keyboard.....");
        
-       bufinit();
-       printOK("Init Keyboard Buffer.....");
+       init_all();
+       printOK("Init Messaging Buffer.....");
        
        setPitCounter(100,DEF_PIT_COM_COUNTER0,DEF_PIT_COM_MODE_SQUAREWAVE);
        initPit();
@@ -125,30 +125,15 @@ void cstart(unsigned long magic, unsigned long addr)
        printf("\n~Memory Information~\nLowMemory = %d KiB , UpperMemory = %d KiB , TotalMemory = %d MiB\n\n",mbi->mem_lower,
                mbi->mem_upper,(mbi->mem_lower+mbi->mem_upper+1024)/1024);
        
+       
        printf("Free Memory = %d MiB\n\n",memman_total(memman)/(1024*1024));
        
        puts("KernelShell/Root/>");
+       int num;
+       char aaa[100]={"ASD"};
        scanf("%s",&cmd);
        printf("%s",cmd);
        
-       /*
-       if(Check_VESA()==0){
-               VESA_640_480_SET();
-       }else{
-               scrn320();
-       }*/
-       
-       ScreenVGA_Graphic();
-       printf("Successfully\n");
-       getchar();
-       int scrn_addr=vram_start_address;
-       char* p=(char*)scrn_addr;
-       for(p=(char*)scrn_addr;scrn_addr<=0x000affff;scrn_addr++)
-       {
-               p=(char*)scrn_addr;
-               *p=(char)scrn_addr & 0x0f;
-       }
-       
        while(1)hlt();
        return;
 }