diff options
43 files changed, 897 insertions, 3144 deletions
diff --git a/Makefile.libretro b/Makefile.libretro index 5af8d75..65ca1dc 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -82,7 +82,11 @@ else ifeq ($(platform),$(filter $(platform),ios-arm64)) USE_DYNAREC = 0 HAVE_NEON = 0 BUILTIN_GPU = peops - TARGET := $(TARGET_NAME)_libretro_ios.dylib + TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib + + CC = clang -arch arm64 -isysroot $(IOSSDK) -miphoneos-version-min=8.0 + CXX = clang++ -arch arm64 -isysroot $(IOSSDK) -miphoneos-version-min=8.0 + CFLAGS += -marm -DIOS else ifneq (,$(findstring ios,$(platform))) ARCH := arm @@ -184,12 +188,11 @@ else ifeq ($(platform), ctr) CFLAGS += -Werror=implicit-function-declaration # CFLAGS += -DPCSX -# BUILTIN_GPU = unai + BUILTIN_GPU = unai USE_DYNAREC = 1 DRC_CACHE_BASE = 0 ARCH = arm HAVE_NEON = 0 - HAVE_CHD = 0 STATIC_LINKING = 1 # Xbox 360 diff --git a/blackberry_qnx/.cproject b/blackberry_qnx/.cproject deleted file mode 100644 index 565f4a9..0000000 --- a/blackberry_qnx/.cproject +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?fileVersion 4.0.0?> - -<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> - <storageModule moduleId="org.eclipse.cdt.core.settings"> - <cconfiguration id="com.qnx.qcc.toolChain.1762498539"> - <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.toolChain.1762498539" moduleId="org.eclipse.cdt.core.settings" name="Device-Debug"> - <externalSettings/> - <extensions> - <extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/> - <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - </extensions> - </storageModule> - <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactName="${ProjName}" buildProperties="" description="" id="com.qnx.qcc.toolChain.1762498539" name="Device-Debug" parent="org.eclipse.cdt.build.core.emptycfg"> - <folderInfo id="com.qnx.qcc.toolChain.1762498539.1561488424" name="/" resourcePath=""> - <toolChain id="com.qnx.qcc.toolChain.682312592" name="com.qnx.qcc.toolChain" superClass="com.qnx.qcc.toolChain"> - <option id="com.qnx.qcc.option.os.1720929524" name="Target OS:" superClass="com.qnx.qcc.option.os"/> - <option id="com.qnx.qcc.option.cpu.2107899725" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/> - <option id="com.qnx.qcc.option.compiler.596535986" name="Compiler:" superClass="com.qnx.qcc.option.compiler"/> - <option id="com.qnx.qcc.option.runtime.742171011" name="Runtime:" superClass="com.qnx.qcc.option.runtime"/> - <targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.982231418" osList="all" superClass="com.qnx.qcc.targetPlatform"/> - <builder arguments="-C .. -f Makefile.libretro platform=qnx" command="make" id="com.qnx.qcc.toolChain.1762498539.480897078" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/> - <tool id="com.qnx.qcc.tool.compiler.267897021" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler"> - <option id="com.qnx.qcc.option.compiler.optlevel.1293751119" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/> - <option id="com.qnx.qcc.option.compiler.includePath.365274483" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath"> - <listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/> - <listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/> - </option> - <inputType id="com.qnx.qcc.inputType.compiler.116424583" superClass="com.qnx.qcc.inputType.compiler"/> - </tool> - <tool id="com.qnx.qcc.tool.assembler.1307903249" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler"> - <inputType id="com.qnx.qcc.inputType.assembler.1838739065" superClass="com.qnx.qcc.inputType.assembler"/> - </tool> - <tool id="com.qnx.qcc.tool.linker.1852803277" name="QCC Linker" superClass="com.qnx.qcc.tool.linker"/> - <tool id="com.qnx.qcc.tool.archiver.1682937256" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/> - </toolChain> - </folderInfo> - </configuration> - </storageModule> - <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> - </cconfiguration> - <cconfiguration id="com.qnx.qcc.toolChain.1815033502"> - <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.toolChain.1815033502" moduleId="org.eclipse.cdt.core.settings" name="Device-Release"> - <externalSettings/> - <extensions> - <extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/> - <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - </extensions> - </storageModule> - <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactName="${ProjName}" buildProperties="" description="" id="com.qnx.qcc.toolChain.1815033502" name="Device-Release" parent="org.eclipse.cdt.build.core.emptycfg"> - <folderInfo id="com.qnx.qcc.toolChain.1815033502.1093640979" name="/" resourcePath=""> - <toolChain id="com.qnx.qcc.toolChain.1811843468" name="com.qnx.qcc.toolChain" superClass="com.qnx.qcc.toolChain"> - <option id="com.qnx.qcc.option.os.66936807" name="Target OS:" superClass="com.qnx.qcc.option.os"/> - <option id="com.qnx.qcc.option.cpu.1884625209" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/> - <option id="com.qnx.qcc.option.compiler.903071639" name="Compiler:" superClass="com.qnx.qcc.option.compiler"/> - <option id="com.qnx.qcc.option.runtime.901433789" name="Runtime:" superClass="com.qnx.qcc.option.runtime"/> - <targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.1169345860" osList="all" superClass="com.qnx.qcc.targetPlatform"/> - <builder id="com.qnx.qcc.toolChain.1815033502.1831895405" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/> - <tool id="com.qnx.qcc.tool.compiler.401658009" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler"> - <option id="com.qnx.qcc.option.compiler.optlevel.20820451" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/> - <option id="com.qnx.qcc.option.compiler.includePath.2022402746" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath"> - <listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/> - <listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/> - </option> - <inputType id="com.qnx.qcc.inputType.compiler.1180700251" superClass="com.qnx.qcc.inputType.compiler"/> - </tool> - <tool id="com.qnx.qcc.tool.assembler.1403530230" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler"> - <inputType id="com.qnx.qcc.inputType.assembler.1360707586" superClass="com.qnx.qcc.inputType.assembler"/> - </tool> - <tool id="com.qnx.qcc.tool.linker.577346665" name="QCC Linker" superClass="com.qnx.qcc.tool.linker"/> - <tool id="com.qnx.qcc.tool.archiver.637344581" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/> - </toolChain> - </folderInfo> - </configuration> - </storageModule> - <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> - </cconfiguration> - <cconfiguration id="com.qnx.qcc.toolChain.1271074456"> - <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.toolChain.1271074456" moduleId="org.eclipse.cdt.core.settings" name="Simulator-Debug"> - <externalSettings/> - <extensions> - <extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/> - <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - </extensions> - </storageModule> - <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactName="${ProjName}" buildProperties="" description="" id="com.qnx.qcc.toolChain.1271074456" name="Simulator-Debug" parent="org.eclipse.cdt.build.core.emptycfg"> - <folderInfo id="com.qnx.qcc.toolChain.1271074456.2095507025" name="/" resourcePath=""> - <toolChain id="com.qnx.qcc.toolChain.563285451" name="com.qnx.qcc.toolChain" superClass="com.qnx.qcc.toolChain"> - <option id="com.qnx.qcc.option.os.2028959839" name="Target OS:" superClass="com.qnx.qcc.option.os"/> - <option id="com.qnx.qcc.option.cpu.460119393" name="Target CPU:" superClass="com.qnx.qcc.option.cpu"/> - <option id="com.qnx.qcc.option.compiler.318948553" name="Compiler:" superClass="com.qnx.qcc.option.compiler"/> - <option id="com.qnx.qcc.option.runtime.1244314155" name="Runtime:" superClass="com.qnx.qcc.option.runtime"/> - <targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.2005367550" osList="all" superClass="com.qnx.qcc.targetPlatform"/> - <builder id="com.qnx.qcc.toolChain.1271074456.325666051" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/> - <tool id="com.qnx.qcc.tool.compiler.821983732" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler"> - <option id="com.qnx.qcc.option.compiler.optlevel.1701209030" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/> - <option id="com.qnx.qcc.option.compiler.includePath.1616908655" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath"> - <listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/> - <listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/> - </option> - <inputType id="com.qnx.qcc.inputType.compiler.1059435667" superClass="com.qnx.qcc.inputType.compiler"/> - </tool> - <tool id="com.qnx.qcc.tool.assembler.1920350417" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler"> - <inputType id="com.qnx.qcc.inputType.assembler.618235584" superClass="com.qnx.qcc.inputType.assembler"/> - </tool> - <tool id="com.qnx.qcc.tool.linker.1321150712" name="QCC Linker" superClass="com.qnx.qcc.tool.linker"/> - <tool id="com.qnx.qcc.tool.archiver.1860233844" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/> - </toolChain> - </folderInfo> - </configuration> - </storageModule> - <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> - </cconfiguration> - </storageModule> - <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <project id="pcsx_rearmed.null.446260429" name="pcsx_rearmed"/> - </storageModule> - <storageModule moduleId="scannerConfiguration"> - <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> - <scannerConfigBuildInfo instanceId="com.qnx.qcc.toolChain.1815033502"> - <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> - </scannerConfigBuildInfo> - <scannerConfigBuildInfo instanceId="com.qnx.qcc.toolChain.1762498539"> - <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> - </scannerConfigBuildInfo> - <scannerConfigBuildInfo instanceId="com.qnx.qcc.toolChain.1271074456"> - <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> - </scannerConfigBuildInfo> - </storageModule> - <storageModule moduleId="refreshScope" versionNumber="1"> - <resource resourceType="PROJECT" workspacePath="/pcsx_rearmed"/> - </storageModule> -</cproject> diff --git a/blackberry_qnx/.project b/blackberry_qnx/.project deleted file mode 100644 index c8e1e20..0000000 --- a/blackberry_qnx/.project +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>pcsx_rearmed</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> - <triggers>clean,full,incremental,</triggers> - <arguments> - <dictionary> - <key>?name?</key> - <value></value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.append_environment</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.autoBuildTarget</key> - <value>all</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.buildArguments</key> - <value>-C .. -f Makefile.libretro platform=qnx</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.buildCommand</key> - <value>make</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.cleanBuildTarget</key> - <value>clean</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.contents</key> - <value>org.eclipse.cdt.make.core.activeConfigSettings</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.enableAutoBuild</key> - <value>false</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.enableCleanBuild</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.enableFullBuild</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.fullBuildTarget</key> - <value>all</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.stopOnError</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> - <value>false</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.cdt.core.cnature</nature> - <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> - <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> - <nature>com.qnx.tools.ide.bbt.core.bbtnature</nature> - </natures> -</projectDescription> @@ -550,12 +550,15 @@ echo >> $config_mak if [ "$platform" = "libretro" ]; then echo "TARGET = libretro.so" >> $config_mak + echo "HAVE_CHD = 1" >> $config_mak fi echo "ARCH = $ARCH" >> $config_mak echo "PLATFORM = $platform" >> $config_mak echo "BUILTIN_GPU = $builtin_gpu" >> $config_mak echo "SOUND_DRIVERS = $sound_drivers" >> $config_mak -echo "PLUGINS = $plugins" >> $config_mak +if [ "$platform" != "libretro" ]; then + echo "PLUGINS = $plugins" >> $config_mak +fi if [ "$have_arm_neon" = "yes" ]; then echo "HAVE_NEON = 1" >> $config_mak fi diff --git a/debian_maemo/buildpkg b/debian_maemo/buildpkg deleted file mode 100644 index 4c34f94..0000000 --- a/debian_maemo/buildpkg +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e - -NAME=`head debian/changelog -n1 | sed -n 's/^\(.*\) (\(.*\)) .*/\1-\2/p'` -[[ -z $NAME ]] && { echo "Could not extract package name and version from debian/changelog" 2>&1; exit 1; } - -rm -rf ../$NAME -cp -r ../`basename $PWD` ../$NAME -cd ../$NAME -rm -rf .git* -find . -depth -name .svn -type d -exec rm -r {} \; -find . -name '*~' -exec rm {} \; - -LD_LIBRARY_PATH=/usr/lib dpkg-buildpackage -rfakeroot $* diff --git a/debian_maemo/changelog b/debian_maemo/changelog deleted file mode 100644 index e3395de..0000000 --- a/debian_maemo/changelog +++ /dev/null @@ -1,112 +0,0 @@ -pcsxrearmed (0.4.0.14.13) unstable; urgency=low - - * Updated source to notaz git version - - -- sakya <sakya_tg@yahoo.it> Fri, 15 Feb 2013 12:50:28 +0200 - -pcsxrearmed (0.4.0.14.12) unstable; urgency=low - - * Fixed a problem with controller and vibration (Gran Turismo 2, Wipeout 3) - * Added dependency to libts - - -- sakya <sakya_tg@yahoo.it> Wed, 16 May 2012 17:09:33 +0200 - -pcsxrearmed (0.4.0.14.11) unstable; urgency=low - - * Added option -guncon and -gunnotrigger to activate guncon controller type - - -- sakya <sakya_tg@yahoo.it> Wed, 16 May 2012 09:37:12 +0200 - -pcsxrearmed (0.4.0.14.10) unstable; urgency=low - - * Added option -corners to set action to execute when clicking on display corners - * Fixed problem with notification using gles plugin - * Fixed controller problem with game "Heart Of Darkness" (maybe others?) - - -- sakya <sakya_tg@yahoo.it> Fri, 11 May 2012 16:38:29 +0200 - -pcsxrearmed (0.4.0.14.9) unstable; urgency=low - - * Added support to .mdf extension - * Added option -vibration to activate vibration - - -- sakya <sakya_tg@yahoo.it> Tue, 1 May 2012 12:19:49 +0200 - -pcsxrearmed (0.4.0.14.8) unstable; urgency=low - - * Added option -disc to set the initial disc in multi discs images (used when loading a savestate with -load) - * Added option -autosave - * Fixed disc change for multi discs images (PBP) - * Merged commits from Notaz git - * drc: inv: fix ram ofset and mirror handling - * support emulated RAM mapped at offset - - -- sakya <sakya_tg@yahoo.it> Fri, 20 Apr 2012 20:27:19 +0200 - -pcsxrearmed (0.4.0.14.7) unstable; urgency=low - - * Fixed -displayon - - -- sakya <sakya_tg@yahoo.it> Sun, 15 Apr 2012 17:22:08 +0200 - -pcsxrearmed (0.4.0.14.6) unstable; urgency=low - - * Added option -keys to set the keys config file - * Fixed L1/L2/R1/R2 - * Added autopause on incoming call - - -- sakya <sakya_tg@yahoo.it> Wed, 13 Apr 2012 12:51:35 +0200 - -pcsxrearmed (0.4.0.14.5) unstable; urgency=low - - * Fixed accelerometer using gles - * Added -analog option to use the accelerometer as the analog pad - * Added options to set accelerometer sens, max value, y_def - * Added -displayon option to keep the display on (useful when playing using the accelerometer) - - -- sakya <sakya_tg@yahoo.it> Tue, 10 Apr 2012 15:34:11 +0200 - -pcsxrearmed (0.4.0.14.4) unstable; urgency=low - - * Fixed -load option - * Added disc change (configured a new key) - - -- sakya <sakya_tg@yahoo.it> Fri, 06 Apr 2012 13:54:56 +0200 - -pcsxrearmed (0.4.0.14.3) unstable; urgency=low - - * Added options to set various gles settings - * Fixed save state slot selection - * Added notification on save state slot change - - -- sakya <sakya_tg@yahoo.it> Wed, 04 Apr 2012 10:20:18 +0200 - -pcsxrearmed (0.4.0.14.2) unstable; urgency=low - - * Fixed fullscreen using gpu-gles - * Fixed crash when saving savestate using gpu-gles - * Added options to set spu reverb and interpolation (disabled by default) - - -- sakya <sakya_tg@yahoo.it> Sun, 01 Apr 2012 11:42:20 +0200 - -pcsxrearmed (0.4.0.14.1) unstable; urgency=low - - * Added option to set psx region (NTSC/PAL/Auto) - * Use PulseAudio (better audio) - - -- sakya <sakya_tg@yahoo.it> Wed, 30 Mar 2012 09:44:51 +0200 - -pcsxrearmed (0.4.0.14) unstable; urgency=low - - * Updated to r14 - * Added --help - * PCSX4All - - -- sakya <sakya_tg@yahoo.it> Sun, 27 Dec 2011 00:02:27 +0200 - -pcsxrearmed (0.4.0.12.2) unstable; urgency=low - - * gpu-gles - - - -- Bonapart <bonapart@programist.ru> Sun, 27 Dec 2011 00:02:27 +0200 diff --git a/debian_maemo/compat b/debian_maemo/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian_maemo/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian_maemo/control b/debian_maemo/control deleted file mode 100644 index 4469ed8..0000000 --- a/debian_maemo/control +++ /dev/null @@ -1,115 +0,0 @@ -Source: pcsxrearmed -Section: user/games -Priority: extra -Maintainer: Bonapart <bonapart@programist.ru> -Build-Depends: debhelper (>= 5), zlib1g-dev, libhildon1-dev, libpulse-dev, libasound2-dev, libbz2-dev, libgles1-sgx-img-dev, opengles-sgx-img-common-dev, libosso-dev, libdbus-1-dev, libhildonfm2-dev, libts-dev -Standards-Version: 3.7.3 - -Package: pcsxrearmed -Architecture: armel -Depends: ${shlibs:Depends}, libts-0.0-0 -Description: Sony PlayStation emulator -XSBC-Homepage: http://notaz.gp2x.de/pcsx_rearmed.php -XSBC-Bugtracker: http://notaz.gp2x.de/pcsx_rearmed.php -XB-Maemo-Display-Name: PCSX-ReArmed -XB-Maemo-Icon-26: - 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 - AABJRU5ErkJggg== diff --git a/debian_maemo/copyright b/debian_maemo/copyright deleted file mode 100644 index 75a6b06..0000000 --- a/debian_maemo/copyright +++ /dev/null @@ -1,2 +0,0 @@ -this package was maemonized by Roman Deninberg <bonapart@programist.ru> -Mon, 10 Jan 2011 02:00:13 +0100 diff --git a/debian_maemo/dirs b/debian_maemo/dirs deleted file mode 100644 index 33359b8..0000000 --- a/debian_maemo/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/games diff --git a/debian_maemo/docs b/debian_maemo/docs deleted file mode 100644 index e845566..0000000 --- a/debian_maemo/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian_maemo/files b/debian_maemo/files deleted file mode 100644 index 0cc57dd..0000000 --- a/debian_maemo/files +++ /dev/null @@ -1 +0,0 @@ -pcsxrearmed_0.4.0.14.13_armel.deb user/games extra diff --git a/debian_maemo/install b/debian_maemo/install deleted file mode 100644 index a260186..0000000 --- a/debian_maemo/install +++ /dev/null @@ -1,6 +0,0 @@ -pcsx opt/maemo/usr/games/ -plugins/spunull/spunull.so opt/maemo/usr/games/plugins -plugins/gpu_unai/gpu_unai.so opt/maemo/usr/games/plugins -#plugins/gpu_unai/gpuPCSX4ALL.so opt/maemo/usr/games/plugins -plugins/dfxvideo/gpu_peops.so opt/maemo/usr/games/plugins -plugins/gpu-gles/gpu_gles.so opt/maemo/usr/games/plugins diff --git a/debian_maemo/rules b/debian_maemo/rules deleted file mode 100644 index 5230bf7..0000000 --- a/debian_maemo/rules +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -#export DH_VERBOSE=1 - -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) - -#GAME_VERSION := $(shell head debian/changelog -n1 | sed -n 's/.* (\(.*\)) .*/\1/p') -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -build: build-stamp - -build-stamp: - dh_testdir - ./configure --platform=maemo --gpu=neon --sound-drivers=pulseaudio --enable-neon - $(MAKE) - strip pcsx - strip plugins/gpu_unai/gpu_unai.so - strip plugins/gpu-gles/gpu_gles.so - strip plugins/spunull/spunull.so - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - dh_clean - $(MAKE) clean clean_plugins - -install: build - dh_testdir - dh_testroot - dh_installdirs - mkdir -p "$(CURDIR)"/debian/pcsxrearmed/opt/maemo/usr/games/screenshots - chmod 777 "$(CURDIR)"/debian/pcsxrearmed/opt/maemo/usr/games/screenshots - chown user "$(CURDIR)"/debian/pcsxrearmed/opt/maemo/usr/games/screenshots - dh_install - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - #dh_installmenu - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_makeshlibs - dh_shlibdeps - dh_gencontrol - #maemo-optify - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c b/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c index 0a84d03..460b234 100644 --- a/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c +++ b/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c @@ -3430,7 +3430,10 @@ void set_file_stats_(const char *filename, struct flac_stat_s *stats) srctime.actime = stats->st_atime; srctime.modtime = stats->st_mtime; (void)flac_chmod(filename, stats->st_mode); +#if !defined _3DS (void)flac_utime(filename, &srctime); +#endif + #if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__ FLAC_CHECK_RETURN(chown(filename, stats->st_uid, -1)); FLAC_CHECK_RETURN(chown(filename, -1, stats->st_gid)); diff --git a/deps/flac-1.3.2/src/share/grabbag/file.c b/deps/flac-1.3.2/src/share/grabbag/file.c index 4cbef9d..0329bce 100644 --- a/deps/flac-1.3.2/src/share/grabbag/file.c +++ b/deps/flac-1.3.2/src/share/grabbag/file.c @@ -58,7 +58,9 @@ void grabbag__file_copy_metadata(const char *srcpath, const char *destpath) srctime.actime = srcstat.st_atime; srctime.modtime = srcstat.st_mtime; (void)flac_chmod(destpath, srcstat.st_mode); +#if !defined _3DS (void)flac_utime(destpath, &srctime); +#endif } } diff --git a/frontend/320240/caanoo.gpe b/frontend/320240/caanoo.gpe deleted file mode 100755 index 9d6154a..0000000 --- a/frontend/320240/caanoo.gpe +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Wiz's timings are already good, apply this for Caanoo -if [ -e /dev/accel ]; then - ./pollux_set "ram_timings=3,9,4,1,1,1,1" -fi - -# the sync mount causes problems when writing saves, -# probably due to many write calls, so have to get rid of it -if grep mmcblk /proc/mounts | grep -q '\<sync\>'; then - oldmount=`grep mmcblk /proc/mounts | grep '\<sync\>' | awk '{print $4}'` - mount /dev/mmcblk0p1 /mnt/sd/ -o remount,dirsync,noatime -fi - -./pcsx "$@" -sync - -if [ -n "$oldmount" ]; then - mount /dev/mmcblk0p1 /mnt/sd/ -o remount,$oldmount -fi - -cd /usr/gp2x -exec ./gp2xmenu diff --git a/frontend/320240/haptic_s.cfg b/frontend/320240/haptic_s.cfg deleted file mode 100644 index 624056d..0000000 --- a/frontend/320240/haptic_s.cfg +++ /dev/null @@ -1,3 +0,0 @@ -0 126 -100 -126 -115 0 diff --git a/frontend/320240/haptic_w.cfg b/frontend/320240/haptic_w.cfg deleted file mode 100644 index 3585a71..0000000 --- a/frontend/320240/haptic_w.cfg +++ /dev/null @@ -1,3 +0,0 @@ -0 54 -100 -126 -105 0 diff --git a/frontend/320240/pcsx26.png b/frontend/320240/pcsx26.png Binary files differdeleted file mode 100644 index ed220a0..0000000 --- a/frontend/320240/pcsx26.png +++ /dev/null diff --git a/frontend/320240/pcsx_rearmed.ini b/frontend/320240/pcsx_rearmed.ini deleted file mode 100644 index b15497f..0000000 --- a/frontend/320240/pcsx_rearmed.ini +++ /dev/null @@ -1,6 +0,0 @@ -[info] -name="PCSX ReARMed" -icon="/pcsx_rearmed/pcsx26.png" -path="/pcsx_rearmed/pcsx.gpe" -title="/pcsx_rearmed/pcsxb.png" -group="GAMES" diff --git a/frontend/320240/pcsxb.png b/frontend/320240/pcsxb.png Binary files differdeleted file mode 100644 index ff5a48a..0000000 --- a/frontend/320240/pcsxb.png +++ /dev/null diff --git a/frontend/320240/pollux_set.c b/frontend/320240/pollux_set.c deleted file mode 100644 index f49e777..0000000 --- a/frontend/320240/pollux_set.c +++ /dev/null @@ -1,389 +0,0 @@ -/* - * quick tool to set various timings for Wiz - * - * Copyright (c) Gražvydas "notaz" Ignotas, 2009 - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the organization nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * HTOTAL: X VTOTAL: 341 - * HSWIDTH: 1 VSWIDTH: 0 - * HASTART: 37 VASTART: 17 - * HAEND: 277 VAEND: 337 - * - * 120Hz - * pcd 8, 447: + 594us - * pcd 9, 397: + 36us - * pcd 10, 357: - 523us - * pcd 11, 325: +1153us - * - * 'lcd_timings=397,1,37,277,341,0,17,337;dpc_clkdiv0=9' - * 'ram_timings=2,9,4,1,1,1,1' - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -//#include "pollux_set.h" -#define BINARY - -/* parse stuff */ -static int parse_lcd_timings(const char *str, void *data) -{ - int *lcd_timings = data; - const char *p = str; - int ret, c; - ret = sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d", - &lcd_timings[0], &lcd_timings[1], &lcd_timings[2], &lcd_timings[3], - &lcd_timings[4], &lcd_timings[5], &lcd_timings[6], &lcd_timings[7]); - if (ret != 8) - return -1; - /* skip seven commas */ - for (c = 0; c < 7 && *p != 0; p++) - if (*p == ',') - c++; - if (c != 7) - return -1; - /* skip last number */ - while ('0' <= *p && *p <= '9') - p++; - - return p - str; -} - -static int parse_ram_timings(const char *str, void *data) -{ - int *ram_timings = data; - const char *p = str; - int ret, c; - float cas; - - ret = sscanf(p, "%f,%d,%d,%d,%d,%d,%d", - &cas, &ram_timings[1], &ram_timings[2], &ram_timings[3], - &ram_timings[4], &ram_timings[5], &ram_timings[6]); - if (ret != 7) - return -1; - if (cas == 2) - ram_timings[0] = 1; - else if (cas == 2.5) - ram_timings[0] = 2; - else if (cas == 3) - ram_timings[0] = 3; - else - return -1; - for (c = 0; c < 6 && *p != 0; p++) - if (*p == ',') - c++; - if (c != 6) - return -1; - while ('0' <= *p && *p <= '9') - p++; - - return p - str; -} - -static int parse_decimal(const char *str, void *data) -{ - char *ep; - - *(int *)data = strtoul(str, &ep, 10); - if (ep == str) - return -1; - - return ep - str; -} - -/* validate and apply stuff */ -static int apply_lcd_timings(volatile unsigned short *memregs, void *data) -{ - int *lcd_timings = data; - int i; - - for (i = 0; i < 8; i++) { - if (lcd_timings[i] & ~0xffff) { - fprintf(stderr, "pollux_set: invalid lcd timing %d: %d\n", i, lcd_timings[i]); - return -1; - } - } - - for (i = 0; i < 8; i++) - memregs[(0x307c>>1) + i] = lcd_timings[i]; - - return 0; -} - -static const struct { - signed char adj; /* how to adjust value passed by user */ - signed short min; /* range of */ - signed short max; /* allowed values (inclusive) */ -} -ram_ranges[] = { - { 0, 1, 3 }, /* cas (cl) */ - { -2, 0, 15 }, /* trc */ - { -2, 0, 15 }, /* tras */ - { 0, 0, 15 }, /* twr */ - { 0, 0, 15 }, /* tmrd */ - { 0, 0, 15 }, /* trp */ - { 0, 0, 15 }, /* trcd */ -}; - -static int apply_ram_timings(volatile unsigned short *memregs, void *data) -{ - int *ram_timings = data; - int i, val; - - for (i = 0; i < 7; i++) - { - ram_timings[i] += ram_ranges[i].adj; - if (ram_timings[i] < ram_ranges[i].min || ram_timings[i] > ram_ranges[i].max) { - fprintf(stderr, "pollux_set: invalid RAM timing %d\n", i); - return -1; - } - } - - val = memregs[0x14802>>1] & 0x0f00; - val |= (ram_timings[4] << 12) | (ram_timings[5] << 4) | ram_timings[6]; - memregs[0x14802>>1] = val; - - val = memregs[0x14804>>1] & 0x4000; - val |= (ram_timings[0] << 12) | (ram_timings[1] << 8) | - (ram_timings[2] << 4) | ram_timings[3]; - val |= 0x8000; - memregs[0x14804>>1] = val; - - for (i = 0; i < 0x100000 && (memregs[0x14804>>1] & 0x8000); i++) - ; - - return 0; -} - -static int apply_dpc_clkdiv0(volatile unsigned short *memregs, void *data) -{ - int pcd = *(int *)data; - int tmp; - - if ((pcd - 1) & ~0x3f) { - fprintf(stderr, "pollux_set: invalid lcd clkdiv0: %d\n", pcd); - return -1; - } - - pcd = (pcd - 1) & 0x3f; - tmp = memregs[0x31c4>>1]; - memregs[0x31c4>>1] = (tmp & ~0x3f0) | (pcd << 4); - - return 0; -} - -static int apply_cpuclk(volatile unsigned short *memregs, void *data) -{ - volatile unsigned int *memregl = (volatile void *)memregs; - int mhz = *(int *)data; - int adiv, mdiv, pdiv, sdiv = 0; - int i, vf000, vf004; - - // m = MDIV, p = PDIV, s = SDIV - #define SYS_CLK_FREQ 27 - pdiv = 9; - mdiv = (mhz * pdiv) / SYS_CLK_FREQ; - if (mdiv & ~0x3ff) - return -1; - vf004 = (pdiv<<18) | (mdiv<<8) | sdiv; - - // attempt to keep AHB the divider close to 250, but not higher - for (adiv = 1; mhz / adiv > 250; adiv++) - ; - - vf000 = memregl[0xf000>>2]; - vf000 = (vf000 & ~0x3c0) | ((adiv - 1) << 6); - memregl[0xf000>>2] = vf000; - memregl[0xf004>>2] = vf004; - memregl[0xf07c>>2] |= 0x8000; - for (i = 0; (memregl[0xf07c>>2] & 0x8000) && i < 0x100000; i++) - ; - - printf("clock set to %dMHz, AHB set to %dMHz\n", mhz, mhz / adiv); - return 0; -} - -static int lcd_timings[8]; -static int ram_timings[7]; -static int dpc_clkdiv0; -static int cpuclk; - -static const char lcd_t_help[] = "htotal,hswidth,hastart,haend,vtotal,vswidth,vastart,vaend"; -static const char ram_t_help[] = "CAS,tRC,tRAS,tWR,tMRD,tRP,tRCD"; - -static const struct { - const char *name; - const char *help; - int (*parse)(const char *str, void *data); - int (*apply)(volatile unsigned short *memregs, void *data); - void *data; -} -all_params[] = { - { "lcd_timings", lcd_t_help, parse_lcd_timings, apply_lcd_timings, lcd_timings }, - { "ram_timings", ram_t_help, parse_ram_timings, apply_ram_timings, ram_timings }, - { "dpc_clkdiv0", "divider", parse_decimal, apply_dpc_clkdiv0, &dpc_clkdiv0 }, - { "clkdiv0", "divider", parse_decimal, apply_dpc_clkdiv0, &dpc_clkdiv0 }, /* alias */ - { "cpuclk", "MHZ", parse_decimal, apply_cpuclk, &cpuclk }, -}; -#define ALL_PARAM_COUNT (sizeof(all_params) / sizeof(all_params[0])) - -/* - * set timings based on preformated string - * returns 0 on success. - */ -int pollux_set(volatile unsigned short *memregs, const char *str) -{ - int parsed_params[ALL_PARAM_COUNT]; - int applied_params[ALL_PARAM_COUNT]; - int applied_something = 0; - const char *p, *po; - int i, ret; - - if (str == NULL) - return -1; - - memset(parsed_params, 0, sizeof(parsed_params)); - memset(applied_params, 0, sizeof(applied_params)); - - p = str; - while (1) - { -again: - while (*p == ';' || *p == ' ') - p++; - if (*p == 0) - break; - - for (i = 0; i < ALL_PARAM_COUNT; i++) - { - int param_len = strlen(all_params[i].name); - if (strncmp(p, all_params[i].name, param_len) == 0 && p[param_len] == '=') - { - p += param_len + 1; - ret = all_params[i].parse(p, all_params[i].data); - if (ret < 0) { - fprintf(stderr, "pollux_set parser: error at %-10s\n", p); - fprintf(stderr, " valid format is: <%s>\n", all_params[i].help); - return -1; - } - parsed_params[i] = 1; - p += ret; - goto again; - } - } - - /* Unknown param. Attempt to be forward compatible and ignore it. */ - for (po = p; *p != 0 && *p != ';'; p++) - ; - - fprintf(stderr, "unhandled param: "); - fwrite(po, 1, p - po, stderr); - fprintf(stderr, "\n"); - } - - /* validate and apply */ - for (i = 0; i < ALL_PARAM_COUNT; i++) - { - if (!parsed_params[i]) - continue; - - ret = all_params[i].apply(memregs, all_params[i].data); - if (ret < 0) { - fprintf(stderr, "pollux_set: failed to apply %s (bad value?)\n", - all_params[i].name); - continue; - } - - applied_something = 1; - applied_params[i] = 1; - } - - if (applied_something) - { - int c; - printf("applied: "); - for (i = c = 0; i < ALL_PARAM_COUNT; i++) - { - if (!applied_params[i]) - continue; - if (c != 0) - printf(", "); - printf("%s", all_params[i].name); - c++; - } - printf("\n"); - } - - return 0; -} - -#ifdef BINARY -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <sys/mman.h> -#include <unistd.h> - -static void usage(const char *binary) -{ - int i; - printf("usage:\n%s <set_str[;set_str[;...]]>\n" - "set_str:\n", binary); - for (i = 0; i < ALL_PARAM_COUNT; i++) - printf(" %s=<%s>\n", all_params[i].name, all_params[i].help); -} - -int main(int argc, char *argv[]) -{ - volatile unsigned short *memregs; - int ret, memdev; - - if (argc != 2) { - usage(argv[0]); - return 1; - } - - memdev = open("/dev/mem", O_RDWR); - if (memdev == -1) - { - perror("open(/dev/mem) failed"); - return 1; - } - - memregs = mmap(0, 0x20000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0xc0000000); - if (memregs == MAP_FAILED) - { - perror("mmap(memregs) failed"); - close(memdev); - return 1; - } - - ret = pollux_set(memregs, argv[1]); - - munmap((void *)memregs, 0x20000); - close(memdev); - - return ret; -} -#endif diff --git a/frontend/320240/skin/background.png b/frontend/320240/skin/background.png Binary files differdeleted file mode 100644 index 0efdd18..0000000 --- a/frontend/320240/skin/background.png +++ /dev/null diff --git a/frontend/320240/skin/font.png b/frontend/320240/skin/font.png Binary files differdeleted file mode 100644 index c526a08..0000000 --- a/frontend/320240/skin/font.png +++ /dev/null diff --git a/frontend/320240/skin/readme.txt b/frontend/320240/skin/readme.txt deleted file mode 100644 index dd83963..0000000 --- a/frontend/320240/skin/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -The skin images can be customized, but there are several limitations:
-
-background.png - must be 320x240 image with 24bit RGB colors.
-font.png - must be 128x160 8bit grayscale image.
-selector.png - must be 8x10 8bit grayscale image.
-
-Font and selector colors can be changed by editing skin.txt.
-
diff --git a/frontend/320240/skin/selector.png b/frontend/320240/skin/selector.png Binary files differdeleted file mode 100644 index 5062cc2..0000000 --- a/frontend/320240/skin/selector.png +++ /dev/null diff --git a/frontend/320240/skin/skin.txt b/frontend/320240/skin/skin.txt deleted file mode 100644 index 1d6979f..0000000 --- a/frontend/320240/skin/skin.txt +++ /dev/null @@ -1,4 +0,0 @@ -// html-style hex color codes, ex. ff0000 is red, 0000ff is blue, etc.
-text_color=ffffc0
-selection_color=808010
-
diff --git a/frontend/320240/ui_gp2x.h b/frontend/320240/ui_gp2x.h deleted file mode 100644 index a9c4413..0000000 --- a/frontend/320240/ui_gp2x.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef UI_FEATURES_H -#define UI_FEATURES_H - -#define MENU_BIOS_PATH "pcsx_rearmed/bios/" -#define MENU_SHOW_VARSCALER 0 -#define MENU_SHOW_VOUTMODE 0 -#define MENU_SHOW_SCALER2 1 -#define MENU_SHOW_NUBS_BTNS 0 -#define MENU_SHOW_VIBRATION 1 -#define MENU_SHOW_DEADZONE 1 -#define MENU_SHOW_MINIMIZE 0 -#define MENU_SHOW_FULLSCREEN 0 -#define MENU_SHOW_VOLUME 1 - -#endif // UI_FEATURES_H diff --git a/frontend/libretro.c b/frontend/libretro.c index 919fabb..785213b 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -135,6 +135,16 @@ static int snd_init(void){return 0;} static void snd_finish(void){} static int snd_busy(void){return 0;} +#define GPU_PEOPS_ODD_EVEN_BIT (1 << 0) +#define GPU_PEOPS_EXPAND_SCREEN_WIDTH (1 << 1) +#define GPU_PEOPS_IGNORE_BRIGHTNESS (1 << 2) +#define GPU_PEOPS_DISABLE_COORD_CHECK (1 << 3) +#define GPU_PEOPS_LAZY_SCREEN_UPDATE (1 << 6) +#define GPU_PEOPS_OLD_FRAME_SKIP (1 << 7) +#define GPU_PEOPS_REPEATED_TRIANGLES (1 << 8) +#define GPU_PEOPS_QUADS_WITH_TRIANGLES (1 << 9) +#define GPU_PEOPS_FAKE_BUSY_STATE (1 << 10) + static void init_memcard(char *mcd_data) { unsigned off = 0; @@ -963,11 +973,11 @@ static struct retro_disk_control_callback disk_control = { #define PATH_MAX 4096 #endif -static char base_dir[PATH_MAX]; +static char base_dir[1024]; static bool read_m3u(const char *file) { - char line[PATH_MAX]; + char line[1024]; char name[PATH_MAX]; FILE *f = fopen(file, "r"); if (!f) @@ -1324,7 +1334,7 @@ size_t retro_get_memory_size(unsigned id) if (id == RETRO_MEMORY_SAVE_RAM) return MCD_SIZE; else if (id == RETRO_MEMORY_SYSTEM_RAM) - return 0x210000; + return 0x200000; else return 0; } @@ -1636,91 +1646,91 @@ static void update_variables(bool in_flight) #ifdef GPU_PEOPS var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_0"; + var.key = "pcsx_rearmed_gpu_peops_odd_even_bit"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 0); + gpu_peops_fix |= GPU_PEOPS_ODD_EVEN_BIT; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_1"; + var.key = "pcsx_rearmed_gpu_peops_expand_screen_width"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 1); + gpu_peops_fix |= GPU_PEOPS_EXPAND_SCREEN_WIDTH; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_2"; + var.key = "pcsx_rearmed_gpu_peops_ignore_brightness"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 2); + gpu_peops_fix |= GPU_PEOPS_IGNORE_BRIGHTNESS; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_3"; + var.key = "pcsx_rearmed_gpu_peops_disable_coord_check"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 3); + gpu_peops_fix |= GPU_PEOPS_DISABLE_COORD_CHECK; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_6"; + var.key = "pcsx_rearmed_gpu_peops_lazy_screen_update"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 6); + gpu_peops_fix |= GPU_PEOPS_LAZY_SCREEN_UPDATE; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_7"; + var.key = "pcsx_rearmed_gpu_peops_old_frame_skip"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 7); + gpu_peops_fix |= GPU_PEOPS_OLD_FRAME_SKIP; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_8"; + var.key = "pcsx_rearmed_gpu_peops_repeated_triangles"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 8); + gpu_peops_fix |= GPU_PEOPS_REPEATED_TRIANGLES; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_9"; + var.key = "pcsx_rearmed_gpu_peops_quads_with_triangles"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 9); + gpu_peops_fix |= GPU_PEOPS_QUADS_WITH_TRIANGLES; } var.value = "NULL"; - var.key = "pcsx_rearmed_gpu_peops_fix_10"; + var.key = "pcsx_rearmed_gpu_peops_fake_busy_state"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= (1 << 10); + gpu_peops_fix |= GPU_PEOPS_FAKE_BUSY_STATE; } if (pl_rearmed_cbs.gpu_peops.dwActFixes != gpu_peops_fix) pl_rearmed_cbs.gpu_peops.dwActFixes = gpu_peops_fix; - /* Show/hide core options */ + /* Show/hide core options */ var.key = "pcsx_rearmed_show_gpu_peops_settings"; var.value = NULL; @@ -1737,16 +1747,16 @@ static void update_variables(bool in_flight) { unsigned i; struct retro_core_option_display option_display; - char gpu_peops_option[9][32] = { - "pcsx_rearmed_gpu_peops_fix_0", - "pcsx_rearmed_gpu_peops_fix_1", - "pcsx_rearmed_gpu_peops_fix_2", - "pcsx_rearmed_gpu_peops_fix_3", - "pcsx_rearmed_gpu_peops_fix_6", - "pcsx_rearmed_gpu_peops_fix_7", - "pcsx_rearmed_gpu_peops_fix_8", - "pcsx_rearmed_gpu_peops_fix_9", - "pcsx_rearmed_gpu_peops_fix_10", + char gpu_peops_option[9][45] = { + "pcsx_rearmed_gpu_peops_odd_even_bit", + "pcsx_rearmed_gpu_peops_expand_screen_width", + "pcsx_rearmed_gpu_peops_ignore_brightness", + "pcsx_rearmed_gpu_peops_disable_coord_check", + "pcsx_rearmed_gpu_peops_lazy_screen_update", + "pcsx_rearmed_gpu_peops_old_frame_skip", + "pcsx_rearmed_gpu_peops_repeated_triangles", + "pcsx_rearmed_gpu_peops_quads_with_triangles", + "pcsx_rearmed_gpu_peops_fake_busy_state", }; option_display.visible = show_advanced_gpu_peops_settings; @@ -2161,7 +2171,7 @@ static bool find_any_bios(const char *dirpath, char *path, size_t path_size) return false; while ((ent = readdir(dir))) { - if (strncasecmp(ent->d_name, "scph", 4) != 0) + if ((strncasecmp(ent->d_name, "scph", 4) != 0) && (strncasecmp(ent->d_name, "psx", 3) != 0)) continue; snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name); @@ -2223,10 +2233,11 @@ static int init_memcards(void) static void loadPSXBios(void) { const char *dir; - char path[256]; + char path[PATH_MAX]; unsigned useHLE = 0; const char *bios[] = { + "PSXONPSP660", "psxonpsp660", "SCPH101", "scph101", "SCPH5501", "scph5501", "SCPH7001", "scph7001", @@ -2340,7 +2351,7 @@ void retro_init(void) cycle_multiplier = 200; #endif pl_rearmed_cbs.gpu_peops.iUseDither = 1; - pl_rearmed_cbs.gpu_peops.dwActFixes = 1 << 7; + pl_rearmed_cbs.gpu_peops.dwActFixes = GPU_PEOPS_OLD_FRAME_SKIP; spu_config.iUseFixedUpdates = 1; SaveFuncs.open = save_open; @@ -2358,6 +2369,7 @@ void retro_init(void) void retro_deinit(void) { + ClosePlugins(); SysClose(); #ifdef _3DS linearFree(vout_buf); diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h index bfb21a5..1ecc9a9 100644 --- a/frontend/libretro_core_options.h +++ b/frontend/libretro_core_options.h @@ -7,6 +7,28 @@ #include <libretro.h> #include <retro_inline.h> +#ifndef HAVE_NO_LANGEXTRA +#include "libretro_core_options_intl.h" +#endif + +/* + ******************************** + * VERSION: 1.3 + ******************************** + * + * - 1.3: Move translations to libretro_core_options_intl.h + * - libretro_core_options_intl.h includes BOM and utf-8 + * fix for MSVC 2010-2013 + * - Added HAVE_NO_LANGEXTRA flag to disable translations + * on platforms/compilers without BOM support + * - 1.2: Use core options v1 interface when + * RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION is >= 1 + * (previously required RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION == 1) + * - 1.1: Support generation of core options v0 retro_core_option_value + * arrays containing options with a single value + * - 1.0: First commit +*/ + #ifdef __cplusplus extern "C" { #endif @@ -27,14 +49,6 @@ extern "C" { * frontend language definition */ -#ifdef HAVE_PRE_ARMV7 -#define PSX_CLOCK_DEFAULT "50" -#define PSX_CLOCK_LABEL "Overclock or underclock the PSX clock. Default is 50" -#else -#define PSX_CLOCK_DEFAULT "57" -#define PSX_CLOCK_LABEL "Overclock or underclock the PSX clock. Default is 57" -#endif - struct retro_core_option_definition option_defs_us[] = { { "pcsx_rearmed_frameskip", @@ -45,7 +59,7 @@ struct retro_core_option_definition option_defs_us[] = { { "1", NULL }, { "2", NULL }, { "3", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "0", }, @@ -55,8 +69,8 @@ struct retro_core_option_definition option_defs_us[] = { "Allows you to use real bios file (if available) or emulated bios (HLE). Its recommended to use official bios file for better compatibility.", { { "auto", "auto" }, - { "HLE", "hle" }, - { NULL, NULL}, + { "HLE", "hle" }, + { NULL, NULL }, }, "auto", }, @@ -67,8 +81,8 @@ struct retro_core_option_definition option_defs_us[] = { { { "auto", "auto" }, { "NTSC", "ntsc" }, - { "PAL", "pal" }, - { NULL, NULL}, + { "PAL", "pal" }, + { NULL, NULL }, }, "auto", }, @@ -77,23 +91,23 @@ struct retro_core_option_definition option_defs_us[] = { "Enable Second Memory Card (Shared)", "Enabled the memory card slot 2. This memory card is shared amongst all games.", { - { "disable", NULL }, + { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, - "disable", + "disabled", }, { "pcsx_rearmed_pad1type", "Pad 1 Type", "Pad type for player 1", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "standard", }, @@ -102,12 +116,12 @@ struct retro_core_option_definition option_defs_us[] = { "Pad 2 Type", "Pad type for player 2", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "standard", }, @@ -116,12 +130,12 @@ struct retro_core_option_definition option_defs_us[] = { "Pad 3 Type", "Pad type for player 3", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "none", }, @@ -130,12 +144,12 @@ struct retro_core_option_definition option_defs_us[] = { "Pad 4 Type", "Pad type for player 4", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "none", }, @@ -144,12 +158,12 @@ struct retro_core_option_definition option_defs_us[] = { "Pad 5 Type", "Pad type for player 5", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "none", },{ @@ -157,12 +171,12 @@ struct retro_core_option_definition option_defs_us[] = { "Pad 6 Type", "Pad type for player 6", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "none", },{ @@ -170,12 +184,12 @@ struct retro_core_option_definition option_defs_us[] = { "Pad 7 Type", "Pad type for player 7", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "none", },{ @@ -183,12 +197,12 @@ struct retro_core_option_definition option_defs_us[] = { "Pad 8 Type", "Pad type for player 8", { - { "standard", NULL }, - { "analog", NULL }, + { "standard", NULL }, + { "analog", NULL }, { "dualshock", NULL }, - { "negcon", NULL }, - { "none", NULL }, - { NULL, NULL}, + { "negcon", NULL }, + { "none", NULL }, + { NULL, NULL }, }, "none", }, @@ -197,10 +211,10 @@ struct retro_core_option_definition option_defs_us[] = { "Multitap 1", "Enables/Disables multitap on port 1, allowing upto 5 players in games that permit it.", { - { "auto", NULL }, + { "auto", NULL }, { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "auto", }, @@ -209,10 +223,10 @@ struct retro_core_option_definition option_defs_us[] = { "Multitap 2", "Enables/Disables multitap on port 2, allowing up to 8 players in games that permit it. Multitap 1 has to be enabled for this to work.", { - { "auto", NULL }, - { "disabled", NULL }, - { "enabled", NULL }, - { NULL, NULL}, + { "auto", NULL }, + { "disabled", NULL }, + { "enabled", NULL }, + { NULL, NULL }, }, "auto", }, @@ -228,7 +242,7 @@ struct retro_core_option_definition option_defs_us[] = { { "20", NULL }, { "25", NULL }, { "30", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "0", }, @@ -237,10 +251,10 @@ struct retro_core_option_definition option_defs_us[] = { "NegCon Twist Response", "Specifies the analog response when using a RetroPad left analog stick to simulate the 'twist' action of emulated neGcon Controllers.", { - { "linear", NULL }, + { "linear", NULL }, { "quadratic", NULL }, - { "cubic", NULL }, - { NULL, NULL}, + { "cubic", NULL }, + { NULL, NULL }, }, "linear", }, @@ -251,7 +265,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, @@ -262,7 +276,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, @@ -275,89 +289,97 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, { "pcsx_rearmed_psxclock", "PSX CPU Clock", - PSX_CLOCK_LABEL, +#ifdef HAVE_PRE_ARMV7 + "Overclock or underclock the PSX clock. Default is 50", +#else + "Overclock or underclock the PSX clock. Default is 57", +#endif { - { "30", NULL }, - { "31", NULL }, - { "32", NULL }, - { "33", NULL }, - { "34", NULL }, - { "35", NULL }, - { "36", NULL }, - { "37", NULL }, - { "38", NULL }, - { "39", NULL }, - { "40", NULL }, - { "41", NULL }, - { "42", NULL }, - { "43", NULL }, - { "44", NULL }, - { "45", NULL }, - { "46", NULL }, - { "47", NULL }, - { "48", NULL }, - { "49", NULL }, - { "50", NULL }, - { "51", NULL }, - { "52", NULL }, - { "53", NULL }, - { "54", NULL }, - { "55", NULL }, - { "56", NULL }, - { "57", NULL }, - { "58", NULL }, - { "59", NULL }, - { "60", NULL }, - { "61", NULL }, - { "62", NULL }, - { "63", NULL }, - { "64", NULL }, - { "65", NULL }, - { "66", NULL }, - { "67", NULL }, - { "68", NULL }, - { "69", NULL }, - { "70", NULL }, - { "71", NULL }, - { "72", NULL }, - { "73", NULL }, - { "74", NULL }, - { "75", NULL }, - { "76", NULL }, - { "77", NULL }, - { "78", NULL }, - { "79", NULL }, - { "80", NULL }, - { "81", NULL }, - { "82", NULL }, - { "83", NULL }, - { "84", NULL }, - { "85", NULL }, - { "86", NULL }, - { "87", NULL }, - { "88", NULL }, - { "89", NULL }, - { "90", NULL }, - { "91", NULL }, - { "92", NULL }, - { "93", NULL }, - { "94", NULL }, - { "95", NULL }, - { "96", NULL }, - { "97", NULL }, - { "98", NULL }, - { "99", NULL }, + { "30", NULL }, + { "31", NULL }, + { "32", NULL }, + { "33", NULL }, + { "34", NULL }, + { "35", NULL }, + { "36", NULL }, + { "37", NULL }, + { "38", NULL }, + { "39", NULL }, + { "40", NULL }, + { "41", NULL }, + { "42", NULL }, + { "43", NULL }, + { "44", NULL }, + { "45", NULL }, + { "46", NULL }, + { "47", NULL }, + { "48", NULL }, + { "49", NULL }, + { "50", NULL }, + { "51", NULL }, + { "52", NULL }, + { "53", NULL }, + { "54", NULL }, + { "55", NULL }, + { "56", NULL }, + { "57", NULL }, + { "58", NULL }, + { "59", NULL }, + { "60", NULL }, + { "61", NULL }, + { "62", NULL }, + { "63", NULL }, + { "64", NULL }, + { "65", NULL }, + { "66", NULL }, + { "67", NULL }, + { "68", NULL }, + { "69", NULL }, + { "70", NULL }, + { "71", NULL }, + { "72", NULL }, + { "73", NULL }, + { "74", NULL }, + { "75", NULL }, + { "76", NULL }, + { "77", NULL }, + { "78", NULL }, + { "79", NULL }, + { "80", NULL }, + { "81", NULL }, + { "82", NULL }, + { "83", NULL }, + { "84", NULL }, + { "85", NULL }, + { "86", NULL }, + { "87", NULL }, + { "88", NULL }, + { "89", NULL }, + { "90", NULL }, + { "91", NULL }, + { "92", NULL }, + { "93", NULL }, + { "94", NULL }, + { "95", NULL }, + { "96", NULL }, + { "97", NULL }, + { "98", NULL }, + { "99", NULL }, { "100", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, - PSX_CLOCK_DEFAULT, +#ifdef HAVE_PRE_ARMV7 + "50", +#else + "57", +#endif }, #endif /* DRC_DISABLE */ @@ -369,7 +391,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -380,7 +402,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -391,7 +413,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -404,7 +426,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, @@ -415,7 +437,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -429,106 +451,106 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_0", + "pcsx_rearmed_gpu_peops_odd_even_bit", "(GPU) Odd/Even Bit Hack", "Needed for Chrono Cross.", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_1", + "pcsx_rearmed_gpu_peops_expand_screen_width", "(GPU) Expand Screen Width", "Capcom fighting games", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_2", + "pcsx_rearmed_gpu_peops_ignore_brightness", "(GPU) Ignore Brightness Color", "Black screens in Lunar Silver Star Story games", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_3", + "pcsx_rearmed_gpu_peops_disable_coord_check", "(GPU) Disable Coordinate Check", "Compatibility mode", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_6", + "pcsx_rearmed_gpu_peops_lazy_screen_update", "(GPU) Lazy Screen Update", "Pandemonium 2", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_7", + "pcsx_rearmed_gpu_peops_old_frame_skip", "(GPU) Old Frame Skipping", "Skip every second frame", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, { - "pcsx_rearmed_gpu_peops_fix_8", + "pcsx_rearmed_gpu_peops_repeated_triangles", "(GPU) Repeated Flat Tex Triangles", "Needed by Star Wars: Dark Forces", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_9", + "pcsx_rearmed_gpu_peops_quads_with_triangles", "(GPU) Draw Quads with Triangles", "Better g-colors, worse textures", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, { - "pcsx_rearmed_gpu_peops_fix_10", + "pcsx_rearmed_gpu_peops_fake_busy_state", "(GPU) Fake 'Gpu Busy' States", "Toggle busy flags after drawing", { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -611,7 +633,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -622,7 +644,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, @@ -631,11 +653,11 @@ struct retro_core_option_definition option_defs_us[] = { "Sound Interpolation", NULL, { - { "simple", NULL }, - { "gaussian", NULL }, - { "cubic", NULL }, - { "off", NULL }, - { NULL, NULL}, + { "simple", "Simple" }, + { "gaussian", "Gaussian" }, + { "cubic", "Cubic" }, + { "off", "disabled" }, + { NULL, NULL }, }, "simple", }, @@ -646,7 +668,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -657,7 +679,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -668,7 +690,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -681,7 +703,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, @@ -692,7 +714,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "enabled", }, @@ -705,7 +727,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -716,7 +738,7 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, + { NULL, NULL }, }, "disabled", }, @@ -727,542 +749,22 @@ struct retro_core_option_definition option_defs_us[] = { { { "disabled", NULL }, { "enabled", NULL }, - { NULL, NULL}, - }, - "disabled", - }, -#endif /* DRC_DISABLE */ - - { NULL, NULL, NULL, { {0} }, NULL }, -}; - -/* RETRO_LANGUAGE_JAPANESE */ - -/* RETRO_LANGUAGE_FRENCH */ - -/* RETRO_LANGUAGE_SPANISH */ - -/* RETRO_LANGUAGE_GERMAN */ - -/* RETRO_LANGUAGE_ITALIAN */ - -/* RETRO_LANGUAGE_DUTCH */ - -/* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */ - -/* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */ - -/* RETRO_LANGUAGE_RUSSIAN */ - -/* RETRO_LANGUAGE_KOREAN */ - -/* RETRO_LANGUAGE_CHINESE_TRADITIONAL */ - -/* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */ - -/* RETRO_LANGUAGE_ESPERANTO */ - -/* RETRO_LANGUAGE_POLISH */ - -/* RETRO_LANGUAGE_VIETNAMESE */ - -/* RETRO_LANGUAGE_ARABIC */ - -/* RETRO_LANGUAGE_GREEK */ - -/* RETRO_LANGUAGE_TURKISH */ - -struct retro_core_option_definition option_defs_tr[] = { - { - "pcsx_rearmed_frameskip", - "Kare Atlama", - "Görsel pürüzsüzlük pahasına performansı artırmak için ne kadar karenin atlanması gerektiÄŸini seçin.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_bios", - "BIOS Kullan", - "Gerçek bios dosyasını (varsa) veya öykünmüş bios'u (HLE) kullanmanızı saÄŸlar. Daha iyi uyumluluk için resmi bios dosyasını kullanmanız önerilir.", - { - { "auto", "otomatik" }, - { "HLE", "hle" }, - { NULL, NULL}, - }, - "auto", - }, - { - "pcsx_rearmed_region", - "Bölge", - "Sistemin hangi bölgeden olduÄŸunu seçin. NTSC için 60 Hz, PAL için 50 Hz.", - { - { "auto", "otomatik" }, - { "NTSC", "ntsc" }, - { "PAL", "pal" }, - { NULL, NULL}, - }, - "auto", - }, - { - "pcsx_rearmed_memcard2", - "Ä°kinci Bellek Kartını EtkinleÅŸtir (Paylaşılan)", - "2. Hafıza kartı yuvasını etkinleÅŸtirin. Bu hafıza kartı tüm oyunlar arasında paylaşılır.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_pad1type", - "Kumanda 1 Tipi", - "1. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "standard", - }, - { - "pcsx_rearmed_pad2type", - "Kumanda 2 Tipi", - "2. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "standard", - }, - { - "pcsx_rearmed_pad3type", - "Kumanda 3 Tipi", - "3. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "none", - }, - { - "pcsx_rearmed_pad4type", - "Kumanda 4 Tipi", - "4. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "none", - }, - { - "pcsx_rearmed_pad5type", - "Kumanda 5 Tipi", - "5. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "none", - },{ - "pcsx_rearmed_pad6type", - "Kumanda 6 Tipi", - "6. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "none", - },{ - "pcsx_rearmed_pad7type", - "Kumanda 7 Tipi", - "7. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "none", - },{ - "pcsx_rearmed_pad8type", - "Kumanda 8 Tipi", - "8. Oyuncu için kontrolör tipi", - { - { "standard", NULL }, - { "analog", NULL }, - { "dualshock", NULL }, - { "negcon", NULL }, - { "none", "hiçbiri" }, - { NULL, NULL}, - }, - "none", - }, - { - "pcsx_rearmed_multitap1", - "Multitap 1", - "BaÄŸlantı noktası 1'deki multitap'ı etkinleÅŸtirir / devre dışı bırakır ve izin veren oyunlarda 5 oyuncuya kadar izin verir.", - { - { "auto", "otomatik" }, - { "disabled", NULL }, - { "enabled", NULL }, - { NULL, NULL}, - }, - "auto", - }, - { - "pcsx_rearmed_multitap2", - "Multitap 2", - "BaÄŸlantı noktası 2'deki multitap'ı etkinleÅŸtirir/devre dışı bırakır ve izin veren oyunlarda 8 oyuncuya kadar izin verir. Bunun çalışması için Multitap 1'in etkinleÅŸtirilmesi gerekir.", - { - { "auto", "otomatik" }, - { "disabled", NULL }, - { "enabled", NULL }, - { NULL, NULL}, - }, - "auto", - }, - { - "pcsx_rearmed_negcon_deadzone", - "NegCon Twist Deadzone (Yüzdelik)", - "Öykünülmüş neGcon kontrolörünün 'büküm' eylemini simüle ederken RetroPad sol analog çubuÄŸunun ölü bölgesini ayarlar. Sürüklenme/istenmeyen giriÅŸi ortadan kaldırmak için kullanılır.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_negcon_response", - "NegCon Twist Response", - "Öykünülmüş neGcon kontrolörünün 'bükümünü' simule etmek için bir RetroPad sol analog çubuÄŸu kullanırken analog cevabını belirtir.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_vibration", - "TitreÅŸimi EtkinleÅŸtir", - "TitreÅŸim özelliklerini destekleyen kontrolörler için titreÅŸim geri bildirimini etkinleÅŸtirir.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_dithering", - "Dithering EtkinleÅŸtir", - "Kapalı ise, PSX'in renk bantlarıyla mücadele etmek için uyguladığı renk taklidi düzenini devre dışı bırakır.", - { - { NULL, NULL }, - }, - NULL - }, - -#ifndef DRC_DISABLE - { - "pcsx_rearmed_drc", - "Dinamik Yeniden Derleyici", - "ÇekirdeÄŸin dinamik yeniden derleyici veya tercüman(daha yavaÅŸ) CPU talimatlarını kullanmasını saÄŸlar.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_psxclock", - "PSX CPU Saat Hızı", - PSX_CLOCK_LABEL, - { - { NULL, NULL }, - }, - NULL - }, -#endif /* DRC_DISABLE */ - -#ifdef __ARM_NEON__ - { - "pcsx_rearmed_neon_interlace_enable", - "Interlacing Mode'u etkinleÅŸtir", - "Sahte tarama çizgileri efektini etkinleÅŸtirir.", - { { NULL, NULL }, }, - NULL - }, - { - "pcsx_rearmed_neon_enhancement_enable", - "GeliÅŸtirilmiÅŸ Çözünürlük (YavaÅŸ)", - "Düşük performans pahasına çift çözünürlükte iÅŸler.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_neon_enhancement_no_main", - "GeliÅŸtirilmiÅŸ Çözünürlük (Speed Hack)", - "GeliÅŸtirilmiÅŸ çözünürlük seçeneÄŸi için hız aşırtma(bazı oyunlarda sorun çıkartabilir).", - { - { NULL, NULL }, - }, - NULL - }, -#endif /* __ARM_NEON__ */ - - { - "pcsx_rearmed_duping_enable", - "Frame Duping", - "Yeni bir veri yoksa, bir hızlandırma, son kareyi yeniden çizer/yeniden kullanır.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_display_internal_fps", - "Dahili FPS'yi görüntüle", - "EtkinleÅŸtirildiÄŸinde ekranda saniye başına kareyi gösterir.", - { - { NULL, NULL }, - }, - NULL - }, - - /* GPU PEOPS OPTIONS */ -#ifdef DRC_DISABLE - { - "pcsx_rearmed_show_gpu_peops_settings", - "GeliÅŸmiÅŸ GPU Ayarlarını Göster", - "ÇeÅŸitli GPU düzeltmelerini etkinleÅŸtirin veya devre dışı bırakın. Ayarların etkili olması için core'un yeniden baÅŸlatılması gerekebilir. NOT: Bu ayarın etkili olabilmesi için Hızlı Menü’nün deÄŸiÅŸtirilmesi gerekir.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_0", - "(GPU) Odd/Even Bit Hack", - "Chrono Cross için gerekli.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_1", - "(GPU) Ekran GeniÅŸliÄŸini GeniÅŸlet", - "Capcom dövüş oyunları", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_2", - "(GPU) Parlaklık Rengini Yoksay", - "Lunar Silver Star Story oyunlarında siyah ekran", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_3", - "(GPU) Koordinat Kontrolünü Devre Dışı Bırak", - "Uyumluluk modu", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_6", - "(GPU) Tembel Ekran Güncellemesi", - "Pandemonium 2", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_7", - "(GPU) Eski Çerçeve Atlama", - "Her ikinci kareyi atla", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_8", - "(GPU) Tekrarlanan Düz Doku Üçgenleri", - "Star Wars: Dark Forces için gerekli", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_9", - "(GPU) Üçgenler ile Dörtlü Çiz", - "Daha iyi g renkler, daha kötü dokular", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gpu_peops_fix_10", - "(GPU) Sahte 'Gpu MeÅŸgul' Konumları", - "Çizimden sonra meÅŸgul bayraklarını deÄŸiÅŸtir", - { - { NULL, NULL }, - }, - NULL - }, -#endif - - { - "pcsx_rearmed_show_bios_bootlogo", - "Bios Bootlogo'yu Göster", - "EtkinleÅŸtirildiÄŸinde, baÅŸlatırken veya sıfırlarken PlayStation logosunu gösterir. (Bazı oyunları bozabilir).", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_spu_reverb", - "Ses Yankısı", - "Ses yankı efektini etkinleÅŸtirir veya devre dışı bırakır.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_spu_interpolation", - "Ses Enterpolasyonu", - NULL, - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_idiablofix", - "Diablo Müzik Düzeltmesi", - NULL, - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_pe2_fix", - "Parasite Eve 2/Vandal Hearts 1/2 Düzeltmleri", - NULL, - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_inuyasha_fix", - "InuYasha Sengoku Battle Düzeltmesi", - NULL, - { - { NULL, NULL }, - }, - NULL - }, - - /* ADVANCED OPTIONS */ - { - "pcsx_rearmed_noxadecoding", - "XA Kod Çözme", - NULL, - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_nocdaudio", - "CD Ses", - NULL, - { - { NULL, NULL }, - }, - NULL - }, - -#ifndef DRC_DISABLE - { - "pcsx_rearmed_nosmccheck", - "(Speed Hack) SMC Kontrollerini Devre Dışı Bırak", - "Yükleme sırasında çökmelere neden olabilir, hafıza kartını bozabilir.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_gteregsunneeded", - "(Speed Hack) GTE'nin Gereksiz OlduÄŸunu Varsayın", - "Grafiksel bozukluklara neden olabilir.", - { - { NULL, NULL }, - }, - NULL - }, - { - "pcsx_rearmed_nogteflags", - "(Speed Hack) GTE Bayraklarını Devredışı Bırakın", - "Grafiksel bozukluklara neden olur.", - { - { NULL, NULL }, - }, - NULL + "disabled", }, #endif /* DRC_DISABLE */ - { NULL, NULL, NULL, { {0} }, NULL }, + { NULL, NULL, NULL, {{0}}, NULL }, }; - /* ******************************** * Language Mapping ******************************** */ +#ifndef HAVE_NO_LANGEXTRA struct retro_core_option_definition *option_defs_intl[RETRO_LANGUAGE_LAST] = { option_defs_us, /* RETRO_LANGUAGE_ENGLISH */ NULL, /* RETRO_LANGUAGE_JAPANESE */ @@ -1282,8 +784,9 @@ struct retro_core_option_definition *option_defs_intl[RETRO_LANGUAGE_LAST] = { NULL, /* RETRO_LANGUAGE_VIETNAMESE */ NULL, /* RETRO_LANGUAGE_ARABIC */ NULL, /* RETRO_LANGUAGE_GREEK */ - option_defs_tr, /* RETRO_LANGUAGE_TURKISH */ + option_defs_tr, /* RETRO_LANGUAGE_TURKISH */ }; +#endif /* ******************************** @@ -1292,7 +795,8 @@ struct retro_core_option_definition *option_defs_intl[RETRO_LANGUAGE_LAST] = { */ /* Handles configuration/setting of core options. - * Should only be called inside retro_set_environment(). + * Should be called as early as possible - ideally inside + * retro_set_environment(), and no later than retro_load_game() * > We place the function body in the header to avoid the * necessity of adding more .c files (i.e. want this to * be as painless as possible for core devs) @@ -1305,8 +809,9 @@ static INLINE void libretro_set_core_options(retro_environment_t environ_cb) if (!environ_cb) return; - if (environ_cb(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &version) && (version == 1)) + if (environ_cb(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &version) && (version >= 1)) { +#ifndef HAVE_NO_LANGEXTRA struct retro_core_options_intl core_options_intl; unsigned language = 0; @@ -1318,6 +823,9 @@ static INLINE void libretro_set_core_options(retro_environment_t environ_cb) core_options_intl.local = option_defs_intl[language]; environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL, &core_options_intl); +#else + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS, &option_defs_us); +#endif } else { @@ -1387,7 +895,7 @@ static INLINE void libretro_set_core_options(retro_environment_t environ_cb) } /* Build values string */ - if (num_values > 1) + if (num_values > 0) { size_t j; diff --git a/frontend/libretro_core_options_intl.h b/frontend/libretro_core_options_intl.h new file mode 100644 index 0000000..16c40a0 --- /dev/null +++ b/frontend/libretro_core_options_intl.h @@ -0,0 +1,568 @@ +#ifndef LIBRETRO_CORE_OPTIONS_INTL_H__ +#define LIBRETRO_CORE_OPTIONS_INTL_H__ + +#if defined(_MSC_VER) && (_MSC_VER >= 1500 && _MSC_VER < 1900) +/* https://support.microsoft.com/en-us/kb/980263 */ +#pragma execution_character_set("utf-8") +#pragma warning(disable:4566) +#endif + +#include <libretro.h> + +/* + ******************************** + * VERSION: 1.3 + ******************************** + * + * - 1.3: Move translations to libretro_core_options_intl.h + * - libretro_core_options_intl.h includes BOM and utf-8 + * fix for MSVC 2010-2013 + * - Added HAVE_NO_LANGEXTRA flag to disable translations + * on platforms/compilers without BOM support + * - 1.2: Use core options v1 interface when + * RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION is >= 1 + * (previously required RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION == 1) + * - 1.1: Support generation of core options v0 retro_core_option_value + * arrays containing options with a single value + * - 1.0: First commit +*/ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + ******************************** + * Core Option Definitions + ******************************** +*/ + +/* RETRO_LANGUAGE_JAPANESE */ + +/* RETRO_LANGUAGE_FRENCH */ + +/* RETRO_LANGUAGE_SPANISH */ + +/* RETRO_LANGUAGE_GERMAN */ + +/* RETRO_LANGUAGE_ITALIAN */ + +/* RETRO_LANGUAGE_DUTCH */ + +/* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */ + +/* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */ + +/* RETRO_LANGUAGE_RUSSIAN */ + +/* RETRO_LANGUAGE_KOREAN */ + +/* RETRO_LANGUAGE_CHINESE_TRADITIONAL */ + +/* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */ + +/* RETRO_LANGUAGE_ESPERANTO */ + +/* RETRO_LANGUAGE_POLISH */ + +/* RETRO_LANGUAGE_VIETNAMESE */ + +/* RETRO_LANGUAGE_ARABIC */ + +/* RETRO_LANGUAGE_GREEK */ + +/* RETRO_LANGUAGE_TURKISH */ + +struct retro_core_option_definition option_defs_tr[] = { + { + "pcsx_rearmed_frameskip", + "Kare Atlama", + "Görsel pürüzsüzlük pahasına performansı artırmak için ne kadar karenin atlanması gerektiÄŸini seçin.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_bios", + "BIOS Kullan", + "Gerçek bios dosyasını (varsa) veya öykünmüş bios'u (HLE) kullanmanızı saÄŸlar. Daha iyi uyumluluk için resmi bios dosyasını kullanmanız önerilir.", + { + { "auto", "otomatik" }, + { "HLE", "hle" }, + { NULL, NULL }, + }, + "auto", + }, + { + "pcsx_rearmed_region", + "Bölge", + "Sistemin hangi bölgeden olduÄŸunu seçin. NTSC için 60 Hz, PAL için 50 Hz.", + { + { "auto", "otomatik" }, + { "NTSC", "ntsc" }, + { "PAL", "pal" }, + { NULL, NULL }, + }, + "auto", + }, + { + "pcsx_rearmed_memcard2", + "Ä°kinci Bellek Kartını EtkinleÅŸtir (Paylaşılan)", + "2. Hafıza kartı yuvasını etkinleÅŸtirin. Bu hafıza kartı tüm oyunlar arasında paylaşılır.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_pad1type", + "Kumanda 1 Tipi", + "1. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "standard", + }, + { + "pcsx_rearmed_pad2type", + "Kumanda 2 Tipi", + "2. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "standard", + }, + { + "pcsx_rearmed_pad3type", + "Kumanda 3 Tipi", + "3. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "none", + }, + { + "pcsx_rearmed_pad4type", + "Kumanda 4 Tipi", + "4. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "none", + }, + { + "pcsx_rearmed_pad5type", + "Kumanda 5 Tipi", + "5. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "none", + },{ + "pcsx_rearmed_pad6type", + "Kumanda 6 Tipi", + "6. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "none", + },{ + "pcsx_rearmed_pad7type", + "Kumanda 7 Tipi", + "7. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "none", + },{ + "pcsx_rearmed_pad8type", + "Kumanda 8 Tipi", + "8. Oyuncu için kontrolör tipi", + { + { "standard", NULL }, + { "analog", NULL }, + { "dualshock", NULL }, + { "negcon", NULL }, + { "none", "hiçbiri" }, + { NULL, NULL }, + }, + "none", + }, + { + "pcsx_rearmed_multitap1", + "Multitap 1", + "BaÄŸlantı noktası 1'deki multitap'ı etkinleÅŸtirir / devre dışı bırakır ve izin veren oyunlarda 5 oyuncuya kadar izin verir.", + { + { "auto", "otomatik" }, + { "disabled", NULL }, + { "enabled", NULL }, + { NULL, NULL }, + }, + "auto", + }, + { + "pcsx_rearmed_multitap2", + "Multitap 2", + "BaÄŸlantı noktası 2'deki multitap'ı etkinleÅŸtirir/devre dışı bırakır ve izin veren oyunlarda 8 oyuncuya kadar izin verir. Bunun çalışması için Multitap 1'in etkinleÅŸtirilmesi gerekir.", + { + { "auto", "otomatik" }, + { "disabled", NULL }, + { "enabled", NULL }, + { NULL, NULL }, + }, + "auto", + }, + { + "pcsx_rearmed_negcon_deadzone", + "NegCon Twist Deadzone (Yüzdelik)", + "Öykünülmüş neGcon kontrolörünün 'büküm' eylemini simüle ederken RetroPad sol analog çubuÄŸunun ölü bölgesini ayarlar. Sürüklenme/istenmeyen giriÅŸi ortadan kaldırmak için kullanılır.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_negcon_response", + "NegCon Twist Response", + "Öykünülmüş neGcon kontrolörünün 'bükümünü' simule etmek için bir RetroPad sol analog çubuÄŸu kullanırken analog cevabını belirtir.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_vibration", + "TitreÅŸimi EtkinleÅŸtir", + "TitreÅŸim özelliklerini destekleyen kontrolörler için titreÅŸim geri bildirimini etkinleÅŸtirir.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_dithering", + "Dithering EtkinleÅŸtir", + "Kapalı ise, PSX'in renk bantlarıyla mücadele etmek için uyguladığı renk taklidi düzenini devre dışı bırakır.", + { + { NULL, NULL }, + }, + NULL + }, + +#ifndef DRC_DISABLE + { + "pcsx_rearmed_drc", + "Dinamik Yeniden Derleyici", + "ÇekirdeÄŸin dinamik yeniden derleyici veya tercüman(daha yavaÅŸ) CPU talimatlarını kullanmasını saÄŸlar.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_psxclock", + "PSX CPU Saat Hızı", +#ifdef HAVE_PRE_ARMV7 + "Overclock or underclock the PSX clock. Default is 50", +#else + "Overclock or underclock the PSX clock. Default is 57", +#endif + { + { NULL, NULL }, + }, + NULL + }, +#endif /* DRC_DISABLE */ + +#ifdef __ARM_NEON__ + { + "pcsx_rearmed_neon_interlace_enable", + "Interlacing Mode'u etkinleÅŸtir", + "Sahte tarama çizgileri efektini etkinleÅŸtirir.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_neon_enhancement_enable", + "GeliÅŸtirilmiÅŸ Çözünürlük (YavaÅŸ)", + "Düşük performans pahasına çift çözünürlükte iÅŸler.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_neon_enhancement_no_main", + "GeliÅŸtirilmiÅŸ Çözünürlük (Speed Hack)", + "GeliÅŸtirilmiÅŸ çözünürlük seçeneÄŸi için hız aşırtma(bazı oyunlarda sorun çıkartabilir).", + { + { NULL, NULL }, + }, + NULL + }, +#endif /* __ARM_NEON__ */ + + { + "pcsx_rearmed_duping_enable", + "Frame Duping", + "Yeni bir veri yoksa, bir hızlandırma, son kareyi yeniden çizer/yeniden kullanır.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_display_internal_fps", + "Dahili FPS'yi görüntüle", + "EtkinleÅŸtirildiÄŸinde ekranda saniye başına kareyi gösterir.", + { + { NULL, NULL }, + }, + NULL + }, + + /* GPU PEOPS OPTIONS */ +#ifdef DRC_DISABLE + { + "pcsx_rearmed_show_gpu_peops_settings", + "GeliÅŸmiÅŸ GPU Ayarlarını Göster", + "ÇeÅŸitli GPU düzeltmelerini etkinleÅŸtirin veya devre dışı bırakın. Ayarların etkili olması için core'un yeniden baÅŸlatılması gerekebilir. NOT: Bu ayarın etkili olabilmesi için Hızlı Menü’nün deÄŸiÅŸtirilmesi gerekir.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_odd_even_bit", + "(GPU) Odd/Even Bit Hack", + "Chrono Cross için gerekli.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_expand_screen_width", + "(GPU) Ekran GeniÅŸliÄŸini GeniÅŸlet", + "Capcom dövüş oyunları", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_ignore_brightness", + "(GPU) Parlaklık Rengini Yoksay", + "Lunar Silver Star Story oyunlarında siyah ekran", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_disable_coord_check", + "(GPU) Koordinat Kontrolünü Devre Dışı Bırak", + "Uyumluluk modu", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_lazy_screen_update", + "(GPU) Tembel Ekran Güncellemesi", + "Pandemonium 2", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_old_frame_skip", + "(GPU) Eski Çerçeve Atlama", + "Her ikinci kareyi atla", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_repeated_triangles", + "(GPU) Tekrarlanan Düz Doku Üçgenleri", + "Star Wars: Dark Forces için gerekli", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_quads_with_triangles", + "(GPU) Üçgenler ile Dörtlü Çiz", + "Daha iyi g renkler, daha kötü dokular", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gpu_peops_fake_busy_state", + "(GPU) Sahte 'Gpu MeÅŸgul' Konumları", + "Çizimden sonra meÅŸgul bayraklarını deÄŸiÅŸtir", + { + { NULL, NULL }, + }, + NULL + }, +#endif + + { + "pcsx_rearmed_show_bios_bootlogo", + "Bios Bootlogo'yu Göster", + "EtkinleÅŸtirildiÄŸinde, baÅŸlatırken veya sıfırlarken PlayStation logosunu gösterir. (Bazı oyunları bozabilir).", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_spu_reverb", + "Ses Yankısı", + "Ses yankı efektini etkinleÅŸtirir veya devre dışı bırakır.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_spu_interpolation", + "Ses Enterpolasyonu", + NULL, + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_idiablofix", + "Diablo Müzik Düzeltmesi", + NULL, + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_pe2_fix", + "Parasite Eve 2/Vandal Hearts 1/2 Düzeltmleri", + NULL, + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_inuyasha_fix", + "InuYasha Sengoku Battle Düzeltmesi", + NULL, + { + { NULL, NULL }, + }, + NULL + }, + + /* ADVANCED OPTIONS */ + { + "pcsx_rearmed_noxadecoding", + "XA Kod Çözme", + NULL, + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_nocdaudio", + "CD Ses", + NULL, + { + { NULL, NULL }, + }, + NULL + }, + +#ifndef DRC_DISABLE + { + "pcsx_rearmed_nosmccheck", + "(Speed Hack) SMC Kontrollerini Devre Dışı Bırak", + "Yükleme sırasında çökmelere neden olabilir, hafıza kartını bozabilir.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_gteregsunneeded", + "(Speed Hack) GTE'nin Gereksiz OlduÄŸunu Varsayın", + "Grafiksel bozukluklara neden olabilir.", + { + { NULL, NULL }, + }, + NULL + }, + { + "pcsx_rearmed_nogteflags", + "(Speed Hack) GTE Bayraklarını Devredışı Bırakın", + "Grafiksel bozukluklara neden olur.", + { + { NULL, NULL }, + }, + NULL + }, +#endif /* DRC_DISABLE */ + + { NULL, NULL, NULL, {{0}}, NULL }, +}; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/frontend/main.c b/frontend/main.c index b6b5411..fcf3846 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -151,7 +151,7 @@ void emu_set_default_config(void) spu_config.iVolume = 768; spu_config.iTempo = 0; spu_config.iUseThread = 1; // no effect if only 1 core is detected -#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */ +#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) /* XXX GPH hack */ spu_config.iUseReverb = 0; spu_config.iUseInterpolation = 0; spu_config.iTempo = 1; @@ -877,7 +877,7 @@ static int _OpenPlugins(void) { if (Config.UseNet && !NetOpened) { netInfo info; - char path[MAXPATHLEN]; + char path[MAXPATHLEN * 2]; char dotdir[MAXPATHLEN]; MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL); diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 17d65ab..a65ca54 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -877,7 +877,8 @@ void cdrInterrupt() { } cdr.Result[0] |= (cdr.Result[1] >> 4) & 0x08; - strncpy((char *)&cdr.Result[4], "PCSX", 4); + /* This adds the string "PCSX" in Playstation bios boot screen */ + memcpy((char *)&cdr.Result[4], "PCSX", 4); cdr.Stat = Complete; break; diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index 433d4be..82e6b8b 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -73,7 +73,7 @@ void mmssdd( char *b, char *p ) m = ((m / 10) << 4) | m % 10; s = ((s / 10) << 4) | s % 10; - d = ((d / 10) << 4) | d % 10; + d = ((d / 10) << 4) | d % 10; p[0] = m; p[1] = s; @@ -191,7 +191,7 @@ int LoadCdrom() { READTRACK(); // skip head and sub, and go to the root directory record - dir = (struct iso_directory_record*) &buf[12+156]; + dir = (struct iso_directory_record*) &buf[12+156]; mmssdd(dir->extent, (char*)time); @@ -236,7 +236,7 @@ int LoadCdrom() { psxRegs.pc = SWAP32(tmpHead.pc0); psxRegs.GPR.n.gp = SWAP32(tmpHead.gp0); - psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr); + psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr); if (psxRegs.GPR.n.sp == 0) psxRegs.GPR.n.sp = 0x801fff00; tmpHead.t_size = SWAP32(tmpHead.t_size); @@ -275,7 +275,7 @@ int LoadCdromFile(const char *filename, EXE_HEADER *head) { READTRACK(); // skip head and sub, and go to the root directory record - dir = (struct iso_directory_record *)&buf[12 + 156]; + dir = (struct iso_directory_record *)&buf[12 + 156]; mmssdd(dir->extent, (char*)time); @@ -329,7 +329,7 @@ int CheckCdrom() { strncpy(CdromLabel, buf + 52, 32); // skip head and sub, and go to the root directory record - dir = (struct iso_directory_record *)&buf[12 + 156]; + dir = (struct iso_directory_record *)&buf[12 + 156]; mmssdd(dir->extent, (char *)time); @@ -357,6 +357,14 @@ int CheckCdrom() { return -1; } } + /* Workaround for Wild Arms EU/US which has non-standard string causing incorrect region detection */ + if (exename[0] == 'E' && exename[1] == 'X' && exename[2] == 'E' && exename[3] == '\\') { + size_t offset = 4; + size_t i, len = strlen(exename) - offset; + for (i = 0; i < len; i++) + exename[i] = exename[i + offset]; + exename[i] = '\0'; + } } else if (GetCdromFile(mdir, time, "PSX.EXE;1") != -1) { strcpy(exename, "PSX.EXE;1"); strcpy(CdromId, "SLUS99999"); @@ -426,7 +434,7 @@ size_t fread_to_ram(void *ptr, size_t size, size_t nmemb, FILE *stream) { void *tmp; size_t ret = 0; - + tmp = malloc(size * nmemb); if (tmp) { ret = fread(tmp, size, nmemb, stream); @@ -445,8 +453,8 @@ int Load(const char *ExePath) { u32 section_address, section_size; void *mem; - strncpy(CdromId, "SLUS99999", 9); - strncpy(CdromLabel, "SLUS_999.99", 11); + strcpy(CdromId, "SLUS99999"); + strcpy(CdromLabel, "SLUS_999.99"); tmpFile = fopen(ExePath, "rb"); if (tmpFile == NULL) { @@ -461,14 +469,14 @@ int Load(const char *ExePath) { section_size = SWAP32(tmpHead.t_size); mem = PSXM(section_address); if (mem != NULL) { - fseek(tmpFile, 0x800, SEEK_SET); + fseek(tmpFile, 0x800, SEEK_SET); fread_to_ram(mem, section_size, 1, tmpFile); psxCpu->Clear(section_address, section_size / 4); } fclose(tmpFile); psxRegs.pc = SWAP32(tmpHead.pc0); psxRegs.GPR.n.gp = SWAP32(tmpHead.gp0); - psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr); + psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr); if (psxRegs.GPR.n.sp == 0) psxRegs.GPR.n.sp = 0x801fff00; retval = 0; diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index 4f52ed2..af7ebed 100644 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -1064,7 +1064,7 @@ void CALLBACK clearDynarec(void) { int LoadPlugins() { int ret; - char Plugin[MAXPATHLEN]; + char Plugin[MAXPATHLEN * 2]; ReleasePlugins(); SysLibError(); @@ -1169,7 +1169,7 @@ int ReloadCdromPlugin() if (UsingIso()) { LoadCDRplugin(NULL); } else { - char Plugin[MAXPATHLEN]; + char Plugin[MAXPATHLEN * 2]; sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Cdr); if (LoadCDRplugin(Plugin) == -1) return -1; } @@ -1182,7 +1182,7 @@ void SetIsoFile(const char *filename) { IsoFile[0] = '\0'; return; } - strncpy(IsoFile, filename, MAXPATHLEN); + strncpy(IsoFile, filename, MAXPATHLEN - 1); } const char *GetIsoFile(void) { diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c index edebdd0..f6ccfca 100644 --- a/libpcsxcore/ppf.c +++ b/libpcsxcore/ppf.c @@ -183,7 +183,7 @@ void BuildPPFCache() { char method, undo = 0, blockcheck = 0; int dizlen, dizyn; unsigned char ppfmem[512]; - char szPPF[MAXPATHLEN]; + char szPPF[MAXPATHLEN * 2]; int count, seekpos, pos; u32 anz; // use 32-bit to avoid stupid overflows s32 ladr, off, anx; diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c index 388d606..0121a7b 100644 --- a/libpcsxcore/psxbios.c +++ b/libpcsxcore/psxbios.c @@ -347,6 +347,7 @@ static inline void LoadRegs() { ptr = Mcd##mcd##Data + offset; \ memcpy(ptr, Ra1, length); \ FDesc[1 + mcd].offset += length; \ + SaveMcd(Config.Mcd##mcd, Mcd##mcd##Data, offset, length); \ if (FDesc[1 + mcd].mode & 0x8000) { \ DeliverEvent(0x11, 0x2); /* 0xf0000011, 0x0004 */ \ DeliverEvent(0x81, 0x2); /* 0xf4000001, 0x0004 */ \ @@ -2025,17 +2026,18 @@ void psxBios_UnDeliverEvent() { // 0x20 char ffile[64], *pfile; int nfile; -static void buopen(int mcd, u8 *ptr, u8 *cfg) + +static void buopen(int mcd, char *ptr, char *cfg) { int i; - u8 *fptr = ptr; + char *mcd_data = ptr; strcpy(FDesc[1 + mcd].name, Ra0+5); FDesc[1 + mcd].offset = 0; FDesc[1 + mcd].mode = a1; for (i=1; i<16; i++) { - fptr += 128; + const char *fptr = mcd_data + 128 * i; if ((*fptr & 0xF0) != 0x50) continue; if (strcmp(FDesc[1 + mcd].name, fptr+0xa)) continue; FDesc[1 + mcd].mcfile = i; @@ -2044,12 +2046,11 @@ static void buopen(int mcd, u8 *ptr, u8 *cfg) break; } if (a1 & 0x200 && v0 == -1) { /* FCREAT */ - fptr = ptr; for (i=1; i<16; i++) { int j, xor, nblk = a1 >> 16; - u8 *pptr, *fptr2; + char *pptr, *fptr2; + char *fptr = mcd_data + 128 * i; - fptr += 128; if ((*fptr & 0xF0) != 0xa0) continue; FDesc[1 + mcd].mcfile = i; @@ -2094,8 +2095,6 @@ static void buopen(int mcd, u8 *ptr, u8 *cfg) */ void psxBios_open() { // 0x32 - int i; - char *ptr; void *pa0 = Ra0; #ifdef PSXBIOS_LOG diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h index 1fd2f5b..d0f1042 100644 --- a/libretro-common/include/libretro.h +++ b/libretro-common/include/libretro.h @@ -1117,7 +1117,7 @@ enum retro_mod * This may be still be done regardless of the core options * interface version. * - * If version is 1 however, core options may instead be set by + * If version is >= 1 however, core options may instead be set by * passing an array of retro_core_option_definition structs to * RETRO_ENVIRONMENT_SET_CORE_OPTIONS, or a 2D array of * retro_core_option_definition structs to RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL. @@ -1132,8 +1132,8 @@ enum retro_mod * GET_VARIABLE. * This allows the frontend to present these variables to * a user dynamically. - * This should only be called if RETRO_ENVIRONMENT_GET_ENHANCED_CORE_OPTIONS - * returns an API version of 1. + * This should only be called if RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION + * returns an API version of >= 1. * This should be called instead of RETRO_ENVIRONMENT_SET_VARIABLES. * This should be called the first time as early as * possible (ideally in retro_set_environment). @@ -1169,8 +1169,6 @@ enum retro_mod * i.e. it should be feasible to cycle through options * without a keyboard. * - * First entry should be treated as a default. - * * Example entry: * { * "foo_option", @@ -1196,8 +1194,8 @@ enum retro_mod * GET_VARIABLE. * This allows the frontend to present these variables to * a user dynamically. - * This should only be called if RETRO_ENVIRONMENT_GET_ENHANCED_CORE_OPTIONS - * returns an API version of 1. + * This should only be called if RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION + * returns an API version of >= 1. * This should be called instead of RETRO_ENVIRONMENT_SET_VARIABLES. * This should be called the first time as early as * possible (ideally in retro_set_environment). @@ -2504,8 +2502,20 @@ struct retro_core_option_display }; /* Maximum number of values permitted for a core option - * NOTE: This may be increased on a core-by-core basis - * if required (doing so has no effect on the frontend) */ + * > Note: We have to set a maximum value due the limitations + * of the C language - i.e. it is not possible to create an + * array of structs each containing a variable sized array, + * so the retro_core_option_definition values array must + * have a fixed size. The size limit of 128 is a balancing + * act - it needs to be large enough to support all 'sane' + * core options, but setting it too large may impact low memory + * platforms. In practise, if a core option has more than + * 128 values then the implementation is likely flawed. + * To quote the above API reference: + * "The number of possible options should be very limited + * i.e. it should be feasible to cycle through options + * without a keyboard." + */ #define RETRO_NUM_CORE_OPTION_VALUES_MAX 128 struct retro_core_option_value diff --git a/maemo/hildon.c b/maemo/hildon.c deleted file mode 100644 index 7e9cd9f..0000000 --- a/maemo/hildon.c +++ /dev/null @@ -1,843 +0,0 @@ -#include <gtk/gtk.h> -#include <glib.h> -#include <stdlib.h> -#include <stdint.h> -#include <unistd.h> -#include <hildon/hildon.h> -#include <string.h> -#include <pthread.h> - -#include "../frontend/plugin_lib.h" -#include "../frontend/main.h" -#include "../libpcsxcore/misc.h" -#include "../include/psemu_plugin_defs.h" -#include "../libpcsxcore/cdrom.h" -#include "../libpcsxcore/cdriso.h" -#include "../plugins/dfinput/main.h" -#include "../frontend/libpicofe/readpng.h" -#include "maemo_common.h" -#include <libosso.h> -#include <dbus/dbus.h> - -#define X_RES 800 -#define Y_RES 480 -#define D_WIDTH 640 -#define D_HEIGHT 480 - -#define CALL_SIGNAL_IF "com.nokia.csd.Call" -#define CALL_SIGNAL_PATH "/com/nokia/csd/call" -#define CALL_INCOMING_SIG "Coming" - -#define DBUS_RULE_CALL_INCOMING "type='signal',interface='" CALL_SIGNAL_IF \ - "',path='" CALL_SIGNAL_PATH \ - "',member='" CALL_INCOMING_SIG "'" - -osso_context_t* osso = NULL; -int bRunning = TRUE; -extern int bKeepDisplayOn; -extern int bAutosaveOnExit; -extern int cornerActions[4]; -extern char keys_config_file[MAXPATHLEN]; -static pthread_t display_thread = (pthread_t)0; -int g_layer_x = (X_RES - D_WIDTH) / 2; -int g_layer_y = (Y_RES - D_HEIGHT) / 2; -int g_layer_w = D_WIDTH, g_layer_h = D_HEIGHT; - -static GdkImage *image; -static HildonAnimationActor *actor; -static GtkWidget *window, *drawing = NULL; - -static int pl_buf_w, pl_buf_h; -int keymap[65536]; -int direction_keys[4]; - -// map psx4m compatible keymap to PSX keys -static const unsigned char keymap2[14] = { - DKEY_LEFT, // 0 - DKEY_RIGHT, - DKEY_UP, - DKEY_DOWN, - DKEY_CIRCLE, - DKEY_CROSS, // 5 - DKEY_TRIANGLE, - DKEY_SQUARE, - DKEY_SELECT, - DKEY_START, - DKEY_L1, // 10 - DKEY_R1, - DKEY_L2, - DKEY_R2, -}; - -void hildon_quit() -{ - maemo_finish(); - gtk_main_quit(); - exit(0); -} - -gdouble press_x = -1; -gdouble press_y = -1; - -int maemo_x11_update_keys(); -void show_notification(char* text); - -void change_slot(int delta) -{ - state_slot += delta; - if (state_slot > 9) - state_slot = 0; - else if (state_slot < 0) - state_slot = 9; - char message[50]; - sprintf(message,"Savestate slot: %i",state_slot + 1); - show_notification(message); -} - -void save(int state_slot) -{ - emu_save_state(state_slot); - char buf[MAXPATHLEN]; - if (image && image->mem){ - sprintf (buf,"/opt/maemo/usr/games/screenshots%s.%3.3d",file_name,state_slot); - writepng(buf, image->mem, pl_buf_w,pl_buf_h); - } - char message[50]; - sprintf(message,"Saved savestate slot: %i",state_slot + 1); - show_notification(message); -} - -void quit() -{ - if (bAutosaveOnExit){ - show_notification("Autosaving"); - emu_save_state(99); - char buf[MAXPATHLEN]; - if (image && image->mem){ - sprintf (buf,"/opt/maemo/usr/games/screenshots%s.%3.3d",file_name,99); - writepng(buf, image->mem, pl_buf_w,pl_buf_h); - } - } - hildon_quit(); -} - -int show_confirmbox(char* text) -{ - if (!window) - return TRUE; - - GtkWidget *dialog; - dialog = gtk_message_dialog_new (GTK_WINDOW(window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - text); - gint result = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (result == GTK_RESPONSE_YES) - return TRUE; - return FALSE; -} - -static void -window_button_proxy(GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - int corner = -1; - int sens = 100; - - switch (event->type){ - case GDK_BUTTON_PRESS: - //printf("GDK_BUTTON_PRESS: x=%f y=%f\n", event->x, event->y); - press_x = event->x; - press_y = event->y; - break; - case GDK_BUTTON_RELEASE: - //printf("GDK_BUTTON_RELEASE: x=%f y=%f\n", event->x, event->y); - if (press_x < sens && press_y < sens && event->x < sens && event->y < sens) - corner = 0; - else if (press_x > 800 - sens && press_y < sens && event->x > 800 - sens && event->y < sens) - corner = 1; - else if (press_x > 800 - sens && press_y > 480 - sens && event->x > 800 - sens && event->y > 480 - sens) - corner = 2; - else if (press_x < sens && press_y > 480 - sens && event->x < sens && event->y > 480 - sens) - corner = 3; - - press_x = -1; - press_y = -1; - break; - default: - break; - } - - if (corner >= 0){ - switch (cornerActions[corner]){ - case 1: - if (show_confirmbox("Save savestate?")) - save(state_slot); - break; - case 2: - if (show_confirmbox("Load savestate?")) - emu_load_state(state_slot); - break; - case 3: - change_slot(1); - break; - case 4: - change_slot(-1); - break; - case 5: - if (show_confirmbox("Quit?")) - quit(); - break; - } - } -} - -static void *displayThread(void *arg) -{ - DBusConnection* system_bus = (DBusConnection*)osso_get_sys_dbus_connection(osso); - DBusMessage* msg = dbus_message_new_method_call("com.nokia.mce", - "/com/nokia/mce/request", - "com.nokia.mce.request", - "req_display_blanking_pause"); - if (msg && system_bus) { - bRunning = TRUE; - while (bRunning) { - dbus_connection_send(system_bus, msg, NULL); - dbus_connection_flush(system_bus); - int i = 0; - for (i=0; i<8; i++){ - usleep(500000); - if (!bRunning) - break; - } - } - dbus_message_unref(msg); - } - - pthread_exit(0); - return NULL; -} - -void show_notification(char* text) -{ - if (window){ - GtkWidget* banner = hildon_banner_show_information(GTK_WIDGET(window), NULL, text); - hildon_banner_set_timeout(HILDON_BANNER(banner), 3000); - }else{ - DBusConnection* session_bus = (DBusConnection*)osso_get_dbus_connection(osso); - DBusMessageIter args; - DBusMessage*msg = dbus_message_new_method_call("org.freedesktop.Notifications", - "/org/freedesktop/Notifications", - "org.freedesktop.Notifications", - "SystemNoteInfoprint"); - if (msg) { - dbus_message_iter_init_append(msg, &args); - char* param = text; - if (dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, ¶m)) { - dbus_connection_send(session_bus, msg, NULL); - dbus_connection_flush(session_bus); - } - dbus_message_unref(msg); - } - } -} - -void show_messagebox(char* text) -{ - if (!window) - return; - - GtkWidget *dialog; - dialog = gtk_message_dialog_new (GTK_WINDOW(window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - text); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -#include <hildon/hildon-file-chooser-dialog.h> -void change_disc() -{ - GtkWidget *dialog; - dialog = hildon_file_chooser_dialog_new (GTK_WINDOW(window), GTK_FILE_CHOOSER_ACTION_OPEN); - gtk_window_set_title (GTK_WINDOW (dialog), "Change disc"); - - char currentFile[MAXPATHLEN]; - strcpy(currentFile, GetIsoFile()); - if (strlen(currentFile)) - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(dialog), currentFile); - else - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dialog), "/home/user/MyDocs/"); - - GtkFileFilter *filter=gtk_file_filter_new(); - gtk_file_filter_add_pattern (filter,"*.bin"); - gtk_file_filter_add_pattern (filter,"*.BIN"); - gtk_file_filter_add_pattern (filter,"*.iso"); - gtk_file_filter_add_pattern (filter,"*.ISO"); - gtk_file_filter_add_pattern (filter,"*.img"); - gtk_file_filter_add_pattern (filter,"*.IMG"); - gtk_file_filter_add_pattern (filter,"*.z"); - gtk_file_filter_add_pattern (filter,"*.Z"); - gtk_file_filter_add_pattern (filter,"*.znx"); - gtk_file_filter_add_pattern (filter,"*.ZNX"); - gtk_file_filter_add_pattern (filter,"*.pbp"); - gtk_file_filter_add_pattern (filter,"*.PBP"); - gtk_file_filter_add_pattern (filter,"*.mdf"); - gtk_file_filter_add_pattern (filter,"*.MDF"); - gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog),filter); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { - char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - - //if (strcmp(filename, currentFile)) { - CdromId[0] = '\0'; - CdromLabel[0] = '\0'; - - set_cd_image(filename); - if (ReloadCdromPlugin() < 0) - printf("Failed to load cdr plugin\n"); - - if (CDR_open() < 0) - printf("Failed to open cdr plugin\n"); - - strcpy(file_name, strrchr(filename,'/')); - - SetCdOpenCaseTime(time(NULL) + 3); - LidInterrupt(); - //} - g_free (filename); - } - - gtk_widget_destroy (dialog); -} - -void change_multi_disc() -{ - HildonDialog* window = HILDON_DIALOG(hildon_dialog_new()); - gtk_window_set_title (GTK_WINDOW (window), "Change disc"); - gtk_window_set_default_size(GTK_WINDOW (window), 480, 300); - - GtkWidget* sw = hildon_pannable_area_new (); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(window)->vbox), sw, TRUE, TRUE, 0); - - GtkWidget* tree_view = hildon_gtk_tree_view_new (HILDON_UI_MODE_EDIT); - gtk_widget_set_name (tree_view, "fremantle-widget"); - - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE); - - int i; - GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); - for (i = 0; i < cdrIsoMultidiskCount; i++) { - gchar *str; - - str = g_strdup_printf ("Disc %d", i+1); - gtk_list_store_insert_with_values (store, NULL, i, 0, str, -1); - g_free (str); - } - GtkTreeModel* model = GTK_TREE_MODEL (store); - - gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model); - g_object_unref (model); - - GtkTreeSelection* selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - - GtkCellRenderer* renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, - "xalign", 0.5, - "weight", PANGO_WEIGHT_NORMAL, - NULL); - - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), - 0, "Column 0", - renderer, - "text", 0, - NULL); - - char current[5]; - sprintf(current, "%i", cdrIsoMultidiskSelect); - GtkTreePath* path = gtk_tree_path_new_from_string(current); - gtk_tree_selection_select_path (selection, path); - gtk_tree_path_free(path); - - gtk_widget_set_size_request (tree_view, 480, 800); - gtk_container_add (GTK_CONTAINER (sw), tree_view); - - hildon_dialog_add_button (HILDON_DIALOG(window), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); - - gtk_widget_show_all (GTK_WIDGET(window)); - gint result = gtk_dialog_run (GTK_DIALOG (window)); - if (result == GTK_RESPONSE_ACCEPT) { - GtkTreeModel* model; - GtkTreeIter iter; - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); - if (gtk_tree_selection_get_selected(selection, &model, &iter)){ - GtkTreePath* path = gtk_tree_model_get_path(model , &iter); - int* i = gtk_tree_path_get_indices(path) ; - - cdrIsoMultidiskSelect = *i; - CdromId[0] = '\0'; - CdromLabel[0] = '\0'; - - CDR_close(); - if (CDR_open() < 0) { - printf("Failed to load cdr plugin\n"); - return; - } - - SetCdOpenCaseTime(time(NULL) + 3); - LidInterrupt(); - } - } - gtk_widget_destroy(GTK_WIDGET(window)); -} - -static DBusHandlerResult on_msg_recieved(DBusConnection* connection G_GNUC_UNUSED, DBusMessage* message, void* data) -{ - const char* path = dbus_message_get_path(message); - if (path && g_str_equal(path, CALL_SIGNAL_PATH)){ - const char* mbr = dbus_message_get_member(message); - if (mbr && g_str_equal(mbr, CALL_INCOMING_SIG)) - show_messagebox("Paused"); - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - -static void -window_key_proxy(GtkWidget *widget, - GdkEventKey *event, - gpointer user_data) -{ - key_press_event(event->hardware_keycode, event->type == GDK_KEY_PRESS ? 1 : (event->type == GDK_KEY_RELEASE ? 2 : 0) ); -} - -int last_key_pressed = 0; -inline void key_press_event(int key2,int type) -{ - int psxkey1 = -1, psxkey2 = -1; - int key=keymap[key2]; - - if (key < 0) - return; - - if (type == 1 && key2 == last_key_pressed) - return; - last_key_pressed = type == 1 ? key2 : 0; - - //printf("Key: %i %s\n", key2, type == 1 ? "Pressed" : (type == 2 ? "Released" : "Unknown")); - if (key < ARRAY_SIZE(keymap2)){ - psxkey1 = keymap2[key]; - }else switch (key) { - case 14: - quit(); - break; - case 15: - psxkey1 = DKEY_UP; - psxkey2 = DKEY_LEFT; - break; - case 16: - psxkey1 = DKEY_UP; - psxkey2 = DKEY_RIGHT; - break; - case 17: - psxkey1 = DKEY_DOWN; - psxkey2 = DKEY_LEFT; - break; - case 18: - psxkey1 = DKEY_DOWN; - psxkey2 = DKEY_RIGHT; - break; - case 19: - if (type == 1) - save(state_slot); - return; - case 20: - if (type == 1) - emu_load_state(state_slot); - return; - case 21: - if (type == 1) - change_slot(1); - return; - case 22: - if (type == 1) - change_slot(-1); - return; - case 23: - if (type == 1){ - if (cdrIsoMultidiskCount > 1) - change_multi_disc(); - else - change_disc(); - } - return; - } - - if (in_type1 == PSE_PAD_TYPE_GUNCON){ - if (type == 1) { - switch (psxkey1){ - case DKEY_CROSS: - in_state_gun |= SACTION_GUN_A; - break; - case DKEY_CIRCLE: - in_state_gun |= SACTION_GUN_B; - break; - case DKEY_TRIANGLE: - in_state_gun |= SACTION_GUN_TRIGGER2; - break; - case DKEY_SQUARE: - in_state_gun |= SACTION_GUN_TRIGGER; - break; - } - }else if (type == 2) { - switch (psxkey1){ - case DKEY_CROSS: - in_state_gun &= ~SACTION_GUN_A; - break; - case DKEY_CIRCLE: - in_state_gun &= ~SACTION_GUN_B; - break; - case DKEY_TRIANGLE: - in_state_gun &= ~SACTION_GUN_TRIGGER2; - break; - case DKEY_SQUARE: - in_state_gun &= ~SACTION_GUN_TRIGGER; - break; - } - } - }else{ - if (type == 1) { - if (psxkey1 >= 0) - in_keystate |= 1 << psxkey1; - if (psxkey2 >= 0) - in_keystate |= 1 << psxkey2; - - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD){ - switch(psxkey1){ - case DKEY_LEFT: - in_a1[0] = 0; - break; - case DKEY_RIGHT: - in_a1[0] = 255; - break; - case DKEY_UP: - in_a1[1] = 0; - break; - case DKEY_DOWN: - in_a1[1] = 255; - break; - } - } - } - else if (type == 2) { - if (psxkey1 >= 0) - in_keystate &= ~(1 << psxkey1); - if (psxkey2 >= 0) - in_keystate &= ~(1 << psxkey2); - - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD){ - switch(psxkey1){ - case DKEY_LEFT: - case DKEY_RIGHT: - in_a1[0] = 127; - break; - case DKEY_UP: - case DKEY_DOWN: - in_a1[1] = 127; - break; - } - } - emu_set_action(SACTION_NONE); - } - } -} - -void plat_finish() -{ - hildon_quit(); -} - -void set_accel_multipliers() -{ - accelOptions.xMultiplier = 255.0 / ( (accelOptions.maxValue - accelOptions.sens) * 2.0); - accelOptions.yMultiplier = 255.0 / ( (accelOptions.maxValue - accelOptions.sens) * 2.0); -} - -#include <gdk/gdkx.h> -int maemo_init(int *argc, char ***argv) -{ - osso = osso_initialize("pcsxrearmed", PACKAGE_VERSION, FALSE, NULL); - - DBusConnection* system_bus = (DBusConnection*)osso_get_sys_dbus_connection(osso); - dbus_bus_add_match(system_bus, DBUS_RULE_CALL_INCOMING, NULL); - dbus_connection_add_filter(system_bus, on_msg_recieved, NULL, NULL); - - FILE* pFile; - pFile = fopen(keys_config_file, "r"); - if (pFile == NULL){ - fprintf(stderr, "Error opening keys config file %s\n", keys_config_file); - return 1; - } - printf("Keys config read from %s\n", keys_config_file); - - int ch; - int i=0; - for (i=0;i<65536;i++) - keymap[i]=-1; - if (NULL != pFile) { - for(i=0;i<24;i++){ - fscanf(pFile, "%i",&ch); - keymap[ch]=i; - if (i < 4) - direction_keys[i] = ch; - } - fclose(pFile); - } - - switch (in_type1){ - case PSE_PAD_TYPE_GUNCON: - memset(cornerActions, 0, sizeof(cornerActions)); - printf("Controller set to GUNCON (SLPH-00034)\n"); - break; - case PSE_PAD_TYPE_STANDARD: - printf("Controller set to standard (SCPH-1080)\n"); - break; - case PSE_PAD_TYPE_ANALOGPAD: - printf("Controller set to analog (SCPH-1150)\n"); - break; - } - - if (in_enable_vibration) - printf("Vibration enabled\n"); - - if (!(g_maemo_opts&8)){ - gtk_init (argc, argv); - - window = hildon_stackable_window_new (); - gtk_widget_realize (window); - gtk_window_fullscreen (GTK_WINDOW(window)); - - if (cornerActions[0] + cornerActions[1] + cornerActions[2] + cornerActions[3] > 0){ - g_signal_connect (G_OBJECT (window), "button_release_event", - G_CALLBACK (window_button_proxy), NULL); - g_signal_connect (G_OBJECT (window), "button_press_event", - G_CALLBACK (window_button_proxy), NULL); - } - - g_signal_connect (G_OBJECT (window), "key-press-event", - G_CALLBACK (window_key_proxy), NULL); - g_signal_connect (G_OBJECT (window), "key-release-event", - G_CALLBACK (window_key_proxy), NULL); - g_signal_connect (G_OBJECT (window), "delete_event", - G_CALLBACK (hildon_quit), NULL); - gtk_widget_add_events (window, - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - - actor = HILDON_ANIMATION_ACTOR (hildon_animation_actor_new()); - if (g_maemo_opts & 2) - hildon_animation_actor_set_position (actor, 0, 0 ); - else - hildon_animation_actor_set_position (actor, (X_RES - D_WIDTH)/2, (Y_RES - D_HEIGHT)/2 ); - hildon_animation_actor_set_parent (actor, GTK_WINDOW (window)); - - drawing = gtk_image_new (); - - gtk_container_add (GTK_CONTAINER (actor), drawing); - - gtk_widget_show_all (GTK_WIDGET (actor)); - gtk_widget_show_all (GTK_WIDGET (window)); - }else{ - gtk_init (argc, argv); - /*GdkScreen* scr = gdk_screen_get_default(); - window = GTK_WIDGET(gdk_screen_get_root_window(scr)); - if (!window) - window = GTK_WIDGET(gdk_get_default_root_window());*/ - } - - set_accel_multipliers(); - - if (bKeepDisplayOn){ - if (pthread_create(&display_thread, NULL, displayThread, NULL)) - printf("Failed to create display thread.\n"); - } - - pl_rearmed_cbs.only_16bpp = 1; - return 0; -} - -void maemo_finish() -{ - if (display_thread > 0){ - bRunning = FALSE; - pthread_join(display_thread, NULL); - } - - if (osso){ - osso_deinitialize(osso); - osso = NULL; - } - printf("Exiting\n"); -} - -void menu_loop(void) -{ -} - -void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_) -{ - int w = *w_, h = *h_; - - if (g_maemo_opts&8) return pl_vout_buf; - //printf("Setting video mode %ix%i\n", w, h); - - if (w <= 0 || h <= 0) - return pl_vout_buf; - - if (image) gdk_image_destroy(image); - image = gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), w, h ); - - pl_vout_buf = (void *) image->mem; - - gtk_image_set_from_image (GTK_IMAGE(drawing), image, NULL); - - gtk_window_resize (GTK_WINDOW (actor), w, h); - if (g_maemo_opts & 2) - hildon_animation_actor_set_scale (actor, - (gdouble)800 / (gdouble)w, - (gdouble)480 / (gdouble)h - ); - else - hildon_animation_actor_set_scale (actor, - (gdouble)D_WIDTH / (gdouble)w, - (gdouble)D_HEIGHT / (gdouble)h - ); - pl_buf_w=w;pl_buf_h=h; - return pl_vout_buf; -} - -void *plat_gvideo_flip(void) -{ - if (!(g_maemo_opts&8)) - gtk_widget_queue_draw(drawing); - - // process accelometer - if (g_maemo_opts & 4) { - float x, y, z; - FILE* f = fopen( "/sys/class/i2c-adapter/i2c-3/3-001d/coord", "r" ); - if( !f ) {printf ("err in accel"); exit(1);} - fscanf( f, "%f %f %f", &x, &y, &z ); - fclose( f ); - - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD){ - if (x > accelOptions.maxValue) x = accelOptions.maxValue; - else if (x < -accelOptions.maxValue) x = -accelOptions.maxValue; - - const int maxValue = accelOptions.maxValue - accelOptions.sens; - if(x > accelOptions.sens){ - x -= accelOptions.sens; - in_a1[0] = (-x + maxValue ) * accelOptions.xMultiplier; - }else if (x < -accelOptions.sens){ - x += accelOptions.sens; - in_a1[0] = (-x + maxValue ) * accelOptions.xMultiplier; - }else in_a1[0] = 127; - - y += accelOptions.y_def; - if (y > accelOptions.maxValue) y = accelOptions.maxValue; - else if (y < -accelOptions.maxValue) y = -accelOptions.maxValue; - - if(y > accelOptions.sens){ - y -= accelOptions.sens; - in_a1[1] = (-y + maxValue ) * accelOptions.yMultiplier; - }else if (y < -accelOptions.sens){ - y += accelOptions.sens; - in_a1[1] = (-y + maxValue ) * accelOptions.yMultiplier; - }else in_a1[1] = 127; - - //printf("x: %i y: %i\n", in_a1[0], in_a1[1]); - }else{ - if( x > accelOptions.sens ) in_keystate |= 1 << DKEY_LEFT; - else if( x < -accelOptions.sens ) in_keystate |= 1 << DKEY_RIGHT; - else {in_keystate &= ~(1 << DKEY_LEFT);in_keystate &= ~(1 << DKEY_RIGHT);} - - y += accelOptions.y_def; - if( y > accelOptions.sens )in_keystate |= 1 << DKEY_UP; - else if( y < -accelOptions.sens ) in_keystate |= 1 << DKEY_DOWN; - else {in_keystate &= ~(1 << DKEY_DOWN);in_keystate &= ~(1 << DKEY_UP);} - } - } - - return pl_vout_buf; -} - -// for frontend/plugin_lib.c -void update_input(void) -{ - if (g_maemo_opts & 8) - maemo_x11_update_keys(); - else { - /* process GTK+ events */ - while (gtk_events_pending()) - gtk_main_iteration(); - } -} - -int omap_enable_layer(int enabled) -{ - return 0; -} - -void menu_notify_mode_change(int w, int h, int bpp) -{ -} - -void *plat_prepare_screenshot(int *w, int *h, int *bpp) -{ - return NULL; -} - -void plat_step_volume(int is_up) -{ -} - -void plat_trigger_vibrate(int pad, int low, int high) -{ - const int vDuration = 10; - - DBusConnection* system_bus = (DBusConnection*)osso_get_sys_dbus_connection(osso); - DBusMessageIter args; - DBusMessage*msg = dbus_message_new_method_call("com.nokia.mce", - "/com/nokia/mce/request", - "com.nokia.mce.request", - "req_start_manual_vibration"); - if (msg) { - dbus_message_iter_init_append(msg, &args); - // FIXME: somebody with hardware should tune this - int speed = high; // is_strong ? 200 : 150; - int duration = vDuration; - if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &speed)) { - if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &duration)) { - dbus_connection_send(system_bus, msg, NULL); - //dbus_connection_flush(system_bus); - } - } - dbus_message_unref(msg); - } -} - -void plat_minimize(void) -{ -} - -void plat_gvideo_close(void) -{ -} - -void plat_gvideo_open(int is_pal) -{ -} diff --git a/maemo/maemo_common.h b/maemo/maemo_common.h deleted file mode 100644 index ace0bfd..0000000 --- a/maemo/maemo_common.h +++ /dev/null @@ -1,18 +0,0 @@ -int maemo_init(int *argc, char ***argv); -void maemo_finish(); - -extern char file_name[MAXPATHLEN]; -extern int g_maemo_opts; - -extern inline void key_press_event(int key,int type); - -typedef struct -{ - int sens; - int y_def; - float maxValue; - float xMultiplier; - float yMultiplier; -} accel_option; - -extern accel_option accelOptions; diff --git a/maemo/maemo_xkb.c b/maemo/maemo_xkb.c deleted file mode 100644 index 52af2ca..0000000 --- a/maemo/maemo_xkb.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2009, Wei Mingzhi <whistler@openoffice.org>. - * All Rights Reserved. - * - * 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, see <http://www.gnu.org/licenses>. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/keysym.h> -#include <X11/XKBlib.h> - -#include "../frontend/main.h" -#include "../frontend/plugin_lib.h" - -static Atom wmprotocols, wmdelwindow; -static int initialized; - - - -static void InitKeyboard(void) { - Display *disp = (Display *)gpuDisp; - if (disp){ - wmprotocols = XInternAtom(disp, "WM_PROTOCOLS", 0); - wmdelwindow = XInternAtom(disp, "WM_DELETE_WINDOW", 0); - XkbSetDetectableAutoRepeat(disp, 1, NULL); - } -} - -static void DestroyKeyboard(void) { - Display *disp = (Display *)gpuDisp; - if (disp) - XkbSetDetectableAutoRepeat(disp, 0, NULL); -} -#include "maemo_common.h" - -int maemo_x11_update_keys() { - - XEvent evt; - XClientMessageEvent *xce; - int leave = 0; - Display *disp = (Display *)gpuDisp; - - if (!disp) - return 0; - - if (!initialized) { - initialized++; - InitKeyboard(); - } - - while (XPending(disp)>0) { - XNextEvent(disp, &evt); - switch (evt.type) { - case KeyPress: - case KeyRelease: - key_press_event(evt.xkey.keycode, evt.type==KeyPress ? 1 : (evt.type==KeyRelease ? 2 : 0) ); - break; - - case ClientMessage: - xce = (XClientMessageEvent *)&evt; - if (xce->message_type == wmprotocols && (Atom)xce->data.l[0] == wmdelwindow) - leave = 1; - break; - } - } - - if (leave) { - DestroyKeyboard(); - exit(1); - } - - return 0; -} diff --git a/maemo/main.c b/maemo/main.c deleted file mode 100644 index 50e129e..0000000 --- a/maemo/main.c +++ /dev/null @@ -1,418 +0,0 @@ -/* - * (C) notaz, 2010-2011 - * - * This work is licensed under the terms of the GNU GPLv2 or later. - * See the COPYING file in the top-level directory. - */ - -#include <stdio.h> -#include <string.h> -#include <stdint.h> -#include <unistd.h> - -#include "../frontend/main.h" -#include "../frontend/menu.h" -#include "../frontend/plugin.h" -#include "../frontend/plugin_lib.h" -#include "../libpcsxcore/misc.h" -#include "../libpcsxcore/cdriso.h" -#include "../libpcsxcore/new_dynarec/new_dynarec.h" -#include "../plugins/dfinput/main.h" -#include "../plugins/dfsound/spu_config.h" -#include "maemo_common.h" - -extern int in_enable_vibration; -extern int cycle_multiplier; -extern int in_type1, in_type2; - -accel_option accelOptions; -int ready_to_go, g_emu_want_quit, g_emu_resetting; -int g_menuscreen_w, g_menuscreen_h; -int g_scaler, soft_filter; -int g_opts = 0; -int g_maemo_opts; -int cornerActions[4] = {0,0,0,0}; -int bKeepDisplayOn = FALSE; -int bAutosaveOnExit = FALSE; -char file_name[MAXPATHLEN]; -char keys_config_file[MAXPATHLEN] = "/opt/psx4m/keys"; - -enum sched_action emu_action; -void do_emu_action(void); - -static void ChangeWorkingDirectory(char *exe) -{ - char exepath[1024]; - char *s; - snprintf(exepath, sizeof(exepath), "%s", exe); - s = strrchr(exepath, '/'); - if (s != NULL) { - *s = '\0'; - chdir(exepath); - } -} - -void PrintHelp() -{ - printf("PCSX-ReARMed version %s for Maemo\n\n", PCSX_VERSION); - - printf("Usage:\n"); - printf(" pcsx [options] -cdfile FILE\n\n"); - - printf("Options:\n"); - printf(" -help : This help\n"); - printf(" -disc VALUE : Disc number for multi discs images\n"); - printf(" -fullscreen : Run fullscreen\n"); - printf(" -frameskip : Frameskip\n"); - printf(" -1=Auto (Default)\n"); - printf(" 0=Disabled\n"); - printf(" 1=Set to 1\n"); - printf(" ...\n"); - printf(" -autosave : Enable auto save on exit\n"); - printf(" -accel : Enable accelerometer\n"); - printf(" -analog : Use analog pad for accel\n"); - printf(" -vibration : Activate vibration\n"); - printf(" -sens VALUE : Set accelerometer sens [0-1000]\n"); - printf(" (Default 150)\n"); - printf(" -ydef VALUE : Set accelerometer y zero [0-1000]\n"); - printf(" (Default 500)\n"); - printf(" -max VALUE : Set accelerometer max value[0-1000]\n"); - printf(" (Default 500)\n"); - printf(" -nosound : No sound output\n"); - printf(" -bdir PATH : Set the bios path\n"); - printf(" -pdir PATH : Set the plugins path\n"); - printf(" -bios : Set the bios\n"); - printf(" -cdda : Disable CD Audio for a performance boost\n"); - printf(" -xa : Disables XA sound, which can sometimes\n"); - printf(" improve performance\n"); - printf(" -sio : SIO IRQ Always Enabled\n"); - printf(" -spuirq : SPU IRQ Always Enabled\n"); - printf(" -fps : Show fps\n"); - printf(" -cpu : Show CPU load\n"); - printf(" -spu : Show SPU channels\n"); - printf(" -nofl : Disable Frame Limiter\n"); - printf(" -mcd1 FILE : Set memory card 1 file\n"); - printf(" -mcd2 FILE : Set memory card 2 file\n"); - printf(" -region VALUE : Set PSX region\n"); - printf(" -1=Auto (Default)\n"); - printf(" 0=NTSC\n"); - printf(" 1=PAL\n"); - printf(" -cpuclock VALUE: PSX CPU clock %% [1-500]\n"); - printf(" (Default 50)\n"); - printf(" -displayon : Prevent display from blanking\n"); - printf(" (Default disabled)\n"); - printf(" -keys FILE : File with keys configuration\n"); - printf(" (Default /opt/psx4m/keys)\n"); - printf(" -corners VALUE : Define actions for click on the\n"); - printf(" display corners\n"); - printf(" VALUE is a four digit number, each number\n"); - printf(" represent a corner (topleft, topright,\n"); - printf(" bottomright and bottomleft\n"); - printf(" Actions:\n"); - printf(" 0=No action\n"); - printf(" 1=Save\n"); - printf(" 2=Load\n"); - printf(" 3=Change slot (+1)\n"); - printf(" 4=Change slot (-1)\n"); - printf(" 5=Quit\n"); - printf(" -guncon : Set the controller to guncon\n"); - printf(" -gunnotrigger : Don't trigger (shoot) when touching screen\n"); - printf(" 0=Auto (Default)\n"); - printf(" 1=On\n"); - printf(" 2=Off\n"); - - - printf("\nGPU Options:\n"); - printf(" -gles : Use the GLES plugin (gpu_gles.so)\n"); - printf(" -oldgpu : Use the peops plugin (gpu_peops.so)\n"); - printf(" -unai : Use the unai plugin (gpu_unai.so)\n"); - - printf("\nSound Options:\n"); - printf(" -spu_reverb VALUE : Enable/disable reverb [0/1]\n"); - printf(" (Default disabled)\n"); - printf(" -spu_interpolation VALUE : Set interpolation mode\n"); - printf(" 0=None (Default)\n"); - printf(" 1=Simple\n"); - printf(" 2=Gaussian\n"); - printf(" 3=Cubic\n"); - - printf("\nNeon Options (default GPU):\n"); - printf(" -enhance : Enable graphic enhancement\n"); - - printf("\nGles Options:\n"); - printf(" -gles_dithering VALUE : Enable/disable dithering [0/1]\n"); - printf(" (Default disabled)\n"); - printf(" -gles_mask VALUE : Enable/disable mask detect [0/1]\n"); - printf(" (Default disabled)\n"); - printf(" -gles_filtering VALUE : Texture Filtering\n"); - printf(" 0=None (Default)\n"); - printf(" 1=Standard\n"); - printf(" 2=Extended\n"); - printf(" 3=Standard-sprites\n"); - printf(" 4=Extended-sprites\n"); - printf(" 5=Standard+sprites\n"); - printf(" 6=Extended+sprites\n"); - printf(" -gles_fbtex VALUE : Framebuffer Textures\n"); - printf(" 0=Emulated VRam (Default)\n"); - printf(" 1=Black\n"); - printf(" 2=Card\n"); - printf(" 3=Card+soft\n"); - printf(" -gles_vram VALUE : Texture RAM size in MB [4-128]\n"); - printf(" (Default 64)\n"); - printf(" -gles_fastmdec VALUE : Enable/disable Fast Mdec [0/1]\n"); - printf(" (Default disabled)\n"); - printf(" -gles_advblend VALUE : Enable/disable Adv. Blend [0/1]\n"); - printf(" (Default disabled)\n"); - printf(" -gles_opaque VALUE : Enable/disable Opaque Pass [0/1]\n"); - printf(" (Default disabled)\n"); -} - -int main(int argc, char **argv) -{ - if (argc == 1 || (argc == 2 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-help") || !strcmp(argv[1], "-h")))) { - PrintHelp(); - return 0; - } - - emu_core_preinit(); - ChangeWorkingDirectory("c"); - char file[MAXPATHLEN] = ""; - char path[MAXPATHLEN]; - const char *cdfile = NULL; - int loadst = 0; - int i; - int getst = -1; - int discNumber = 0; - - g_menuscreen_w = 800; - g_menuscreen_h = 480; - - strcpy(Config.Gpu, "builtin_gpu"); - strcpy(Config.Spu, "builtin_spu"); - strcpy(Config.BiosDir, "/home/user/MyDocs"); - strcpy(Config.PluginsDir, "/opt/maemo/usr/games/plugins"); - snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "/opt/maemo/usr/games" PATCHES_DIR); - Config.PsxAuto = 1; - pl_rearmed_cbs.frameskip = -1; - strcpy(Config.Bios, "HLE"); - spu_config.iUseReverb = 1; - spu_config.iUseInterpolation = 1; - spu_config.idiablofix = 0; - in_type1 = PSE_PAD_TYPE_STANDARD; - in_type2 = PSE_PAD_TYPE_STANDARD; - - accelOptions.sens = 150; - accelOptions.y_def = 500; - accelOptions.maxValue = 500.0; - - // read command line options - for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1; - else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]); - else if (!strcmp(argv[i], "-cdfile")) { - char isofilename[MAXPATHLEN]; - if (i+1 >= argc) break; - strncpy(isofilename, argv[++i], MAXPATHLEN); - if (isofilename[0] != '/') { - getcwd(path, MAXPATHLEN); - if (strlen(path) + strlen(isofilename) + 1 < MAXPATHLEN) { - strcat(path, "/"); - strcat(path, isofilename); - strcpy(isofilename, path); - } else - isofilename[0] = 0; - } - cdfile = isofilename; - } - else if (!strcmp(argv[i],"-frameskip")) { - int tv_reg = atol(argv[++i]); - if (tv_reg < -1) - pl_rearmed_cbs.frameskip = -1; - else - pl_rearmed_cbs.frameskip = tv_reg; - } - else if (!strcmp(argv[i],"-region")) { - int psx_reg = atol(argv[++i]); - if (psx_reg == 0 || psx_reg == 1){ - Config.PsxAuto = 0; - Config.PsxType = psx_reg; - } - } - - else if (!strcmp(argv[i],"-get_sstatename")) getst = atol(argv[++i]); - - else if (!strcmp(argv[i], "-fullscreen")) g_maemo_opts |= 2; - else if (!strcmp(argv[i], "-accel")) g_maemo_opts |= 4; - else if (!strcmp(argv[i], "-nosound")) strcpy(Config.Spu, "spunull.so"); - else if (!strcmp(argv[i], "-bdir")) sprintf(Config.BiosDir, "%s", argv[++i]); - else if (!strcmp(argv[i], "-pdir")) sprintf(Config.PluginsDir, "%s", argv[++i]); - else if (!strcmp(argv[i], "-bios")) sprintf(Config.Bios, "%s", argv[++i]); - else if (!strcmp(argv[i], "-gles")) { strcpy(Config.Gpu, "gpu_gles.so"); g_maemo_opts |= 8 ;} - else if (!strcmp(argv[i], "-oldgpu")) strcpy(Config.Gpu, "gpu_peops.so"); - else if (!strcmp(argv[i], "-unai")) strcpy(Config.Gpu, "gpu_unai.so"); - else if (!strcmp(argv[i], "-cdda")) Config.Cdda = 1; - else if (!strcmp(argv[i], "-xa")) Config.Xa = 1; - else if (!strcmp(argv[i], "-rcnt")) Config.RCntFix = 1 ; - else if (!strcmp(argv[i], "-sio")) Config.Sio = 1; - else if (!strcmp(argv[i], "-spuirq")) Config.SpuIrq = 1; - else if (!strcmp(argv[i], "-vsync")) Config.VSyncWA = 1; - else if (!strcmp(argv[i], "-fps")) g_opts |=OPT_SHOWFPS; - else if (!strcmp(argv[i], "-cpu")) g_opts |=OPT_SHOWCPU; - else if (!strcmp(argv[i], "-spu")) g_opts |=OPT_SHOWSPU; - else if (!strcmp(argv[i], "-nofl")) g_opts |=OPT_NO_FRAMELIM; - else if (!strcmp(argv[i], "-mcd1")) sprintf(Config.Mcd1, "%s", argv[++i]); - else if (!strcmp(argv[i], "-mcd2")) sprintf(Config.Mcd2, "%s", argv[++i]); - - else if (!strcmp(argv[i], "-cpuclock")) cycle_multiplier = 10000 / atol(argv[++i]); - else if (!strcmp(argv[i], "-guncon")) in_type1 = PSE_PAD_TYPE_GUNCON; - else if (!strcmp(argv[i], "-gunnotrigger")) g_opts |= OPT_TSGUN_NOTRIGGER; - else if (!strcmp(argv[i], "-analog")) in_type1 = PSE_PAD_TYPE_ANALOGPAD; - else if (!strcmp(argv[i], "-vibration")) { in_type1 = PSE_PAD_TYPE_ANALOGPAD; in_enable_vibration = 1; } - else if (!strcmp(argv[i], "-sens")) accelOptions.sens = atol(argv[++i]); - else if (!strcmp(argv[i], "-ydef")) accelOptions.y_def = atol(argv[++i]); - else if (!strcmp(argv[i], "-max")) accelOptions.maxValue = atol(argv[++i]); - else if (!strcmp(argv[i], "-displayon")) bKeepDisplayOn = TRUE; - else if (!strcmp(argv[i], "-keys")) sprintf(keys_config_file, "%s", argv[++i]); - else if (!strcmp(argv[i], "-autosave")) bAutosaveOnExit = TRUE; - else if (!strcmp(argv[i], "-disc")) discNumber = atol(argv[++i]); - else if (!strcmp(argv[i], "-corners")){ - int j = 0; - i++; - char num[2]; - for (j=0; j<strlen(argv[i]); j++){ - strncpy(num, argv[i] + j, 1); - cornerActions[j] = atoi(num); - } - } - - else if (!strcmp(argv[i], "-spu_reverb")) spu_config.iUseReverb = atol(argv[++i]); - else if (!strcmp(argv[i], "-spu_interpolation")) spu_config.iUseInterpolation = atol(argv[++i]); - - else if (!strcmp(argv[i], "-enhance")) pl_rearmed_cbs.gpu_neon.enhancement_enable = 1; - else if (!strcmp(argv[i], "-enhancehack")) pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1; - - else if (!strcmp(argv[i], "-gles_dithering")) pl_rearmed_cbs.gpu_peopsgl.bDrawDither = atol(argv[++i]); - else if (!strcmp(argv[i], "-gles_mask")) pl_rearmed_cbs.gpu_peopsgl.iUseMask = atol(argv[++i]); - else if (!strcmp(argv[i], "-gles_filtering")) pl_rearmed_cbs.gpu_peopsgl.iFilterType = atol(argv[++i]); - else if (!strcmp(argv[i], "-gles_fbtex")) pl_rearmed_cbs.gpu_peopsgl.iFrameTexType = atol(argv[++i]); - else if (!strcmp(argv[i], "-gles_vram")) pl_rearmed_cbs.gpu_peopsgl.iVRamSize = atol(argv[++i]); - else if (!strcmp(argv[i], "-gles_fastmdec")) pl_rearmed_cbs.gpu_peopsgl.bUseFastMdec = atol(argv[++i]); - else if (!strcmp(argv[i], "-gles_advblend")) pl_rearmed_cbs.gpu_peopsgl.bAdvancedBlend = atol(argv[++i]); - else if (!strcmp(argv[i], "-gles_opaque")) pl_rearmed_cbs.gpu_peopsgl.bOpaquePass = atol(argv[++i]); - - else { - fprintf(stderr, "Unknown option: %s\n", argv[i]); - return 1; - } - } - - pl_init(); - if (emu_core_init() == -1) - return 1; - - if (cdfile) { - set_cd_image(cdfile); - strcpy(file_name, strrchr(cdfile,'/')); - } - - if (LoadPlugins() == -1) { - SysMessage("Failed loading plugins!"); - return 1; - } - - if (discNumber > 0) - cdrIsoMultidiskSelect = discNumber - 1; - - if (OpenPlugins() == -1) { - return 1; - } - plugin_call_rearmed_cbs(); - - CheckCdrom(); - - if (getst >= 0){ - char fname[MAXPATHLEN]; - - get_state_filename(fname, sizeof(fname), getst); - printf("SAVESTATE: %s\n", fname); - if (cdrIsoMultidiskCount > 1){ - int i = 0; - for (i=1; i<cdrIsoMultidiskCount; i++){ - cdrIsoMultidiskSelect = i; - CdromId[0] = '\0'; - CdromLabel[0] = '\0'; - - CDR_close(); - if (CDR_open() == 0){ - CheckCdrom(); - get_state_filename(fname, sizeof(fname), getst); - printf("SAVESTATE: %s\n", fname); - } - } - } - return 0; - } - - SysReset(); - - if (file[0] != '\0') { - if (Load(file) != -1) - ready_to_go = 1; - } else { - if (cdfile) { - if (LoadCdrom() == -1) { - ClosePlugins(); - printf(_("Could not load CD-ROM!\n")); - return -1; - } - emu_on_new_cd(0); - ready_to_go = 1; - } - } - - if (!ready_to_go) { - printf ("something goes wrong, maybe you forgot -cdfile ? \n"); - return 1; - } - - if (cdrIsoMultidiskCount > 1) - printf ("Loaded a multidisc image: %i discs.\n", cdrIsoMultidiskCount); - - // If a state has been specified, then load that - if (loadst) { - int ret = emu_load_state(loadst - 1); - printf("%s state %d\n", ret ? "Failed to load" : "Loaded", loadst); - state_slot = loadst - 1; - } - - if (maemo_init(&argc, &argv)) - return 1; - - if (GPU_open != NULL) { - int ret = GPU_open(&gpuDisp, "PCSX", NULL); - if (ret){ - fprintf(stderr, "Warning: GPU_open returned %d\n", ret); - gpuDisp=ret; - } - } - - if (Config.HLE) - printf("Note: running without BIOS, expect compatibility problems\n"); - - dfinput_activate(); - pl_timing_prepare(Config.PsxType); - - while (1) - { - stop = 0; - emu_action = SACTION_NONE; - - psxCpu->Execute(); - if (emu_action != SACTION_NONE) - do_emu_action(); - } - - maemo_finish(); - return 0; -} - |
