aboutsummaryrefslogtreecommitdiff
path: root/libpsn00b/psxpress
diff options
context:
space:
mode:
authorspicyjpeg <88942473+spicyjpeg@users.noreply.github.com>2022-07-17 11:40:02 +0200
committerspicyjpeg <88942473+spicyjpeg@users.noreply.github.com>2022-07-17 11:40:02 +0200
commitc800972bc13ad0c7015b7d44fe9f124b719e792e (patch)
tree7bb6767d786b6828438e55fa8b01d9e43309f59a /libpsn00b/psxpress
parent8deeb216cbff4e578284fc040d8f0b51e96d4b04 (diff)
downloadpsn00bsdk-c800972bc13ad0c7015b7d44fe9f124b719e792e.tar.gz
Change I/O base address to 0xbf80, use size_t in stdlib
Diffstat (limited to 'libpsn00b/psxpress')
-rw-r--r--libpsn00b/psxpress/mdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libpsn00b/psxpress/mdec.c b/libpsn00b/psxpress/mdec.c
index ba190d4..b8d16b5 100644
--- a/libpsn00b/psxpress/mdec.c
+++ b/libpsn00b/psxpress/mdec.c
@@ -115,9 +115,9 @@ void DecDCTin(const uint32_t *data, int mode) {
if (mode == DECDCT_MODE_RAW)
MDEC0 = header;
else if (mode & DECDCT_MODE_24BPP)
- MDEC0 = header | 0x30000000;
+ MDEC0 = 0x30000000 | (header & 0xffff);
else
- MDEC0 = header | 0x38000000 | ((mode & 2) << 24); // Bit 25 = mask
+ MDEC0 = 0x38000000 | (header & 0xffff) | ((mode & 2) << 24); // Bit 25 = mask
DecDCTinRaw((const uint32_t *) &(data[1]), header & 0xffff);
}
@@ -142,7 +142,7 @@ int DecDCTinSync(int mode) {
if (mode)
return (MDEC1 >> 29) & 1;
- for (uint32_t i = MDEC_SYNC_TIMEOUT; i; i--) {
+ for (int i = MDEC_SYNC_TIMEOUT; i; i--) {
if (!(MDEC1 & (1 << 29)))
return 0;
}
@@ -167,7 +167,7 @@ int DecDCToutSync(int mode) {
if (mode)
return (DMA_CHCR(1) >> 24) & 1;
- for (uint32_t i = MDEC_SYNC_TIMEOUT; i; i--) {
+ for (int i = MDEC_SYNC_TIMEOUT; i; i--) {
if (!(DMA_CHCR(1) & (1 << 24)))
return 0;
}