diff --git a/kernel/Makefile b/kernel/Makefile index 20ff3968..04790e51 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -18,7 +18,7 @@ LD_LIST := head.o OBJ_LIST := head.o -kernel_subdirs := common/libELF +kernel_subdirs := common driver diff --git a/kernel/common/Makefile b/kernel/common/Makefile index ce0e2e84..65e892c5 100644 --- a/kernel/common/Makefile +++ b/kernel/common/Makefile @@ -7,6 +7,6 @@ all: @list='$(kernel_common_subdirs)'; for subdir in $$list; do \ echo "make all in $$subdir";\ cd $$subdir;\ - $(MAKE) all CFLAGS="$(CFLAGS) -I";\ + $(MAKE) all CFLAGS="$(CFLAGS)";\ cd ..;\ done diff --git a/kernel/driver/Makefile b/kernel/driver/Makefile new file mode 100644 index 00000000..4e3889b6 --- /dev/null +++ b/kernel/driver/Makefile @@ -0,0 +1,12 @@ + +CFLAGS += -I . + +kernel_driver_subdirs:=video + +all: + @list='$(kernel_driver_subdirs)'; for subdir in $$list; do \ + echo "make all in $$subdir";\ + cd $$subdir;\ + $(MAKE) all CFLAGS="$(CFLAGS)";\ + cd ..;\ + done diff --git a/kernel/driver/video/Makefile b/kernel/driver/video/Makefile new file mode 100644 index 00000000..57713fe4 --- /dev/null +++ b/kernel/driver/video/Makefile @@ -0,0 +1,8 @@ + +all: video.o + +CFLAGS += -I . + + +video.o: video.c + gcc $(CFLAGS) -c video.c -o video.o diff --git a/kernel/driver/video/video.c b/kernel/driver/video/video.c new file mode 100644 index 00000000..2bb78601 --- /dev/null +++ b/kernel/driver/video/video.c @@ -0,0 +1,11 @@ +#include "video.h" + +/** + * @brief 初始化显示模块 + * + * @return int + */ +int video_init() +{ + +} \ No newline at end of file diff --git a/kernel/driver/video/video.h b/kernel/driver/video/video.h new file mode 100644 index 00000000..3b875fed --- /dev/null +++ b/kernel/driver/video/video.h @@ -0,0 +1,8 @@ +#pragma once + +/** + * @brief 初始化显示模块 + * + * @return int + */ +int video_init(); \ No newline at end of file diff --git a/kernel/mm/mm.c b/kernel/mm/mm.c index a7d7ae4e..493043fa 100644 --- a/kernel/mm/mm.c +++ b/kernel/mm/mm.c @@ -230,14 +230,7 @@ void mm_init() --tmp_page->zone->count_pages_free; } - // root_page_table_phys_addr = global_CR3; - // kdebug("global_CR3\t:%#018lx", global_CR3); - // kdebug("*global_CR3\t:%#018lx", *phys_2_virt(global_CR3) & (~0xff)); - // kdebug("**global_CR3\t:%#018lx", *phys_2_virt(*phys_2_virt(global_CR3) & (~0xff)) & (~0xff)); - - // kdebug("1.memory_management_struct.bmp:%#018lx\tzone->count_pages_using:%d\tzone_struct->count_pages_free:%d", *memory_management_struct.bmp, memory_management_struct.zones_struct->count_pages_using, memory_management_struct.zones_struct->count_pages_free); - // kinfo("Cleaning page table remapping at 0x0000"); - + kinfo("Memory management unit initialize complete!"); flush_tlb();