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

Cache blocks from ATA

Browse Source
This commit is contained in:
Baptiste Wicht 2016-08-08 20:36:45 +02:00
parent d77e2d1a6f
commit d0a6143feb
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/src/ata.cpp
View File

@ -17,6 +17,7 @@
#include "errors.hpp" #include "errors.hpp"
#include "disks.hpp" #include "disks.hpp"
#include "mutex.hpp" #include "mutex.hpp"
#include "block_cache.hpp"
namespace { namespace {
@ -29,6 +30,8 @@ mutex<> ata_lock;
mutex<> primary_lock; mutex<> primary_lock;
mutex<> secondary_lock; mutex<> secondary_lock;
block_cache cache;
volatile bool primary_invoked = false; volatile bool primary_invoked = false;
volatile bool secondary_invoked = false; volatile bool secondary_invoked = false;
@ -331,6 +334,9 @@ void ata::detect_disks(){
primary_lock.set_name("ata_primary_lock"); primary_lock.set_name("ata_primary_lock");
secondary_lock.set_name("ata_secondary_lock"); secondary_lock.set_name("ata_secondary_lock");
// Init the cache with 256 blocks
cache.init(BLOCK_SIZE, 256);
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, "", "", ""};
@ -457,10 +463,18 @@ size_t ata::read_sectors(drive_descriptor& drive, uint64_t start, uint8_t count,
auto buffer = reinterpret_cast<uint8_t*>(destination); auto buffer = reinterpret_cast<uint8_t*>(destination);
for(size_t i = 0; i < count; ++i){ for(size_t i = 0; i < count; ++i){
if(!read_write_sector(drive, start + i, buffer, true)){ bool valid;
return std::ERROR_FAILED; auto block = cache.block((drive.controller << 8) + drive.drive, start + i, valid);
if(!valid){
if(!read_write_sector(drive, start + i, block, true)){
return std::ERROR_FAILED;
}
} }
// Copy the block to the output buffer
std::copy_n(buffer, block, BLOCK_SIZE);
buffer += BLOCK_SIZE; buffer += BLOCK_SIZE;
read += BLOCK_SIZE; read += BLOCK_SIZE;
} }