Update submodules, minor bugfixes and updates

10 files changed, 36 insertions, 35 deletions

diff --git a/.editorconfig b/.editorconfig
index 12b5021..93c80e1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,13 @@
 root = true
 
 [*]
-charset = utf-8
-end_of_line = lf
-indent_style = tab
-indent_size = 4
-trim_trailing_whitespace = true
\ No newline at end of file
+indent_style             = tab
+indent_size              = 4
+charset                  = utf-8
+end_of_line              = lf
+trim_trailing_whitespace = true
+insert_final_newline     = true
+
+[{*.yml,*.yaml,.clangd}]
+indent_style = space
+indent_size  = 2
diff --git a/.gitignore b/.gitignore
index 71a3cea..0c88571 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,16 @@
-.svn
-.vscode
+# Do not include any hidden metadata saved by apps and the OS.
+desktop.ini
 .DS_Store
-build
-bin
-old
-scrap
-*.a
-*.o
-*.obj
-*.elf
-*.so
-*.exe
-*.map
-*.dll
-*.lzp
-*.qlp
-*.iso
-*.rom
+.vscode/
+
+# Do not include any built or cached files.
+build/
+env/
+.cache/
+__pycache__/
+*.pyc
+*.pyo
+
+# Do not include user-specific workspace and configuration files.
 *.code-workspace
 CMakeUserPresets.json
diff --git a/examples/io/system573/main.c b/examples/io/system573/main.c
index 2878508..4ed11a6 100644
--- a/examples/io/system573/main.c
+++ b/examples/io/system573/main.c
@@ -53,8 +53,8 @@
  * writing a custom ATAPI driver and ISO9660 parser (which is out of the scope
  * of this example).
  *
- * https://github.com/mamedev/mame/blob/master/src/mame/drivers/ksys573.cpp
- * https://github.com/mamedev/mame/blob/master/src/mame/machine/k573dio.cpp
+ * https://github.com/mamedev/mame/blob/master/src/mame/konami/ksys573.cpp
+ * https://github.com/mamedev/mame/blob/master/src/mame/konami/k573dio.cpp
  */
 
 #include <stdint.h>
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);
diff --git a/tools/mkpsxiso b/tools/mkpsxiso
-Subproject 08fa69f61365a3314b98076bfe7b2f37ed9db5d
+Subproject e116d7f7e610f7a8a49b52656a280f0ff3e21ae
diff --git a/tools/tinyxml2 b/tools/tinyxml2
-Subproject 321ea883b7190d4e85cae5512a12e5eaa8f8731
+Subproject 374292e9ba1549460f35d70411daba8b82bb2ad