diff options
| author | John Wilbert M. Villamor <lameguy64@gmail.com> | 2019-06-23 07:42:16 +0800 |
|---|---|---|
| committer | John Wilbert M. Villamor <lameguy64@gmail.com> | 2019-06-23 07:42:16 +0800 |
| commit | 7be9178c0f9b0e698a305ecc5c0c41fcc596a4fc (patch) | |
| tree | e98c627e1da5c764563774b89b0c06d7ac5ad0a4 /libpsn00b/psxspu | |
| parent | ae9e545c3ed33d39ce21ae13ceb8337fa34901b8 (diff) | |
| download | psn00bsdk-7be9178c0f9b0e698a305ecc5c0c41fcc596a4fc.tar.gz | |
LibPSn00b officially v0.10b, added psxsio library, better DrawSync() and VSync(), better reference manual.
Diffstat (limited to 'libpsn00b/psxspu')
| -rw-r--r-- | libpsn00b/psxspu/readme.txt | 5 | ||||
| -rw-r--r-- | libpsn00b/psxspu/spuinit.s | 8 | ||||
| -rw-r--r-- | libpsn00b/psxspu/spusetkey.s | 4 | ||||
| -rw-r--r-- | libpsn00b/psxspu/transfer.s | 10 |
4 files changed, 11 insertions, 16 deletions
diff --git a/libpsn00b/psxspu/readme.txt b/libpsn00b/psxspu/readme.txt index 4cac976..3ed90d0 100644 --- a/libpsn00b/psxspu/readme.txt +++ b/libpsn00b/psxspu/readme.txt @@ -29,8 +29,3 @@ Todo list: * SpuKeyOn() is actually not part of the official library. * SPU reverb configuration functions yet to be implemented. - - -Changelog: - - None so far... diff --git a/libpsn00b/psxspu/spuinit.s b/libpsn00b/psxspu/spuinit.s index fa5ec32..51a54ea 100644 --- a/libpsn00b/psxspu/spuinit.s +++ b/libpsn00b/psxspu/spuinit.s @@ -58,11 +58,11 @@ SpuInit: li $a2, 23 -.clear_voices: +.Lclear_voices: jal SpuSetVoiceRaw move $a0, $a2 addiu $a2, -1 - bgez $a2, .clear_voices + bgez $a2, .Lclear_voices nop li $v0, 0xffff # Set all keys to off @@ -104,11 +104,11 @@ SpuInit: SpuCtrlSync: lui $v1, IOBASE andi $a0, 0x3f -.ctrl_wait: +.Lctrl_wait: lhu $v0, SPUSTAT($v1) # Get SPUSTAT value nop andi $v0, 0x3f - bne $v0, $a0, .ctrl_wait # Wait until SPUCNT and SPUSTAT are equal + bne $v0, $a0, .Lctrl_wait # Wait until SPUCNT and SPUSTAT are equal nop jr $ra nop diff --git a/libpsn00b/psxspu/spusetkey.s b/libpsn00b/psxspu/spusetkey.s index 1270b2a..25a6107 100644 --- a/libpsn00b/psxspu/spusetkey.s +++ b/libpsn00b/psxspu/spusetkey.s @@ -13,13 +13,13 @@ SpuSetKey: lui $a2, IOBASE - beqz $a0, .key_off + beqz $a0, .Lkey_off nop jr $ra sh $a1, SPU_KEY_ON($v1) -.key_off: +.Lkey_off: jr $ra sh $a1, SPU_KEY_OFF($v1) diff --git a/libpsn00b/psxspu/transfer.s b/libpsn00b/psxspu/transfer.s index aed69dc..086bb3b 100644 --- a/libpsn00b/psxspu/transfer.s +++ b/libpsn00b/psxspu/transfer.s @@ -18,10 +18,10 @@ SpuSetTransferMode: .type SpuSetTransferStartAddr, @function SpuSetTransferStartAddr: li $v0, 0x1000 # Check if value is valid - blt $a0, $v0, .bad_value + blt $a0, $v0, .Lbad_value nop li $v0, 0xffff - bgt $a0, $v0, .bad_value + bgt $a0, $v0, .Lbad_value nop la $v1, _spu_transfer_addr @@ -31,7 +31,7 @@ SpuSetTransferStartAddr: jr $ra move $v0, $a0 -.bad_value: +.Lbad_value: jr $ra move $v0, $0 @@ -67,11 +67,11 @@ SpuWrite: lw $a0, 4($sp) -.dma_wait: # Wait for SPU to be ready for DMA +.Ldma_wait: # Wait for SPU to be ready for DMA lhu $v0, SPUSTAT($a3) nop andi $v0, 0x400 # Bit 8 in SPUSTAT never changes to 1 on - bnez $v0, .dma_wait # emulators so use bit 10 instead + bnez $v0, .Ldma_wait # emulators so use bit 10 instead nop sw $a0, D4_MADR($a3) # Set DMA source address |