Rename hwregs_a definitions, add hwregs_c, fix io/pads

7 files changed, 24 insertions, 24 deletions

diff --git a/libpsn00b/psxgpu/clearotagr.s b/libpsn00b/psxgpu/clearotagr.s
index 3e888f1..832e54c 100644
--- a/libpsn00b/psxgpu/clearotagr.s
+++ b/libpsn00b/psxgpu/clearotagr.s
@@ -12,10 +12,10 @@ ClearOTagR:
 	addi	$v0, $a1, -1
 	sll		$v0, 2
 	addu	$a0, $v0
-	sw		$a0, D6_MADR($a2)
+	sw		$a0, DMA6_MADR($a2)
 	andi	$a1, 0xffff
-	sw		$a1, D6_BCR($a2)
+	sw		$a1, DMA6_BCR($a2)
 	lui		$v0, 0x1100
 	addiu	$v0, 2
 	jr		$ra
-	sw		$v0, D6_CHCR($a2)
+	sw		$v0, DMA6_CHCR($a2)
diff --git a/libpsn00b/psxgpu/drawotag.s b/libpsn00b/psxgpu/drawotag.s
index ba771fc..595fcd5 100644
--- a/libpsn00b/psxgpu/drawotag.s
+++ b/libpsn00b/psxgpu/drawotag.s
@@ -25,12 +25,12 @@ DrawOTag:
 	beqz	$v0, .Lgpu_wait
 	nop
 
-	sw		$a0, D2_MADR($a3)	# Set DMA base address to specified OT
-	sw		$0 , D2_BCR($a3)
+	sw		$a0, DMA2_MADR($a3)	# Set DMA base address to specified OT
+	sw		$0 , DMA2_BCR($a3)
 
 	lui		$v0, 0x0100			# Begin OT transfer!
 	ori		$v0, 0x0401
-	sw		$v0, D2_CHCR($a3)
+	sw		$v0, DMA2_CHCR($a3)
 
 	lw		$ra, 0($sp)
 	addiu	$sp, 4
diff --git a/libpsn00b/psxgpu/drawsync.s b/libpsn00b/psxgpu/drawsync.s
index 2e29381..b671b03 100644
--- a/libpsn00b/psxgpu/drawsync.s
+++ b/libpsn00b/psxgpu/drawsync.s
@@ -24,7 +24,7 @@ DrawSync:
 	nop
 	
 .Ldma_wait:
-	lw		$v0, D2_CHCR($a0)
+	lw		$v0, DMA2_CHCR($a0)
 	nop
 	srl		$v0, 24
 	andi	$v0, 0x1
@@ -59,7 +59,7 @@ DrawSync:
 	
 .Lgetwords:
 
-	lw		$v0, D2_BCR($a0)
+	lw		$v0, DMA2_BCR($a0)
 	nop
 
 	jr		$ra
diff --git a/libpsn00b/psxgpu/drawsynccallback.s b/libpsn00b/psxgpu/drawsynccallback.s
index 37c0375..2b2c172 100644
--- a/libpsn00b/psxgpu/drawsynccallback.s
+++ b/libpsn00b/psxgpu/drawsynccallback.s
@@ -64,7 +64,7 @@ _drawsync_handler:
 	addiu	$sp, -4
 	sw		$ra, 0($sp)
 
-	lw		$v0, D2_CHCR($a0)
+	lw		$v0, DMA2_CHCR($a0)
 	nop
 	srl		$v0, 24
 	andi	$v0, 0x1
diff --git a/libpsn00b/psxgpu/loadimage.s b/libpsn00b/psxgpu/loadimage.s
index 4a3b4e0..e2a5be5 100644
--- a/libpsn00b/psxgpu/loadimage.s
+++ b/libpsn00b/psxgpu/loadimage.s
@@ -56,12 +56,12 @@ LoadImage:
 	sll		$v1, 0x10
 	ori		$v1, 0x8
 
-	sw		$a1, D2_MADR($s0)	# Set DMA base address and transfer length
-	sw		$v1, D2_BCR($s0)
+	sw		$a1, DMA2_MADR($s0)	# Set DMA base address and transfer length
+	sw		$v1, DMA2_BCR($s0)
 
 	lui		$v0, 0x100			# Start DMA transfer
 	ori		$v0, 0x201
