diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | env.sh | 1 | ||||
| -rw-r--r-- | kernel/drivers/vga_text_buffer/vga_text_buffer.c | 8 | ||||
| -rw-r--r-- | kernel/mm/memory_map.c | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0daf4da..c213194 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,6 @@ set(QEMU_SYSTEM_CMD qemu-system-i386) set(QEMU_ARGUMENTS -cdrom ${CMAKE_BINARY_DIR}/cmos.iso - -serial stdio -device isa-debug-exit,iobase=0xf4,iosize=0x04 -m 32M -smp 1 @@ -36,6 +35,17 @@ add_custom_target(iso add_custom_target(run ${QEMU_SYSTEM_CMD} ${QEMU_ARGUMENTS} + -serial stdio + ${IGNORE_EXIT} + + DEPENDS iso + USES_TERMINAL +) + +add_custom_target(run-headless + ${QEMU_SYSTEM_CMD} + ${QEMU_ARGUMENTS} + -nographic ${IGNORE_EXIT} DEPENDS iso @@ -32,5 +32,6 @@ alias m="ninja" alias mc="ninja clean-custom" alias mi="ninja iso" alias mr="ninja run" +alias mh="ninja run-headless" alias mb="ninja run-bochs" alias mg="ninja run-gdb" diff --git a/kernel/drivers/vga_text_buffer/vga_text_buffer.c b/kernel/drivers/vga_text_buffer/vga_text_buffer.c index b2fa331..f5e25f7 100644 --- a/kernel/drivers/vga_text_buffer/vga_text_buffer.c +++ b/kernel/drivers/vga_text_buffer/vga_text_buffer.c @@ -25,10 +25,10 @@ #include <drivers/vga_text_buffer.h> -uint8_t vga_text_buffer_row; -uint8_t vga_text_buffer_column; -uint8_t vga_text_buffer_color; -uint16_t *vga_text_buffer_buffer; +static uint8_t vga_text_buffer_row; +static uint8_t vga_text_buffer_column; +static uint8_t vga_text_buffer_color; +static uint16_t *vga_text_buffer_buffer; static uint8_t vga_entry_color(const vga_color fg, const vga_color bg) diff --git a/kernel/mm/memory_map.c b/kernel/mm/memory_map.c index 5b6d138..737f0ab 100644 --- a/kernel/mm/memory_map.c +++ b/kernel/mm/memory_map.c @@ -26,7 +26,7 @@ #include <mm/memory_map.h> #include <mm/multiboot.h> -free_memory_regions_t free_memory_regions = { 0 }; +static free_memory_regions_t free_memory_regions = { 0 }; ALWAYS_INLINE static char * memory_map_fetch_type(multiboot_memory_map_t *mmap) |