From 08ee4d03ac01e5e8f04da49e7486ef16e834865a Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Tue, 29 Oct 2013 20:03:24 +0100 Subject: [PATCH] Add support for \n --- kernel/src/console.cpp | 11 +++++++---- kernel/src/shell.cpp | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel/src/console.cpp b/kernel/src/console.cpp index c1e86af3..a8e260f5 100644 --- a/kernel/src/console.cpp +++ b/kernel/src/console.cpp @@ -76,21 +76,24 @@ void k_print(std::size_t number){ } void k_print(char key){ + if(key == '\n'){ + ++current_line; + current_column = 0; + + return; + } + uint16_t* vga_buffer = (uint16_t*) 0x0B8000; vga_buffer[current_line * 80 + current_column] = make_vga_entry(key, make_color(WHITE, BLACK)); ++current_column; - - return; } void k_print(const char* string){ for(int i = 0; string[i] != 0; ++i){ k_print(string[i]); } - - return; } void wipeout(){ diff --git a/kernel/src/shell.cpp b/kernel/src/shell.cpp index 5ac64335..681749f0 100644 --- a/kernel/src/shell.cpp +++ b/kernel/src/shell.cpp @@ -83,7 +83,7 @@ void reboot_command(){ } void help_command(){ - k_print_line("Available commands:"); + k_print("Available commands:\n"); for(auto& command : commands){ k_print(" "); @@ -108,7 +108,7 @@ void exec_command(){ k_print("The command \""); k_print(current_input); - k_print_line("\" does not exist"); + k_print("\" does not exist \n"); } void clear_command(){