andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-23 00:16:17 +04:00
Code Issues Projects Releases Wiki Activity

fix getchar on K210

Browse Source
This commit is contained in:
WangRunji 2018-12-26 23:53:14 +08:00
parent 4b17055f30
commit 0d957ff1a6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/src/arch/riscv32/io.rs
View File

@ -33,9 +33,11 @@ fn putchar(c: u8) {
pub fn getchar() -> char { pub fn getchar() -> char {
let c = if cfg!(feature = "board_k210") { let c = if cfg!(feature = "board_k210") {
unsafe { loop {
while RXDATA.read_volatile() & (1 << 31) == 0 {} let rxdata = unsafe { RXDATA.read_volatile() };
(RXDATA as *const u8).read_volatile() if rxdata & (1 << 31) == 0 {
break rxdata as u8;
}
} }
} else if cfg!(feature = "m_mode") { } else if cfg!(feature = "m_mode") {
(super::BBL.mcall_console_getchar)() as u8 (super::BBL.mcall_console_getchar)() as u8

2
kernel/src/shell.rs
View File

@ -40,7 +40,7 @@ fn get_line() -> String {
loop { loop {
let c = get_char(); let c = get_char();
match c { match c {
'\u{7f}' /* '\b' */ => { '\u{8}' | '\u{7f}' /* '\b' */ => {
if s.pop().is_some() { if s.pop().is_some() {
print!("\u{7f}"); print!("\u{7f}");
} }