diff options
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r-- | backends/platform/sdl/module.mk | 7 | ||||
-rw-r--r-- | backends/platform/sdl/posix/posix-main.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/psp2/psp2-main.cpp | 66 | ||||
-rw-r--r-- | backends/platform/sdl/psp2/psp2.cpp | 143 | ||||
-rw-r--r-- | backends/platform/sdl/psp2/psp2.h | 52 | ||||
-rw-r--r-- | backends/platform/sdl/psp2/psp2.mk | 26 |
6 files changed, 295 insertions, 1 deletions
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk index 84ce272d3c..7fde04037f 100644 --- a/backends/platform/sdl/module.mk +++ b/backends/platform/sdl/module.mk @@ -37,6 +37,13 @@ MODULE_OBJS += \ ps3/ps3.o endif +ifdef PSP2 +CC=arm-vita-eabi-gcc +MODULE_OBJS += \ + psp2/psp2-main.o \ + psp2/psp2.o +endif + # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS. MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) OBJS := $(MODULE_OBJS) $(OBJS) diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp index 5deebb0ae3..92354b273e 100644 --- a/backends/platform/sdl/posix/posix-main.cpp +++ b/backends/platform/sdl/posix/posix-main.cpp @@ -22,7 +22,7 @@ #include "common/scummsys.h" -#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(ANDROIDSDL) +#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(PSP2) && !defined(ANDROIDSDL) #include "backends/platform/sdl/posix/posix.h" #include "backends/plugins/sdl/sdl-provider.h" diff --git a/backends/platform/sdl/psp2/psp2-main.cpp b/backends/platform/sdl/psp2/psp2-main.cpp new file mode 100644 index 0000000000..0bdf0b34bc --- /dev/null +++ b/backends/platform/sdl/psp2/psp2-main.cpp @@ -0,0 +1,66 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include <psp2/kernel/processmgr.h> +#include <psp2/power.h> + +#include "common/scummsys.h" +#include "backends/platform/sdl/psp2/psp2.h" +#include "backends/plugins/sdl/sdl-provider.h" +#include "base/main.h" + +int _newlib_heap_size_user = 192 * 1024 * 1024; + +int main(int argc, char *argv[]) { + +#ifdef __PSP2_DEBUG__ + psp2shell_init(3333, 10); +#endif + + scePowerSetArmClockFrequency(444); + scePowerSetBusClockFrequency(222); + scePowerSetGpuClockFrequency(222); + scePowerSetGpuXbarClockFrequency(166); + + // Create our OSystem instance + g_system = new OSystem_PSP2(); + assert(g_system); + + // Pre initialize the backend + ((OSystem_PSP2 *)g_system)->init(); + +#ifdef DYNAMIC_MODULES + PluginManager::instance().addPluginProvider(new SDLPluginProvider()); +#endif + + // Invoke the actual ScummVM main entry point: + int res = scummvm_main(argc, argv); + + // Free OSystem + delete (OSystem_PSP2 *)g_system; + +#ifdef __PSP2_DEBUG__ + psp2shell_exit(); +#endif + + return res; +} diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp new file mode 100644 index 0000000000..3c0cb9106d --- /dev/null +++ b/backends/platform/sdl/psp2/psp2.cpp @@ -0,0 +1,143 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h // sys/stat.h includes sys/time.h +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h + +#include "common/scummsys.h" +#include "common/config-manager.h" +#include "common/debug-channels.h" +#include "backends/platform/sdl/psp2/psp2.h" +#include "backends/graphics/psp2sdl/psp2sdl-graphics.h" +#include "backends/saves/default/default-saves.h" + +#include "backends/fs/psp2/psp2-fs-factory.h" +#include "backends/events/psp2sdl/psp2sdl-events.h" +#include "backends/fs/psp2/psp2-dirent.h" +#include <sys/stat.h> + +#ifdef __PSP2_DEBUG__ +#include <psp2shell.h> +#endif + +int access(const char *pathname, int mode) { + struct stat sb; + + if (stat(pathname, &sb) == -1) { + return -1; + } + + return 0; +} + +OSystem_PSP2::OSystem_PSP2(Common::String baseConfigName) + : _baseConfigName(baseConfigName) { +} + +void OSystem_PSP2::init() { + +#if __PSP2_DEBUG__ + gDebugLevel = 3; +#endif + + // Initialze File System Factory + sceIoMkdir("ux0:data", 0755); + sceIoMkdir("ux0:data/scummvm", 0755); + sceIoMkdir("ux0:data/scummvm/saves", 0755); + _fsFactory = new PSP2FilesystemFactory(); + + // Invoke parent implementation of this method + OSystem_SDL::init(); +} + +void OSystem_PSP2::initBackend() { + + ConfMan.set("joystick_num", 0); + ConfMan.set("vkeybdpath", PREFIX "/data"); + ConfMan.registerDefault("fullscreen", true); + ConfMan.registerDefault("aspect_ratio", false); + ConfMan.registerDefault("gfx_mode", "2x"); + ConfMan.registerDefault("filtering", true); + ConfMan.registerDefault("kbdmouse_speed", 3); + ConfMan.registerDefault("joystick_deadzone", 2); + ConfMan.registerDefault("shader", 0); + + if (!ConfMan.hasKey("fullscreen")) { + ConfMan.setBool("fullscreen", true); + } + if (!ConfMan.hasKey("aspect_ratio")) { + ConfMan.setBool("aspect_ratio", false); + } + if (!ConfMan.hasKey("gfx_mode")) { + ConfMan.set("gfx_mode", "2x"); + } + if (!ConfMan.hasKey("filtering")) { + ConfMan.setBool("filtering", true); + } + if (!ConfMan.hasKey("kbdmouse_speed")) { + ConfMan.setInt("kbdmouse_speed", 3); + } + if (!ConfMan.hasKey("joystick_deadzone")) { + ConfMan.setInt("joystick_deadzone", 2); + } + if (!ConfMan.hasKey("shader")) { + ConfMan.setInt("shader", 0); + } + + // Create the savefile manager + if (_savefileManager == 0) + _savefileManager = new DefaultSaveFileManager("ux0:data/scummvm/saves"); + + // Event source + if (_eventSource == 0) + _eventSource = new PSP2EventSource(); + + // Graphics Manager + if (_graphicsManager == 0) + _graphicsManager = new PSP2SdlGraphicsManager(_eventSource, _window); + + // Invoke parent implementation of this method + OSystem_SDL::initBackend(); +} + +bool OSystem_PSP2::hasFeature(Feature f) { + return (f == kFeatureKbdMouseSpeed || + f == kFeatureJoystickDeadzone || + f == kFeatureShader || + OSystem_SDL::hasFeature(f)); +} + +void OSystem_PSP2::logMessage(LogMessageType::Type type, const char *message) { +#if __PSP2_DEBUG__ + psp2shell_print(message); +#endif +} + +Common::String OSystem_PSP2::getDefaultConfigFileName() { + return "ux0:data/scummvm/" + _baseConfigName; +} + +Common::WriteStream *OSystem_PSP2::createLogFile() { + Common::FSNode file("ux0:data/scummvm/scummvm.log"); + return file.createWriteStream(); +} diff --git a/backends/platform/sdl/psp2/psp2.h b/backends/platform/sdl/psp2/psp2.h new file mode 100644 index 0000000000..65d98098be --- /dev/null +++ b/backends/platform/sdl/psp2/psp2.h @@ -0,0 +1,52 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef PLATFORM_SDL_PSP2_H +#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: + // Let the subclasses be able to change _baseConfigName in the constructor + OSystem_PSP2(Common::String baseConfigName = "scummvm.ini"); + virtual ~OSystem_PSP2() {} + + virtual void init(); + virtual void initBackend(); + virtual bool hasFeature(Feature f); + virtual void logMessage(LogMessageType::Type type, const char *message); + +protected: + // Base string for creating the default path and filename + // for the configuration file + Common::String _baseConfigName; + + virtual Common::String getDefaultConfigFileName(); + + virtual Common::WriteStream *createLogFile(); +}; + +#endif diff --git a/backends/platform/sdl/psp2/psp2.mk b/backends/platform/sdl/psp2/psp2.mk new file mode 100644 index 0000000000..b719ed7acf --- /dev/null +++ b/backends/platform/sdl/psp2/psp2.mk @@ -0,0 +1,26 @@ +DATE := $(shell date +%y-%m-%d) + +psp2vpk: $(EXECUTABLE) + rm -rf psp2pkg + rm -f $(EXECUTABLE)-$(DATE).vpk + mkdir -p psp2pkg/sce_sys/livearea/contents + mkdir -p psp2pkg/data/ + mkdir -p psp2pkg/doc/ + vita-elf-create $(EXECUTABLE) $(EXECUTABLE).velf + vita-make-fself -s -c $(EXECUTABLE).velf psp2pkg/eboot.bin + vita-mksfoex -s TITLE_ID=VSCU00001 "$(EXECUTABLE)" psp2pkg/sce_sys/param.sfo + cp $(srcdir)/dists/psp2/icon0.png psp2pkg/sce_sys/ + cp $(srcdir)/dists/psp2/template.xml psp2pkg/sce_sys/livearea/contents/ + cp $(srcdir)/dists/psp2/bg.png psp2pkg/sce_sys/livearea/contents/ + cp $(srcdir)/dists/psp2/startup.png psp2pkg/sce_sys/livearea/contents/ + cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip psp2pkg/data/ + cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip psp2pkg/data/ + cp $(DIST_FILES_THEMES) psp2pkg/data/ +ifdef DIST_FILES_ENGINEDATA + cp $(DIST_FILES_ENGINEDATA) psp2pkg/data/ +endif + cp $(DIST_FILES_DOCS) psp2pkg/doc/ + cp $(srcdir)/dists/psp2/readme-psp2.md psp2pkg/doc/ + cd psp2pkg && zip -r ../$(EXECUTABLE)-$(DATE).vpk . && cd .. + +.PHONY: psp2vpk |