summaryrefslogtreecommitdiff
path: root/Source/Kernel/DeviceManager
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-08-31 12:35:14 +0200
committerAlexis211 <alexis211@gmail.com>2009-08-31 12:35:14 +0200
commit6bf215215e1ebaa9613b51500031e6963c12d33b (patch)
tree42c2aea12b4976e06146da5ea9a9d83d28a4d176 /Source/Kernel/DeviceManager
parent68a8fb4e3b3e9087904b17ce6d81983950b9dca9 (diff)
downloadMelon-6bf215215e1ebaa9613b51500031e6963c12d33b.tar.gz
Melon-6bf215215e1ebaa9613b51500031e6963c12d33b.zip
Added a few commands to built-in shell, and made a few scrshots.
Diffstat (limited to 'Source/Kernel/DeviceManager')
-rw-r--r--Source/Kernel/DeviceManager/Dev.ns.cpp2
-rw-r--r--Source/Kernel/DeviceManager/Dev.ns.h2
-rw-r--r--Source/Kernel/DeviceManager/Kbd.ns.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Kernel/DeviceManager/Dev.ns.cpp b/Source/Kernel/DeviceManager/Dev.ns.cpp
index 9556c6c..b2f8a70 100644
--- a/Source/Kernel/DeviceManager/Dev.ns.cpp
+++ b/Source/Kernel/DeviceManager/Dev.ns.cpp
@@ -34,7 +34,7 @@ bool requestIRQ(Device* dev, int irq) {
}
}
-Vector<Device*> findDevice(String _class) {
+Vector<Device*> findDevices(String _class) {
if (_class.empty()) return devices;
Vector<Device*> ret;
for (u32int i = 0; i < devices.size(); i++) {
diff --git a/Source/Kernel/DeviceManager/Dev.ns.h b/Source/Kernel/DeviceManager/Dev.ns.h
index c54abca..389fe3e 100644
--- a/Source/Kernel/DeviceManager/Dev.ns.h
+++ b/Source/Kernel/DeviceManager/Dev.ns.h
@@ -12,7 +12,7 @@ namespace Dev {
bool requestIRQ(Device* dev, int irq);
- Vector<Device*> findDevice(String _class = "");
+ Vector<Device*> findDevices(String _class = "");
}
#endif
diff --git a/Source/Kernel/DeviceManager/Kbd.ns.cpp b/Source/Kernel/DeviceManager/Kbd.ns.cpp
index 1743e0c..256037b 100644
--- a/Source/Kernel/DeviceManager/Kbd.ns.cpp
+++ b/Source/Kernel/DeviceManager/Kbd.ns.cpp
@@ -66,7 +66,7 @@ void setKeymap(wchar* kmNormal, wchar* kmShift, wchar* kmAltgr, wchar* kmShiftAl
}
void updateLeds() {
- Vector<Device*> kbds = Dev::findDevice("keyboard");
+ Vector<Device*> kbds = Dev::findDevices("keyboard");
for (u32int i = 0; i < kbds.size(); i++) {
((Keyboard*)(kbds[i]))->updateLeds(kbdstatus);
}