marco/vulcanos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed all previous bugs...however strange things happens when OS runs

Browse Source
This commit is contained in:
ice-bit
2019-07-03 21:04:05 +02:00
parent bec03e3d1b
commit a0b6eb882a
14 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/drivers/tty.c
View File

@@ -9,7 +9,7 @@
static uint32_t fb_col = 0; // X
static uint32_t fb_row = 0; // Y
void write_cell(int16_t i, int8_t c, uint8_t fg, uint8_t bg) {
void write_cell(int16_t i, uint8_t c, uint8_t fg, uint8_t bg) {
uint8_t *fb = VGA_PTR;
fb[i*2] = c;
fb[i*2 + 1] = ((bg & 0x0F) << 4) | (fg | 0x0F);
@@ -57,13 +57,9 @@ void kprint_c(uint8_t *buf, uint32_t len, uint8_t fg, uint8_t bg) {
uint8_t c = buf[i];
if(c == '\n' || c == '\r')
newline();
else if(c == '\t') {
else {
pos = fb_col + (fb_row * VGA_WIDTH);
write_cell(pos, " ", fg, bg);
cursor_adv();
} else {
pos = fb_col + (fb_row * VGA_WIDTH);
write_cell(pos, c, fg, bg);
write_cell(pos, (uint8_t)c, fg, bg);
cursor_adv();
}
}
@@ -74,7 +70,7 @@ void kprint(uint8_t *buf) {
}
void init_prompt() {
const uint8_t *prompt = "\nuser@iceOS-$";
uint8_t *prompt = (uint8_t*)"\nuser@iceOS-$";
kprint_c(prompt, strlen(prompt), GREEN, BLACK);
}

2
kernel/drivers/tty.h
View File

@@ -45,7 +45,7 @@ enum TTY_COLORS {
#define VGA_LOW_BYTE 15
/* Kernel's VGA API */
void write_cell(int16_t i, int8_t c, uint8_t fg, uint8_t bg);
void write_cell(int16_t i, uint8_t c, uint8_t fg, uint8_t bg);
void move_cursor(uint16_t pos);
void cursor_adv();
void backspace();