d0p1/StupidOS
d0p1/StupidOS
2
3
Fork 0
Code Issues 26 Pull requests Packages Projects 3 Releases Wiki Activity

fix: ata disk enumeration

Browse source
This commit is contained in:
d0p1 🏳️‍⚧️ 2024-07-22 17:32:12 +02:00
parent 008c7800f4
commit 29e5ba8116
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/Makefile
View file

@ -43,7 +43,7 @@ SRCS = kernel.asm \
.PHONY: all .PHONY: all
all: $(KERNEL) all: $(KERNEL)
PHONY: const.inc .PHONY: const.inc
const.inc: const.inc.in const.inc: const.inc.in
sh $(TOOLSDIR)/version.sh $< $@ sh $(TOOLSDIR)/version.sh $< $@

11
kernel/bio.inc
View file

@ -19,7 +19,9 @@ bio_init:
rep stosb rep stosb
ret ret
bio_get: ;; Function: bio_read
;;
bio_bread:
mov eax, uBIOLock mov eax, uBIOLock
call lock_acquire call lock_acquire
@ -27,7 +29,14 @@ bio_get:
call lock_release call lock_release
ret ret
;; Function: bio_brelse
;; Unbusy a buffer and release it to the free lists.
bio_brelse: bio_brelse:
mov eax, uBIOLock
call lock_acquire
mov eax, uBIOLock
call lock_release
ret ret
uBIOLock dd 0 uBIOLock dd 0

6
kernel/dev/at/ata.inc
View file

@ -156,17 +156,17 @@ ata_probe:
jnz .skip jnz .skip
push ecx push ecx
cmp ecx, ATA_CHAN1_IO cmp bx, ATA_CHAN1_IO
jne @f jne @f
add ecx, 2 add ecx, 2
jmp .drive_found jmp .drive_found
@@: @@:
cmp ecx, ATA_CHAN2_IO cmp bx, ATA_CHAN2_IO
jne @f jne @f
add ecx, 4 add ecx, 4
jmp .drive_found jmp .drive_found
@@: @@:
cmp ecx, ATA_CHAN3_IO cmp bx, ATA_CHAN3_IO
jne @f jne @f
add ecx, 8 add ecx, 8
jmp .drive_found jmp .drive_found