summaryrefslogtreecommitdiff
path: root/Source/Kernel/Devices
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-10-02 22:51:28 +0200
committerAlexis211 <alexis211@gmail.com>2009-10-02 22:51:28 +0200
commit92abedffec913fe7337117403c5e07185356c81b (patch)
tree1527937c1a1a7ab8168891f6465e198b88bbfea2 /Source/Kernel/Devices
parent021831ab981b9df22cd1ac5e5ac51f0f84ef49a7 (diff)
downloadMelon-92abedffec913fe7337117403c5e07185356c81b.tar.gz
Melon-92abedffec913fe7337117403c5e07185356c81b.zip
The kernel shell is now in an independent class, KernelShell::
Diffstat (limited to 'Source/Kernel/Devices')
-rw-r--r--Source/Kernel/Devices/Floppy/FloppyController.class.cpp4
-rw-r--r--Source/Kernel/Devices/Floppy/FloppyDrive.class.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Kernel/Devices/Floppy/FloppyController.class.cpp b/Source/Kernel/Devices/Floppy/FloppyController.class.cpp
index 3e97e25..fa7a56a 100644
--- a/Source/Kernel/Devices/Floppy/FloppyController.class.cpp
+++ b/Source/Kernel/Devices/Floppy/FloppyController.class.cpp
@@ -73,7 +73,7 @@ void FloppyController::dmaRelease() {
//*********************************************************
// FOR THE CONTROLLER
//*********************************************************
-u32int floppyMotorTimer() { //This will be an independant thread
+u32int floppyMotorTimer(void* plop) { //This will be an independant thread
while(1) {
Task::currentThread->sleep(1000); //Check only every second
Vector<Device*> floppys = Dev::findDevices("block.floppy");
@@ -118,7 +118,7 @@ void FloppyController::detect() { //TODO : do this better
Part::registerDevice((BlockDevice*)fdds[i]);
}
- new Thread(floppyMotorTimer, true);
+ new Thread(floppyMotorTimer, 0, true);
}
String FloppyController::getClass() {
diff --git a/Source/Kernel/Devices/Floppy/FloppyDrive.class.h b/Source/Kernel/Devices/Floppy/FloppyDrive.class.h
index 3ff832b..75926ea 100644
--- a/Source/Kernel/Devices/Floppy/FloppyDrive.class.h
+++ b/Source/Kernel/Devices/Floppy/FloppyDrive.class.h
@@ -7,7 +7,7 @@
class FloppyDrive : public BlockDevice {
friend class FloppyController;
- friend u32int floppyMotorTimer();
+ friend u32int floppyMotorTimer(void*);
private:
FloppyDrive(FloppyController *fdc, u8int number, u8int type); //Private constructor, called by FloppyController()