RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 08:17:35 +00:00
Code Issues Activity Actions

Have Console::write() directly call vga_putch.

Browse source
This commit is contained in:
Andreas Kling 2018-10-21 22:11:46 +02:00
parent a70bfb87d5
commit fc88368582
5 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Kernel/VGA.cpp
View file

@ -10,8 +10,6 @@
PRIVATE BYTE *vga_mem = 0L;
PRIVATE BYTE current_attr = 0x07;
PRIVATE volatile WORD soft_cursor;
template<typename PutChFunc> static int printNumber(PutChFunc, char*&, DWORD);
template<typename PutChFunc> static int printHex(PutChFunc, char*&, DWORD, BYTE fields);
template<typename PutChFunc> static int printSignedNumber(PutChFunc, char*&, int);
@ -21,20 +19,22 @@ static void console_putch(char*, char ch)
Console::the().write((byte*)&ch, 1);
}
static void vga_putch(char*, char ch)
void vga_putch(char*, char ch)
{
WORD soft_cursor = vga_get_cursor();
WORD row;
switch (ch) {
case '\n':
row = soft_cursor / 80;
if (row == 23) {
memcpy( vga_mem, vga_mem + 160, 160 * 23 );
memset( vga_mem + (160 * 23), 0, 160 );
memcpy(vga_mem, vga_mem + 160, 160 * 23);
memset(vga_mem + (160 * 23), 0, 160);
soft_cursor = row * 80;
} else {
soft_cursor = (row + 1) * 80;
}
vga_set_cursor(soft_cursor);
return;
default:
vga_mem[soft_cursor * 2] = ch;
@ -47,6 +47,8 @@ static void vga_putch(char*, char ch)
memset(vga_mem + (160 * 23), 0, 160);
soft_cursor = 23 * 80;
}
vga_set_cursor(soft_cursor);
}
template<typename PutChFunc>
@ -54,8 +56,6 @@ int kprintfInternal(PutChFunc putch, char* buffer, const char*& fmt, char*& ap)
{
const char *p;
soft_cursor = vga_get_cursor();
int ret = 0;
char* bufptr = buffer;
@ -134,17 +134,6 @@ int kprintf(const char* fmt, ...)
return ret;
}
int kprintfFromConsole(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
soft_cursor = vga_get_cursor();
int ret = kprintfInternal(vga_putch, nullptr, fmt, ap);
vga_set_cursor(soft_cursor);
va_end(ap);
return ret;
}
static void buffer_putch(char*& bufptr, char ch)
{
*bufptr++ = ch;