ParrotXray/CureOS
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Fix tty cursor issue

Browse Source
This commit is contained in:
ParrotXray 2025-05-07 22:35:35 +08:00
parent 79227b945d
commit 3a0de5c81d
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hal/io.rs
View File

@ -21,8 +21,7 @@ pub fn io_port_wb(port: u16, value: u8) {
"outb %al, %dx",
in(reg_byte) value,
in(reg) port,
out("al") _,
out("dx") _,
out("al") _, out("dx") _,
options(att_syntax)
);
}
@ -42,8 +41,7 @@ pub fn io_port_wl(port: u16, value: u32) {
"outl %eax, %dx",
in(reg) value,
in(reg) port,
out("eax") _,
out("dx") _,
out("al") _, out("dx") _,
options(att_syntax)
);
}
@ -65,8 +63,7 @@ pub fn io_port_rb(port: u16) -> u8 {
"movb %al, {0}",
out(reg_byte) value,
in(reg) port,
out("al") _,
out("dx") _,
out("al") _, out("dx") _,
options(att_syntax)
);
}
@ -89,8 +86,7 @@ pub fn io_port_rl(port: u16) -> u32 {
"movl %eax, {0}",
out(reg) value,
in(reg) port,
out("eax") _,
out("dx") _,
out("al") _, out("dx") _,
options(att_syntax)
);
}

30
src/kernel/tty/tty.rs
View File

@ -27,8 +27,8 @@ pub const VGA_BUFFER_PADDR: usize = 0xB8000;
const TTY_WIDTH: usize = 80;
const TTY_HEIGHT: usize = 25;
const VGA_CTRL_PORT: u16 = 0x03D4;
const VGA_DATA_PORT: u16 = 0x03D5;
const VGA_CTRL_PORT: u16 = 0x3D4;
const VGA_DATA_PORT: u16 = 0x3D5;
// 全局 TTY 狀態
pub struct TTYState {
@ -51,17 +51,17 @@ impl TTYState {
static mut TTY_STATE: TTYState = TTYState::new();
#[no_mangle]
fn update_cursor() {
unsafe {
let pos = TTY_STATE.y * TTY_WIDTH + TTY_STATE.x;
// #[no_mangle]
// fn update_cursor() {
// unsafe {
// let pos = TTY_STATE.y * TTY_WIDTH + TTY_STATE.x;
io_port_wb(VGA_CTRL_PORT, 0x0F);
io_port_wb(VGA_DATA_PORT, (pos & 0xFF) as u8);
io_port_wb(VGA_CTRL_PORT, 0x0E);
io_port_wb(VGA_DATA_PORT, ((pos >> 8) & 0xFF) as u8);
}
}
// io_port_wb(VGA_CTRL_PORT, 0x0F);
// io_port_wb(VGA_DATA_PORT, (pos & 0xFF) as u8);
// io_port_wb(VGA_CTRL_PORT, 0x0E);
// io_port_wb(VGA_DATA_PORT, ((pos >> 8) & 0xFF) as u8);
// }
// }
/// 初始化 TTY
// vga_buf: *mut u8
@ -129,7 +129,7 @@ pub fn tty_put_char(chr: char) {
tty_scroll_up();
}
update_cursor();
// update_cursor();
}
}
}
@ -184,7 +184,7 @@ pub fn tty_clear() {
TTY_STATE.x = 0;
TTY_STATE.y = 0;
update_cursor();
// update_cursor();
}
}
}
@ -209,7 +209,7 @@ pub fn tty_set_cpos(x: usize, y: usize) {
unsafe {
TTY_STATE.x = x % TTY_WIDTH;
TTY_STATE.y = y % TTY_HEIGHT;
update_cursor();
// update_cursor();
}
}