aboutsummaryrefslogtreecommitdiff
path: root/examples
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 /examples
parenta2da2debfde1d44338d203aa4d56e485c4bb16ae (diff)
downloadpsn00bsdk-69a364049a3958396d2d083c660591dad9ec257d.tar.gz
Rename some hwregs_c.h and hwregs.a definitions
Diffstat (limited to 'examples')
-rw-r--r--examples/graphics/rgb24/bunpattern.pngbin0 -> 59932 bytes
-rw-r--r--examples/io/pads/spi.c6
-rw-r--r--examples/system/timer/main.c5
3 files changed, 6 insertions, 5 deletions
diff --git a/examples/graphics/rgb24/bunpattern.png b/examples/graphics/rgb24/bunpattern.png
new file mode 100644
index 0000000..61524f8
--- /dev/null
+++ b/examples/graphics/rgb24/bunpattern.png
Binary files differ
diff --git a/examples/io/pads/spi.c b/examples/io/pads/spi.c
index 05a0e59..43b5bc3 100644
--- a/examples/io/pads/spi.c
+++ b/examples/io/pads/spi.c
@@ -179,12 +179,12 @@ SPI_Request *SPI_CreateRequest(void) {
}
void SPI_SetPollRate(uint32_t value) {
- TIM_CTRL(2) = 0x0258; // CLK/8 input, IRQ on reload, disable one-shot IRQ
+ TIMER_CTRL(2) = 0x0258; // CLK/8 input, IRQ on reload, disable one-shot IRQ
if (value < 65)
- TIM_RELOAD(2) = 0xffff;
+ TIMER_RELOAD(2) = 0xffff;
else
- TIM_RELOAD(2) = (F_CPU / 8) / value;
+ TIMER_RELOAD(2) = (F_CPU / 8) / value;
}
void SPI_Init(SPI_Callback callback) {
diff --git a/examples/system/timer/main.c b/examples/system/timer/main.c
index 8153581..eb62712 100644
--- a/examples/system/timer/main.c
+++ b/examples/system/timer/main.c
@@ -3,6 +3,7 @@
#include <psxgpu.h>
#include <psxapi.h>
#include <psxetc.h>
+#include <hwregs_c.h>
/* OT and Packet Buffer sizes */
#define OT_LEN 256
@@ -34,7 +35,7 @@ void display();
volatile int timer_calls = 0;
-volatile short *timer2_ctrl = (short*)0x1F801124;
+
void timer_func()
{
timer_calls++;
@@ -74,7 +75,7 @@ int main() {
//counter = 5163000/560;
SetRCnt(RCntCNT2, counter, RCntMdINTR);
- *timer2_ctrl = 0x1E58;
+ TIMER_CTRL(2) = 0x1E58;
InterruptCallback(6, timer_func);
StartRCnt(RCntCNT2);
ChangeClearRCnt(2, 0);