raeofsunshine
/
KimisOS
mirror of https://github.com/raeofsunshinedev/KimisOS.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made lock acquiring a function

This commit is contained in:
notsomeidiot123 2026-03-02 00:20:46 -05:00
parent 6378f262fa
commit 0e96dfd969
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/kmodules/disk_driver.c
View File

@ -140,8 +140,7 @@ uint32_t volatile transferring_disk_index = -1;
uint32_t expected_ints = 0; uint32_t expected_ints = 0;
uint32_t recieved_ints = 0; uint32_t recieved_ints = 0;
uint32_t volatile transferring_pid = 0; uint32_t volatile transferring_pid = 0;
uint8_t volatile locked = 0; uint8_t volatile primary_ata_locked = 0;
typedef struct drive_desc{ typedef struct drive_desc{
uint32_t BARs[8]; uint32_t BARs[8];
@ -159,6 +158,19 @@ typedef struct drive_desc{
drive_t drives[32] = {0}; drive_t drives[32] = {0};
//TODO: Make atomic for paralellism
void ata_acquire_primary_lock(){
asm("cli");
while(primary_ata_locked){
asm("sti");
// puts(api, "KIDM", "Locked\n");
asm("int $32");
asm("cli");
}
primary_ata_locked = 1;
asm("sti");
}
//return 1 if ready, 0 if not //return 1 if ready, 0 if not
int ata_ready(uint32_t BAR, uint32_t BAR2, uint8_t drive){ int ata_ready(uint32_t BAR, uint32_t BAR2, uint8_t drive){
static uint16_t last_disk = 0; static uint16_t last_disk = 0;
@ -197,15 +209,7 @@ int ata_write(vfile_t *file, void *ptr, uint32_t offset, uint32_t count){
if (count == 0) return -1; if (count == 0) return -1;
// while(transferring_disk_index != -1); // while(transferring_disk_index != -1);
// if(!is_interrupt(api)){ // if(!is_interrupt(api)){
asm("cli"); ata_acquire_primary_lock();
while(locked){
asm("sti");
// puts(api, "KIDM", "Locked\n");
asm("int $32");
asm("cli");
}
locked = 1;
asm("sti");
// } // }
drive_t drive = drives[file->mount_id]; drive_t drive = drives[file->mount_id];
uint16_t io_base = drive.BARs[0] &0xfffe; uint16_t io_base = drive.BARs[0] &0xfffe;
@ -305,17 +309,7 @@ int ata_read(vfile_t *file, uint8_t *ptr, uint32_t offset, uint32_t count) {
uint16_t ctrl_base = drive.BARs[1] &0xfffe; uint16_t ctrl_base = drive.BARs[1] &0xfffe;
uint16_t bm_base = drive.BARs[4] & ~3; uint16_t bm_base = drive.BARs[4] & ~3;
// if(!is_interrupt(api)){ ata_acquire_primary_lock();
asm("cli");
while(locked){
asm("sti");
// puts(api, "KIDM", "Locked\n");
asm("int $32");
asm("cli");
}
locked = 1;
asm("sti");
// }
PRD_T *prdt = drive.PRDT; PRD_T *prdt = drive.PRDT;
api(MODULE_API_PRINT, MODULE_NAME, "%x, %x, %x, %x\n", io_base, ctrl_base, bm_base, api(MODULE_API_PADDR, prdt)); api(MODULE_API_PRINT, MODULE_NAME, "%x, %x, %x, %x\n", io_base, ctrl_base, bm_base, api(MODULE_API_PADDR, prdt));
@ -432,7 +426,7 @@ cpu_registers_t *int_handler(cpu_registers_t * regs){
transferring_disk_index = -1; transferring_disk_index = -1;
api(MODULE_API_UNBLOCK_PID, transferring_pid); api(MODULE_API_UNBLOCK_PID, transferring_pid);
transferring_pid = 0; transferring_pid = 0;
locked = 0; primary_ata_locked = 0;
return regs; return regs;
} }