diff options
| author | Frans Kaashoek <kaashoek@mit.edu> | 2020-08-10 13:05:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 13:05:17 -0400 |
| commit | c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9 (patch) | |
| tree | a6c903e1c61c08f4cb87700c320752a737081dcb /kernel/console.c | |
| parent | 90eb90b5e203299427c3fde8c996a48835fc93cf (diff) | |
| parent | d8fe1773b26758c7c7b8f36724cd822555b33612 (diff) | |
| download | xv6-labs-2022-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.tar.xz xv6-labs-2022-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.zip | |
Merge branch 'riscv' into riscv
Diffstat (limited to 'kernel/console.c')
| -rw-r--r-- | kernel/console.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/console.c b/kernel/console.c index 87a83ff..2b1ed3c 100644 --- a/kernel/console.c +++ b/kernel/console.c @@ -27,6 +27,8 @@ // // send one character to the uart. +// called by printf, and to echo input characters, +// but not from write(). // void consputc(int c) @@ -40,9 +42,9 @@ consputc(int c) if(c == BACKSPACE){ // if the user typed backspace, overwrite with a space. - uartputc('\b'); uartputc(' '); uartputc('\b'); + uartputc_sync('\b'); uartputc_sync(' '); uartputc_sync('\b'); } else { - uartputc(c); + uartputc_sync(c); } } @@ -70,11 +72,11 @@ consolewrite(int user_src, uint64 src, int n) char c; if(either_copyin(&c, user_src, src+i, 1) == -1) break; - consputc(c); + uartputc(c); } release(&cons.lock); - return n; + return i; } // |