summaryrefslogtreecommitdiff
path: root/src/kernel
diff options
context:
space:
mode:
authorAlex AUVOLAT <alexis211@gmail.com>2012-05-20 20:20:39 +0200
committerAlex AUVOLAT <alexis211@gmail.com>2012-05-20 20:20:39 +0200
commit2e28873f23d2cf073fdddfecdc278b0f44b2789b (patch)
tree58e5ac230bdbe82def76751f4e7a2bb34ce01475 /src/kernel
parent7fde5e61bc7047433bfc1f47229b72d0ccd302e7 (diff)
downloadTCE-2e28873f23d2cf073fdddfecdc278b0f44b2789b.tar.gz
TCE-2e28873f23d2cf073fdddfecdc278b0f44b2789b.zip
Corrected some bugs in readline && multitasking improvement.
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/core/kmain.cpp2
-rw-r--r--src/kernel/ui/vt.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/core/kmain.cpp b/src/kernel/core/kmain.cpp
index 05d7966..23b62e3 100644
--- a/src/kernel/core/kmain.cpp
+++ b/src/kernel/core/kmain.cpp
@@ -48,7 +48,7 @@ extern "C" void kmain(multiboot_info_t* mbd, int32_t magic) {
_no_more_ksbrk = true;
// Init higher level stuff
- timer_init(30);
+ timer_init(100);
tasking_init();
vfs_setup();
diff --git a/src/kernel/ui/vt.cpp b/src/kernel/ui/vt.cpp
index 9b0bdf0..3bed897 100644
--- a/src/kernel/ui/vt.cpp
+++ b/src/kernel/ui/vt.cpp
@@ -384,8 +384,8 @@ int vt::read(size_t offset, size_t len, char* buffer) {
if (c == len) break;
}
} else {
- for (; r < kbd_buffer_filled && c < len; r++) {
- buffer[c++] = kbd_buffer[r];
+ while (r < kbd_buffer_filled && c < len) {
+ buffer[c++] = kbd_buffer[r++];
}
end = true;
}