[Scummvm-git-logs] scummvm master -> 9ddf7ef9d6e18bd6681ec4d01a9baa3f0038331c

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
b0cfa3a9c7 PSP2: Remove psp2shell dependency
9ddf7ef9d6 PSP2: remove __PSP2_DEBUG__ and add error logging to file


Commit: b0cfa3a9c7294a8aee750e4d44e459a6bb557533
    https://github.com/scummvm/scummvm/commit/b0cfa3a9c7294a8aee750e4d44e459a6bb557533
Author: William Bonnaventure (william.bonnaventure at gmail.com)
Date: 2025-06-23T01:06:44+03:00

Commit Message:
PSP2: Remove psp2shell dependency

psp2shell as a dependency is not needed for debug. In fact, it does not
even work with current code. We simply need to remove it and use
sceClibPrintf. This standard function will send debug messages to
psp2shell if it is installed on the console.

Changed paths:
    backends/platform/sdl/psp2/psp2-main.cpp
    backends/platform/sdl/psp2/psp2.cpp
    backends/platform/sdl/psp2/psp2.h
    configure


diff --git a/backends/platform/sdl/psp2/psp2-main.cpp b/backends/platform/sdl/psp2/psp2-main.cpp
index b17f416ed45..ace47485074 100644
--- a/backends/platform/sdl/psp2/psp2-main.cpp
+++ b/backends/platform/sdl/psp2/psp2-main.cpp
@@ -33,10 +33,6 @@ char boot_params[1024];
 
 int main(int argc, char *argv[]) {
 
-#ifdef __PSP2_DEBUG__
-	psp2shell_init(3333, 10);
-#endif
-
 	scePowerSetArmClockFrequency(444);
 	scePowerSetBusClockFrequency(222);
 	scePowerSetGpuClockFrequency(222);
@@ -99,9 +95,5 @@ exit:
 	// Free OSystem
 	g_system->destroy();
 
-#ifdef __PSP2_DEBUG__
-	psp2shell_exit();
-#endif
-
 	return res;
 }
diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index 1ad04f3c4d5..81cbd6c140c 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -21,6 +21,7 @@
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h	// sys/stat.h includes sys/time.h
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf	// used by sceClibPrintf()
 
 #include "common/scummsys.h"
 #include "common/config-manager.h"
@@ -34,10 +35,8 @@
 #include <sys/stat.h>
 
 #include <psp2/io/stat.h>
+#include <psp2/kernel/clib.h>
 
-#ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#endif
 
 static const Common::HardwareInputTableEntry psp2JoystickButtons[] = {
 	{ "JOY_A",              Common::JOYSTICK_BUTTON_A,              _s("Cross")       },
@@ -156,7 +155,7 @@ bool OSystem_PSP2::hasFeature(Feature f) {
 
 void OSystem_PSP2::logMessage(LogMessageType::Type type, const char *message) {
 #if __PSP2_DEBUG__
-	psp2shell_print(message);
+	sceClibPrintf(message);
 #endif
 }
 
diff --git a/backends/platform/sdl/psp2/psp2.h b/backends/platform/sdl/psp2/psp2.h
index 646ae0203d4..69980d52a44 100644
--- a/backends/platform/sdl/psp2/psp2.h
+++ b/backends/platform/sdl/psp2/psp2.h
@@ -23,9 +23,6 @@
 #define PLATFORM_SDL_PSP2_H
 
 #include "backends/platform/sdl/sdl.h"
-#ifdef __PSP2_DEBUG__
-#include <psp2shell.h>
-#endif
 
 class OSystem_PSP2 : public OSystem_SDL {
 public:
diff --git a/configure b/configure
index 565aeedcf13..e8b805a891a 100755
--- a/configure
+++ b/configure
@@ -3466,7 +3466,6 @@ EOF
 		if test "$_debug_build" = yes; then
 			_optimization_level=-O0
 			append_var DEFINES "-D__PSP2_DEBUG__"
-			append_var LIBS "-lpsp2shell"
 		fi
 		add_line_to_config_mk 'PSP2 = 1'
 		add_line_to_config_h "#define PREFIX \"${prefix}\""


Commit: 9ddf7ef9d6e18bd6681ec4d01a9baa3f0038331c
    https://github.com/scummvm/scummvm/commit/9ddf7ef9d6e18bd6681ec4d01a9baa3f0038331c
Author: William Bonnaventure (william.bonnaventure at gmail.com)
Date: 2025-06-23T01:06:44+03:00

Commit Message:
PSP2: remove __PSP2_DEBUG__ and add error logging to file

Changed paths:
    backends/platform/sdl/psp2/psp2.cpp
    configure


diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index 81cbd6c140c..e53d6b3ed51 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -73,11 +73,6 @@ int access(const char *pathname, int mode) {
 }
 
 void OSystem_PSP2::init() {
-
-#if __PSP2_DEBUG__
-	gDebugLevel = 3;
-#endif
-
 	// Initialize File System Factory
 	sceIoMkdir("ux0:data", 0755);
 	sceIoMkdir("ux0:data/scummvm", 0755);
@@ -154,9 +149,11 @@ bool OSystem_PSP2::hasFeature(Feature f) {
 }
 
 void OSystem_PSP2::logMessage(LogMessageType::Type type, const char *message) {
-#if __PSP2_DEBUG__
 	sceClibPrintf(message);
-#endif
+
+	// Log only error messages to file
+	if (type == LogMessageType::kError && _logger)
+		_logger->print(message);
 }
 
 Common::Path OSystem_PSP2::getDefaultConfigFileName() {
diff --git a/configure b/configure
index e8b805a891a..b41409714f7 100755
--- a/configure
+++ b/configure
@@ -3465,7 +3465,6 @@ EOF
 		fi
 		if test "$_debug_build" = yes; then
 			_optimization_level=-O0
-			append_var DEFINES "-D__PSP2_DEBUG__"
 		fi
 		add_line_to_config_mk 'PSP2 = 1'
 		add_line_to_config_h "#define PREFIX \"${prefix}\""