i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Raspberry_pi: fix VT100 console driver

Browse Source 
* Cursor coordinates are 1-based, not 0-based
 * Color change was disabled and broken

This implementation of our console over VT100 is generic and should be
moved out of the raspberry-pi specific folder. However, leaving it there
for now as we will have some bigger reorganization a swe add FDT support
here.
This commit is contained in:
PulkoMandy
2014-09-09 22:06:20 +02:00
parent 549b878fa6
commit 19ad221e37
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/raspberrypi_arm/console.cpp
+7 -8
View File
@@ -105,9 +105,9 @@ VTConsole::ClearScreen()
void void
VTConsole::SetCursor(int32 x, int32 y) VTConsole::SetCursor(int32 x, int32 y)
{ {
char buffer[8]; char buffer[9];
x = MIN(79, MAX(0, x)); x = MIN(80, MAX(1, x));
y = MIN(24, MAX(0, y)); y = MIN(25, MAX(1, y));
int len = snprintf(buffer, sizeof(buffer), int len = snprintf(buffer, sizeof(buffer),
"\033[%" B_PRId32 ";%" B_PRId32 "H", y, x); "\033[%" B_PRId32 ";%" B_PRId32 "H", y, x);
WriteAt(NULL, 0LL, buffer, len); WriteAt(NULL, 0LL, buffer, len);
@@ -117,20 +117,19 @@ VTConsole::SetCursor(int32 x, int32 y)
void void
VTConsole::SetColor(int32 foreground, int32 background) VTConsole::SetColor(int32 foreground, int32 background)
{ {
return;
static const char cmap[] = { static const char cmap[] = {
0, 4, 2, 6, 1, 5, 3, 7 }; 0, 4, 2, 6, 1, 5, 3, 7 };
char buffer[12]; char buffer[12];
if (foreground < 0 && foreground >= 8) if (foreground < 0 || foreground >= 8)
return; return;
if (background < 0 && background >= 8) if (background < 0 || background >= 8)
return; return;
// We assume normal display attributes here // We assume normal display attributes here
int len = snprintf(buffer, sizeof(buffer), int len = snprintf(buffer, sizeof(buffer),
"\033[#0;3%" B_PRId32 ";4%" B_PRId32 "m", "\033[%" B_PRId32 ";%" B_PRId32 "m",
cmap[foreground], cmap[background]); cmap[foreground] + 30, cmap[background] + 40);
WriteAt(NULL, 0LL, buffer, len); WriteAt(NULL, 0LL, buffer, len);
} }