summaryrefslogtreecommitdiff
path: root/Source/Kernel/VTManager
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-10-17 23:22:41 +0200
committerAlexis211 <alexis211@gmail.com>2009-10-17 23:22:41 +0200
commit7dc8c19f7d6220c9e3dac43796faf77c4f11974f (patch)
tree7a63b88ed80583198776ce706f85d528eff28b16 /Source/Kernel/VTManager
parente35e95188674ae4802df2a511825218253d01d2c (diff)
downloadMelon-7dc8c19f7d6220c9e3dac43796faf77c4f11974f.tar.gz
Melon-7dc8c19f7d6220c9e3dac43796faf77c4f11974f.zip
Melon now loads a simple ASM application out of the ramfs
The format is very simple, but an ELF loader is planned.
Diffstat (limited to 'Source/Kernel/VTManager')
-rw-r--r--Source/Kernel/VTManager/SimpleVT.class.cpp2
-rw-r--r--Source/Kernel/VTManager/VirtualTerminal-kbd.proto.cpp3
-rw-r--r--Source/Kernel/VTManager/VirtualTerminal.proto.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/Source/Kernel/VTManager/SimpleVT.class.cpp b/Source/Kernel/VTManager/SimpleVT.class.cpp
index 89391b2..d304a5f 100644
--- a/Source/Kernel/VTManager/SimpleVT.class.cpp
+++ b/Source/Kernel/VTManager/SimpleVT.class.cpp
@@ -132,5 +132,5 @@ void SimpleVT::put(WChar c, bool updatecsr) {
void SimpleVT::hexDump(u8int *ptr, u32int sz, bool addnl) {
if (m_cols < 76) return; //Not enough space
- VirtualTerminal::hexDump(ptr, sz, (m_cols == 76));
+ VirtualTerminal::hexDump(ptr, sz, (m_cols > 76));
}
diff --git a/Source/Kernel/VTManager/VirtualTerminal-kbd.proto.cpp b/Source/Kernel/VTManager/VirtualTerminal-kbd.proto.cpp
index 59f66a6..b5ed9c3 100644
--- a/Source/Kernel/VTManager/VirtualTerminal-kbd.proto.cpp
+++ b/Source/Kernel/VTManager/VirtualTerminal-kbd.proto.cpp
@@ -28,8 +28,9 @@ keypress_t VirtualTerminal::getKeypress(bool show, bool block) {
return keypress_t();
}
- while (m_kbdbuff.empty())
+ while (m_kbdbuff.empty()) {
Task::currThread()->sleep(10);
+ }
m_kbdbuffMutex.waitLock();
keypress_t ret = m_kbdbuff[0];
diff --git a/Source/Kernel/VTManager/VirtualTerminal.proto.cpp b/Source/Kernel/VTManager/VirtualTerminal.proto.cpp
index 7a9ffa8..0612f1d 100644
--- a/Source/Kernel/VTManager/VirtualTerminal.proto.cpp
+++ b/Source/Kernel/VTManager/VirtualTerminal.proto.cpp
@@ -2,7 +2,7 @@
#include <DeviceManager/Disp.ns.h>
#include <VTManager/VT.ns.h>
-VirtualTerminal::VirtualTerminal() : m_kbdMutex(false), m_kbdbuffMutex(false) {
+VirtualTerminal::VirtualTerminal() : m_kbdMutex(false), m_kbdbuffMutex(false), m_kbdbuff() {
}
VirtualTerminal::~VirtualTerminal() {