TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-18 17:15:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use mutex and semaphore for ata driver

Browse Source
This commit is contained in:
Baptiste Wicht 2014-03-15 18:59:55 +01:00
parent 674484f284
commit c469f28c58
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
kernel/src/ata.cpp
View File

@ -14,6 +14,8 @@
#include "console.hpp" #include "console.hpp"
#include "errors.hpp" #include "errors.hpp"
#include "disks.hpp" #include "disks.hpp"
#include "mutex.hpp"
#include "semaphore.hpp"
namespace { namespace {
@ -56,42 +58,28 @@ static constexpr const size_t BLOCK_SIZE = 512;
ata::drive_descriptor* drives; ata::drive_descriptor* drives;
volatile bool primary_invoked = false; mutex controller_lock;
volatile bool secondary_invoked = false;
semaphore primary_sem;
semaphore secondary_sem;
//TODO In the future, the wait for IRQs, could //TODO In the future, the wait for IRQs, could
//be done with a semaphore //be done with a semaphore
void primary_controller_handler(interrupt::syscall_regs*){ void primary_controller_handler(interrupt::syscall_regs*){
primary_invoked = true; primary_sem.signal();
} }
void secondary_controller_handler(interrupt::syscall_regs*){ void secondary_controller_handler(interrupt::syscall_regs*){
secondary_invoked = true; secondary_sem.signal();
} }
void ata_wait_irq_primary(){ void ata_wait_irq_primary(){
while(!primary_invoked){ primary_sem.wait();
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
}
primary_invoked = false;
} }
void ata_wait_irq_secondary(){ void ata_wait_irq_secondary(){
while(!secondary_invoked){ secondary_sem.wait();
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
}
secondary_invoked = false;
} }
static uint8_t wait_for_controller(uint16_t controller, uint8_t mask, uint8_t value, uint16_t timeout){ static uint8_t wait_for_controller(uint16_t controller, uint8_t mask, uint8_t value, uint16_t timeout){
@ -324,6 +312,11 @@ void identify(ata::drive_descriptor& drive){
} //end of anonymous namespace } //end of anonymous namespace
void ata::detect_disks(){ void ata::detect_disks(){
controller_lock.init();
primary_sem.init(0);
secondary_sem.init(0);
drives = new drive_descriptor[4]; drives = new drive_descriptor[4];
drives[0] = {ATA_PRIMARY, 0xE0, false, MASTER_BIT, false, "", "", ""}; drives[0] = {ATA_PRIMARY, 0xE0, false, MASTER_BIT, false, "", "", ""};