aboutsummaryrefslogtreecommitdiff
path: root/libpsn00b/include
diff options
context:
space:
mode:
authorspicyjpeg <88942473+spicyjpeg@users.noreply.github.com>2022-02-27 19:45:38 +0100
committerspicyjpeg <88942473+spicyjpeg@users.noreply.github.com>2022-02-27 19:45:38 +0100
commit69a364049a3958396d2d083c660591dad9ec257d (patch)
treee56b1b614890e512726448dad10cb68b3b7b261f /libpsn00b/include
parenta2da2debfde1d44338d203aa4d56e485c4bb16ae (diff)
downloadpsn00bsdk-69a364049a3958396d2d083c660591dad9ec257d.tar.gz
Rename some hwregs_c.h and hwregs.a definitions
Diffstat (limited to 'libpsn00b/include')
-rw-r--r--libpsn00b/include/hwregs_a.h22
-rw-r--r--libpsn00b/include/hwregs_c.h10
2 files changed, 16 insertions, 16 deletions
diff --git a/libpsn00b/include/hwregs_a.h b/libpsn00b/include/hwregs_a.h
index 4d0bade..8a504f5 100644
--- a/libpsn00b/include/hwregs_a.h
+++ b/libpsn00b/include/hwregs_a.h
@@ -8,8 +8,8 @@
## GPU
-.set GP0, 0x1810 # Also GPUREAD
-.set GP1, 0x1814 # Also GPUSTAT
+.set GPU_GP0, 0x1810 # Also GPUREAD
+.set GPU_GP1, 0x1814 # Also GPUSTAT
## CD drive
@@ -123,17 +123,17 @@
## Timers
-.set TIM0_VALUE, 0x1100
-.set TIM0_CTRL, 0x1104
-.set TIM0_RELOAD, 0x1108
+.set TIMER0_VALUE, 0x1100
+.set TIMER0_CTRL, 0x1104
+.set TIMER0_RELOAD, 0x1108
-.set TIM1_VALUE, 0x1110
-.set TIM1_CTRL, 0x1114
-.set TIM1_RELOAD, 0x1118
+.set TIMER1_VALUE, 0x1110
+.set TIMER1_CTRL, 0x1114
+.set TIMER1_RELOAD, 0x1118
-.set TIM2_VALUE, 0x1120
-.set TIM2_CTRL, 0x1124
-.set TIM2_RELOAD, 0x1128
+.set TIMER2_VALUE, 0x1120
+.set TIMER2_CTRL, 0x1124
+.set TIMER2_RELOAD, 0x1128
## Memory control
diff --git a/libpsn00b/include/hwregs_c.h b/libpsn00b/include/hwregs_c.h
index 4222a22..e533c56 100644
--- a/libpsn00b/include/hwregs_c.h
+++ b/libpsn00b/include/hwregs_c.h
@@ -19,8 +19,8 @@
/* GPU */
-#define GP0 _MMIO32(0x1f801810)
-#define GP1 _MMIO32(0x1f801814)
+#define GPU_GP0 _MMIO32(0x1f801810)
+#define GPU_GP1 _MMIO32(0x1f801814)
/* CD drive */
@@ -109,9 +109,9 @@
/* Timers */
-#define TIM_VALUE(N) _MMIO32(0x1f801100 + 16 * (N))
-#define TIM_CTRL(N) _MMIO32(0x1f801104 + 16 * (N))
-#define TIM_RELOAD(N) _MMIO32(0x1f801108 + 16 * (N))
+#define TIMER_VALUE(N) _MMIO32(0x1f801100 + 16 * (N))
+#define TIMER_CTRL(N) _MMIO32(0x1f801104 + 16 * (N))
+#define TIMER_RELOAD(N) _MMIO32(0x1f801108 + 16 * (N))
/* Memory control */