fix: ata disk enumeration

d0p1s4m4 · Jul 22, 2024 · 29e5ba8 · 29e5ba8
1 parent 008c780
commit 29e5ba8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/kernel/Makefile b/kernel/Makefile
@@ -43,7 +43,7 @@ SRCS	= kernel.asm \
 .PHONY: all
 all: $(KERNEL)
 
-PHONY: const.inc
+.PHONY: const.inc
 const.inc: const.inc.in
 	sh $(TOOLSDIR)/version.sh $< $@
 

diff --git a/kernel/bio.inc b/kernel/bio.inc
@@ -19,15 +19,24 @@ bio_init:
 	rep stosb
 	ret
 
-bio_get:
+	;; Function: bio_read
+	;;
+bio_bread:
 	mov eax, uBIOLock
 	call lock_acquire
 
 	mov eax, uBIOLock
 	call lock_release
 	ret
 
+	;; Function: bio_brelse
+	;; Unbusy a buffer and release it to the free lists.
 bio_brelse:
+	mov eax, uBIOLock
+	call lock_acquire
+
+	mov eax, uBIOLock
+	call lock_release
 	ret
 
 uBIOLock dd 0
diff --git a/kernel/dev/at/ata.inc b/kernel/dev/at/ata.inc
@@ -156,17 +156,17 @@ ata_probe:
 	jnz .skip
 
 	push ecx
-	cmp ecx, ATA_CHAN1_IO
+	cmp bx, ATA_CHAN1_IO
 	jne @f
 	add ecx, 2
 	jmp .drive_found
 @@:
-	cmp ecx, ATA_CHAN2_IO
+	cmp bx, ATA_CHAN2_IO
 	jne @f
 	add ecx, 4
 	jmp .drive_found
 @@:
-	cmp ecx, ATA_CHAN3_IO
+	cmp bx, ATA_CHAN3_IO
 	jne @f
 	add ecx, 8
 	jmp .drive_found