-	sw		$v0, D2_CHCR($s0)
+	sw		$v0, DMA2_CHCR($s0)
 
 	lw		$ra, 0($sp)
 	lw		$s0, 4($sp)
diff --git a/libpsn00b/psxgpu/resetgraph.s b/libpsn00b/psxgpu/resetgraph.s
index f469fbe..eae854c 100644
--- a/libpsn00b/psxgpu/resetgraph.s
+++ b/libpsn00b/psxgpu/resetgraph.s
@@ -42,10 +42,10 @@ ResetGraph:
 
 	lui		$v0, 0x3b33					# Enables DMA channel 6 (for ClearOTag)
 	ori		$v0, 0x3b33					# Enables DMA channel 2
-	sw		$v0, DPCR($a3)
-	sw		$0 , DICR($a3)				# Clear DICR (not needed)
+	sw		$v0, DMA_DPCR($a3)
+	sw		$0 , DMA_DICR($a3)			# Clear DICR (not needed)
 
-	sw		$0 , IMASK($a3)				# Clear IRQ settings
+	sw		$0 , IRQ_MASK($a3)			# Clear IRQ settings
 	
 	la		$v0, _hooks_installed		# Set installed flag
 	li		$v1, 0x1
@@ -102,7 +102,7 @@ ResetGraph:
 										# by previous calls)
 
 	li		$v0, 0x1d00					# Configure timer 1 as Hblank counter
-	sw		$v0, T1_MODE($a3)			# Set timer 1 value
+	sw		$v0, TIM1_CTRL($a3)			# Set timer 1 value
 	
 	beq		$a0, 1, .Lgpu_init_1
 	nop
@@ -116,7 +116,7 @@ ResetGraph:
 
 .Lgpu_init_1:
 
-	sw		$0 , D2_CHCR($a3)			# Stop any DMA
+	sw		$0 , DMA2_CHCR($a3)			# Stop any DMA
 
 .Lgpu_init_3:
 
@@ -143,9 +143,9 @@ VSync:
 	lw		$s0, GP1($a3)
 	
 .Lhwait_loop:							# Get Hblank time
-	lw		$v0, T1_CNT($a3)
+	lw		$v0, TIM1_VALUE($a3)
 	nop
-	lw		$v1, T1_CNT($a3)
+	lw		$v1, TIM1_VALUE($a3)
 	nop
 	bne		$v0, $v1, .Lhwait_loop
 	nop
@@ -208,9 +208,9 @@ VSync:
 	la		$a2, _vsync_lasthblank
 	
 .Lhwait2_loop:
-	lw		$v0, T1_CNT($a3)
+	lw		$v0, TIM1_VALUE($a3)
 	nop
-	lw		$v1, T1_CNT($a3)
+	lw		$v1, TIM1_VALUE($a3)
 	sw		$v0, 0($a2)
 	bne		$v0, $v1, .Lhwait2_loop
 	nop
diff --git a/libpsn00b/psxgpu/storeimage.s b/libpsn00b/psxgpu/storeimage.s
index 5d4c793..933b14c 100644
--- a/libpsn00b/psxgpu/storeimage.s
+++ b/libpsn00b/psxgpu/storeimage.s
@@ -54,8 +54,8 @@ StoreImage:
 	sll		$v1, 0x10
 	ori		$v1, 0x8
 
-	sw		$a1, D2_MADR($s0)	# Set DMA base address and transfer length
-	sw		$v1, D2_BCR($s0)
+	sw		$a1, DMA2_MADR($s0)	# Set DMA base address and transfer length
+	sw		$v1, DMA2_BCR($s0)
 
 .Lgpu_wait_2:					# Wait for GPU to be ready for commands and DMA
 	jal		ReadGPUstat
@@ -67,7 +67,7 @@ StoreImage:
 	
 	lui		$v0, 0x100			# Start DMA transfer
 	ori		$v0, 0x200
-	sw		$v0, D2_CHCR($s0)
+	sw		$v0, DMA2_CHCR($s0)
 
 	lw		$ra, 0($sp)
 	lw		$s0, 4($sp)