diff options
| author | spicyjpeg <thatspicyjpeg@gmail.com> | 2024-10-14 11:57:37 +0200 |
|---|---|---|
| committer | spicyjpeg <thatspicyjpeg@gmail.com> | 2024-10-14 11:57:37 +0200 |
| commit | 9c792e636a7803f8003643b2f91f040257398b3f (patch) | |
| tree | aba34ef7a6ccada29a563de32132a9e11f351e9a /libpsn00b | |
| parent | f5b439060d2724c549f2abbc2b16d7b0257ee0b8 (diff) | |
| download | psn00bsdk-9c792e636a7803f8003643b2f91f040257398b3f.tar.gz | |
Update submodules, minor bugfixes and updates
Diffstat (limited to 'libpsn00b')
| -rw-r--r-- | libpsn00b/include/assert.h | 8 | ||||
| -rw-r--r-- | libpsn00b/include/psxgpu.h | 2 | ||||
| -rw-r--r-- | libpsn00b/lzp/compress.c | 3 | ||||
| -rw-r--r-- | libpsn00b/psxpress/vlc.s | 1 | ||||
| -rw-r--r-- | libpsn00b/psxspu/common.c | 7 |
5 files changed, 11 insertions, 10 deletions
diff --git a/libpsn00b/include/assert.h b/libpsn00b/include/assert.h index 8f8df74..9a9c485 100644 --- a/libpsn00b/include/assert.h +++ b/libpsn00b/include/assert.h @@ -22,11 +22,11 @@ void _assert_abort(const char *file, int line, const char *expr); #ifdef NDEBUG -#define assert(expr) +#define assert(expr) ((void) (expr)) #define _sdk_log(fmt, ...) -#define _sdk_assert(expr, fmt, ...) -#define _sdk_validate_args_void(expr) -#define _sdk_validate_args(expr, ret) +#define _sdk_assert(expr, fmt, ...) ((void) (expr)) +#define _sdk_validate_args_void(expr) ((void) (expr)) +#define _sdk_validate_args(expr, ret) ((void) (expr)) #else diff --git a/libpsn00b/include/psxgpu.h b/libpsn00b/include/psxgpu.h index d562420..52ddba8 100644 --- a/libpsn00b/include/psxgpu.h +++ b/libpsn00b/include/psxgpu.h @@ -329,7 +329,7 @@ _DEF_PRIM(POLY_FT3, _DEF_PRIM(POLY_FT4, uint8_t r0, g0, b0, code; - uint16_t x0, y0; + int16_t x0, y0; uint8_t u0, v0; uint16_t clut; int16_t x1, y1; diff --git a/libpsn00b/lzp/compress.c b/libpsn00b/lzp/compress.c index 16cb606..0bd860d 100644 --- a/libpsn00b/lzp/compress.c +++ b/libpsn00b/lzp/compress.c @@ -1,11 +1,12 @@ // Based on ilia muraviev's CRUSH compressor program which falls under public domain +#include "lzconfig.h" + #include <string.h> #ifdef LZP_USE_MALLOC #include <stdlib.h> #endif -#include "lzconfig.h" #include "bit.h" #include "lzp.h" diff --git a/libpsn00b/psxpress/vlc.s b/libpsn00b/psxpress/vlc.s index 546d427..5707a21 100644 --- a/libpsn00b/psxpress/vlc.s +++ b/libpsn00b/psxpress/vlc.s @@ -282,7 +282,6 @@ _vlc_skip_context_load: beqz length, .Ldc_y_zero # if (dc_length) subu bit_offset, temp - sll temp, last_y, 2 subu $at, length # value = window >> (32 - dc_length) srlv value, window, $at diff --git a/libpsn00b/psxspu/common.c b/libpsn00b/psxspu/common.c index 64c6d1b..733997d 100644 --- a/libpsn00b/psxspu/common.c +++ b/libpsn00b/psxspu/common.c @@ -46,9 +46,10 @@ static size_t _dma_transfer(uint32_t *data, size_t length, int write) { } // Increase bus delay for DMA reads - BUS_SPU_CFG &= ~(0xf << 24); - if (!write) - BUS_SPU_CFG = 2 << 24; + if (write) + BUS_SPU_CFG &= ~(0xf << 24); + else + BUS_SPU_CFG = (BUS_SPU_CFG & ~(0xf << 24)) | (2 << 24); SPU_CTRL &= 0xffcf; // Disable DMA request _wait_status(0x0030, 0x0000); |