aboutsummaryrefslogtreecommitdiff
path: root/libpsn00b/psxcd/cdgetsector.s
diff options
context:
space:
mode:
authorJohn Wilbert M. Villamor <lameguy64@gmail.com>2020-09-19 20:43:05 +0800
committerJohn Wilbert M. Villamor <lameguy64@gmail.com>2020-09-19 20:43:05 +0800
commit9f4891f95070c66ea9f1aba99d72724d4ab24e5a (patch)
tree723e3ef2118a3d1a9e6dafa811ed1b8b1bc9196e /libpsn00b/psxcd/cdgetsector.s
parent6762c39551ded059450d17d8bb0cb80642c8aaab (diff)
downloadpsn00bsdk-9f4891f95070c66ea9f1aba99d72724d4ab24e5a.tar.gz
Revised makefiles, added strtok(), command line arguments, SetHeapSize(), moved ISR and callback system to psxetc, moved debug font to psxgpu, fixed CD-ROM library crashing on PSIO, fixed interrupt callback setup to fix crashing on ResetGraph()
Diffstat (limited to 'libpsn00b/psxcd/cdgetsector.s')
-rw-r--r--libpsn00b/psxcd/cdgetsector.s16
1 files changed, 9 insertions, 7 deletions
diff --git a/libpsn00b/psxcd/cdgetsector.s b/libpsn00b/psxcd/cdgetsector.s
index 70039bf..9af3543 100644
--- a/libpsn00b/psxcd/cdgetsector.s
+++ b/libpsn00b/psxcd/cdgetsector.s
@@ -10,12 +10,12 @@ CdGetSector:
lui $a2, IOBASE
-.Lwait_fifo:
- lbu $v0, CD_REG0($a2)
- nop
- andi $v0, 0x40
- beqz $v0, .Lwait_fifo
- nop
+#.Lwait_fifo: # Probably redundant as the BIOS CD-ROM
+# lbu $v0, CD_REG0($a2) # routines do not not wait for this
+# nop
+# andi $v0, 0x40
+# beqz $v0, .Lwait_fifo
+# nop
lui $v0, 0x1
srl $a1, 2
@@ -27,11 +27,13 @@ CdGetSector:
sw $v0, D3_CHCR($a2)
nop
nop
-.Ldma_wait:
+
+.Ldma_wait: # Ensure DMA transfer has completed
lw $v0, D3_CHCR($a2)
nop
srl $v0, 24
andi $v0, 0x1
+
bnez $v0, .Ldma_wait
nop