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

Change the way wait is done (still experimental)

Browse Source
This commit is contained in:
Baptiste Wicht 2014-03-27 22:43:01 +01:00
parent b496f0e87b
commit bcf48a5419
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/src/ata.cpp
View File

@ -63,9 +63,6 @@ mutex controller_lock;
semaphore primary_sem; semaphore primary_sem;
semaphore secondary_sem; semaphore secondary_sem;
//TODO In the future, the wait for IRQs, could
//be done with a semaphore
void primary_controller_handler(interrupt::syscall_regs*){ void primary_controller_handler(interrupt::syscall_regs*){
primary_sem.signal(); primary_sem.signal();
} }
@ -82,11 +79,24 @@ void ata_wait_irq_secondary(){
secondary_sem.wait(); secondary_sem.wait();
} }
//TODO Perhaps not correct
//TODO Should choose the controller more safely
static void ata_delay(){
in_byte(0x1F0 + ATA_STATUS);
in_byte(0x1F0 + ATA_STATUS);
in_byte(0x1F0 + ATA_STATUS);
in_byte(0x1F0 + ATA_STATUS);
in_byte(0x1F0 + ATA_STATUS);
in_byte(0x1F0 + ATA_STATUS);
in_byte(0x1F0 + ATA_STATUS);
in_byte(0x1F0 + ATA_STATUS);
}
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){
uint8_t status; uint8_t status;
do { do {
status = in_byte(controller + ATA_STATUS); status = in_byte(controller + ATA_STATUS);
timer::sleep_ms(1); ata_delay();
} while ((status & mask) != value && --timeout); } while ((status & mask) != value && --timeout);
return timeout; return timeout;
@ -105,7 +115,7 @@ bool select_device(ata::drive_descriptor& drive){
out_byte(controller + ATA_DRV_HEAD, 0xA0 | (drive.slave << 4)); out_byte(controller + ATA_DRV_HEAD, 0xA0 | (drive.slave << 4));
//Sleep at least 400ns before reading the status register //Sleep at least 400ns before reading the status register
timer::sleep_ms(1); ata_delay();
if(!wait_for_controller(controller, wait_mask, 0, 10000)){ if(!wait_for_controller(controller, wait_mask, 0, 10000)){
return false; return false;
@ -115,6 +125,8 @@ bool select_device(ata::drive_descriptor& drive){
} }
bool read_write_sector(ata::drive_descriptor& drive, uint64_t start, void* data, bool read){ bool read_write_sector(ata::drive_descriptor& drive, uint64_t start, void* data, bool read){
std::lock_guard<mutex> l(controller_lock);
//Select the device //Select the device
if(!select_device(drive)){ if(!select_device(drive)){
return false; return false;
@ -138,7 +150,7 @@ bool read_write_sector(ata::drive_descriptor& drive, uint64_t start, void* data,
out_byte(controller + ATA_COMMAND, command); out_byte(controller + ATA_COMMAND, command);
//Wait at least 400ns before reading status register //Wait at least 400ns before reading status register
timer::sleep_ms(1); ata_delay();
//Wait at most 30 seconds for BSY flag to be cleared //Wait at most 30 seconds for BSY flag to be cleared
if(!wait_for_controller(controller, ATA_STATUS_BSY, 0, 30000)){ if(!wait_for_controller(controller, ATA_STATUS_BSY, 0, 30000)){