jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

starting to convert vga buffer to a terminal

Browse source
This commit is contained in:
Jack Halford 2018-02-15 11:09:27 +01:00
parent 13005548ee
commit f6384015d6
1 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
kernel-rs/src/vga/buffer.rs
View file

@ -41,48 +41,70 @@ const BUFFER_ROWS: usize = 25;
const BUFFER_COLS: usize = 80 * 2; const BUFFER_COLS: usize = 80 * 2;
pub struct Writer { pub struct Writer {
pub position: usize, pub buffer_pos: usize,
pub color_code: ColorCode, pub color_code: ColorCode,
buffer: [u8; BUFFER_ROWS * BUFFER_COLS], buffer: [u8; BUFFER_ROWS * BUFFER_COLS],
command: [u8; 10],
command_len: usize,
} }
impl Writer { impl Writer {
pub const fn new() -> Writer { pub const fn new() -> Writer {
Writer { Writer {
position: 0, buffer_pos: 0,
color_code: ColorCode::new(Color::White, Color::Black), color_code: ColorCode::new(Color::White, Color::Black),
buffer: [0; BUFFER_ROWS * BUFFER_COLS], buffer: [0; BUFFER_ROWS * BUFFER_COLS],
command: [0; 10],
command_len: 0,
} }
} }
pub fn keypress(&mut self, ascii: u8) { pub fn keypress(&mut self, ascii: u8) {
self.write_byte(ascii); match ascii {
b'\n' => {
self.command_len = 0;
self.write_byte(b'\n');
println!("{:?}", self.command.iter());
self.write_byte(b'>');
}
byte => {
if self.command_len >= 10 { return };
self.write_byte(byte);
self.command_len += 1;
}
}
self.flush(); self.flush();
} }
pub fn write_byte(&mut self, byte: u8) { pub fn write_byte(&mut self, byte: u8) {
let i = self.position; let i = self.buffer_pos;
match byte { match byte {
b'\n' => { b'\n' => {
let current_line = self.position / (BUFFER_COLS); let current_line = self.buffer_pos / (BUFFER_COLS);
self.position = (current_line + 1) * BUFFER_COLS; self.buffer_pos = (current_line + 1) * BUFFER_COLS;
} }
byte => { byte => {
self.buffer[i] = byte; self.buffer[i] = byte;
self.buffer[i + 1] = self.color_code.0; self.buffer[i + 1] = self.color_code.0;
self.position += 2; self.buffer_pos += 2;
} }
} }
if self.position >= self.buffer.len() { if self.buffer_pos >= self.buffer.len() {
self.scroll(); self.scroll();
} }
}
let cursor_position = self.position / 2; fn flush_cursor(&self)
{
let cursor_position = self.buffer_pos / 2;
// 14 awaits the rightmost 8bits
cpuio::outb(14, 0x3D4); cpuio::outb(14, 0x3D4);
cpuio::outb((cursor_position >> 8) as u8, 0x3D5); cpuio::outb((cursor_position >> 8) as u8, 0x3D5);
// 15 awaits the leftmost 8bits
cpuio::outb(15, 0x3D4); cpuio::outb(15, 0x3D4);
cpuio::outb((cursor_position >> 0) as u8 & 0x00ff, 0x3D5); cpuio::outb((cursor_position >> 0) as u8 & 0x00ff, 0x3D5);
} }
@ -90,6 +112,7 @@ impl Writer {
pub fn flush(&mut self) { pub fn flush(&mut self) {
let slice = unsafe { core::slice::from_raw_parts_mut(0xb8000 as *mut u8, 4000) }; let slice = unsafe { core::slice::from_raw_parts_mut(0xb8000 as *mut u8, 4000) };
slice.as_mut().clone_from_slice(&self.buffer); slice.as_mut().clone_from_slice(&self.buffer);
self.flush_cursor();
} }
fn scroll(&mut self) { fn scroll(&mut self) {
@ -106,7 +129,7 @@ impl Writer {
self.buffer[((BUFFER_ROWS - 1) * BUFFER_COLS) + (col * 2)] = b' '; self.buffer[((BUFFER_ROWS - 1) * BUFFER_COLS) + (col * 2)] = b' ';
} }
self.position = (BUFFER_ROWS - 1) * BUFFER_COLS; self.buffer_pos = (BUFFER_ROWS - 1) * BUFFER_COLS;
} }
} }