From: meepingsnesroms Date: Fri, 7 Apr 2017 16:14:29 +0000 (-0700) Subject: Remove dead non retroarch platforms, prepare for second memcard X-Git-Tag: r24l~795^2~1 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76e889bcfaf9776b071627e7e8c9bff0465f539c;p=pcsx_rearmed.git Remove dead non retroarch platforms, prepare for second memcard --- diff --git a/debian_maemo/buildpkg b/debian_maemo/buildpkg deleted file mode 100644 index 4c34f949..00000000 --- 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 e3395de3..00000000 --- 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 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 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 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 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 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 Fri, 20 Apr 2012 20:27:19 +0200 - -pcsxrearmed (0.4.0.14.7) unstable; urgency=low - - * Fixed -displayon - - -- sakya 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 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 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 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 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 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 Wed, 30 Mar 2012 09:44:51 +0200 - -pcsxrearmed (0.4.0.14) unstable; urgency=low - - * Updated to r14 - * Added --help - * PCSX4All - - -- sakya Sun, 27 Dec 2011 00:02:27 +0200 - -pcsxrearmed (0.4.0.12.2) unstable; urgency=low - - * gpu-gles - - - -- Bonapart Sun, 27 Dec 2011 00:02:27 +0200 diff --git a/debian_maemo/compat b/debian_maemo/compat deleted file mode 100644 index 7ed6ff82..00000000 --- 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 4469ed89..00000000 --- a/debian_maemo/control +++ /dev/null @@ -1,115 +0,0 @@ -Source: pcsxrearmed -Section: user/games -Priority: extra -Maintainer: Bonapart -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: - iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c - 6QAAEStJREFUaN7Fmn+wXVV1xz9r733uufe+e9+DJIRESEICEQghAUQBI8Uo - ik7jrxm1o+3ooB2RkWrtONqZlhn7Y8bRUVudqVZsoTjFH2CrSKsVEFIQIr8C - JARC0CDkBwkkIcl7L7n3nLP36h97n3Pvo07/7c2cOfeenB9rr/Vd3/Vd6zxh - 7DM52b9isj+5YcGC+a9bunTpOVNTU91WK5Msy1ECIgYRMGKxzmGtQQBrHSZ9 - R8C5DOcc1hiMtTjrsM4hAtZYWq1W/H9nyZzDZVk6x9LKWmSteH2rlZNlLhw/ - fnzXszt3fmHjxo13bH74oReBwbbtO6r0ODht5UpnfXXdytOXX+mswVcl1hqc - swjgQ0BV8T7gfSCEQFBQFFQJqqhquptpHCJiMGIQKxhjsdZircMai8kczibj - XUaWZdi0d1lGlrVwmdN2nsvypUtZvmwpw7LY8dSTT37yX264/sGgOrNl67ZS - AFavPudTF5y76u9fOniQZ3/7PLPHjuG9Z8wSJO7QeAABVIW0DFAFBEVANF0j - AGh9XBWV9L3eRFAx6dr6XFDiMWMNy049VS9Yu4o/et+7xBj78u5duz78lS9/ - 8U6UoZx59lnZ2StXbMP7lT+7cyNFUWCsbQwmyLhTo1EiydvpSFogIpiIMQST - zhOMMSAmnmcMIhYxgogFYxBjEYnnYOIWn2OjA4IiRjhj+TL98uc/K5X3W7Zs - 2fKBf/72Pz5tZmdmz5jodJZtfeppyqqK+LQx3EYtpm0wRChYazBWMCYaasRg - TFwAUu/TsgyIiecytkAxBjG1sTZuzfe4GIwDk4GxqMmQLAdx7PjNs/KNG75H - 3srWLFmy5E3P79rj7Omnr7is08o+8Otnn6MYFtGIErQCyZXsqxW6B3S3gQqw - /I6PNgEZwSPmQAMVYxERVCSSQTI8et4iYtF6MckhcXECJuWSGPbvf1EvumCN - nDA1taIoypuNr6pFg6JgMEjGe2Ch0vpmSXdnQeuqQPeeivZtBbI6oIWiKJqS - WLU2vM6POh2SIZjEXpIMtglGdSTib9IxEsSoFy9mBFtjmTleyJ33bMIYOevQ - oUMnuLIs5w+LkuCr+HAP+dcqWu8PFD8SZAEwA9kGxawuOXZeBjMGXJ0BNMk4 - gpIZYbr2ZvJ6hJBrftcLEGPTfVJ+EBcfUo6pgohQhMCBgwdB4fDhw5MG6JdV - RQgKQZAO2IuVMIDB+xzhcWF4lWP4FUPYZJATf1dCp0ROxps69LXR1mGsTZtD - TNrbWE/i9/jbmFEiRx6oCSCRRHJZURTMzMx0nUK7LD2KIgZ0CPoM2KWQf8tj - TlPkZGX4GRdNdiTvzzW+Nrg2voaIqb1uHUYsYm2KRNxURnBSTfdB4k5r6q0x - qogIIShFWVKWZWa8962y8g0eRGH4GYd/Usg/GsjerHQ2VnRuK7GvC6iXhjpH - xo+MyPOcdruNsTZyughiXFxI42mHuAyswzgLNrGRNWANYg1gUCOoMQ2DYUZ5 - JgKqahxI5n0Y4cJBeMxw7LwM+6ZA62880o454C4rmb1U4AkLrXHjY6UNqpx6 - ymKm+n2qEBgUFUemZzk8PYsPinMxIsa6xDAR71rXjFj/CJo8WdNDXeQTY4iA - tZHVnKo61VBfCW3FXqzoUCl/bnB/ECj+0uGurGj/bcBdESifcBGLKQIN5oFu - p8OCBfPpdDp0u13yvI1X5fnd+9jx210cOjJDnmUY4yLOE9xACEmamHoRQZtF - aar0oBgxOJfFBYgxTjXxeGVgnqdzd4nuh9mLshizFkieHDKcyzam5nNjICjt - djS81+sxMTHB5OQkvV6P89euoZXn3Pfgo9y16RGKMiDWRu8bQVTQEEAiPQsh - KoAwqjApDBgjZM5F54mIa5IwA31OKL5kMYthYkeJe2ege39Bfm3Ab4fqJy7i - PVjEW/AGCel3sHTb0fh+v8/k5CQ+KEemZ+h0u8yfN48PvvddXPvpq5ma6qMK - 1goGk2qdIKYmZlMrLiBE+ISAAkaELMswxohx1mZSaxgBnFD8hePYBx3V92PW - hEeFwecyjr+lA7stsgDMUkWWhLidGpBXBWRxQPvKZH+yWcA9v9rMN2+8mWd2 - Pk+/36fX6/G615zHtZ++GucsqpIkR6obgJFXVPfa+QliYgwuy7DW4sQYGdFg - UsMC1fct1Q8c+ZdKqq9lhBds1D3WYt8zwP3JMNFc/RTBiPLcXdtZ9/LFdHtd - +v0+/ck+Yi0vHXyZXq9Ht9ul3W5z2bqLeNsb13HrHffQytvUVdSIRPyPVfna - +HpJxiSpL4LTEDAxHFFC12IssUz51y2oBNOSVPqF8MMu1X90QWykR7EY46iq - ite89VImzp6Ixvf7tLIW1rbodDtMTEzQ6XTI85w8z7nowvP54U/vJs9Hyanq - myKpKKIpAppEsWqCXhRlTlUxSbvXJTtSlYyS1tTcnKrt0CKFbSqqcZHnfeVY - 0DupMb7X65HlOVhD3mo33s/znCzLWLl8Ka08IxBtUA1NUBVFJeoukdg0ee+Z - mZllMBwgCM45cSGEEPHX0OzcRqaWv4y+R/GVqmqSCJJ6iM5Ep2GeXq9H1soR - sWSt1hzjsyxj3oknMJG3KGqmqTsmiaCvo1BWnmJYUJRDKu9HjZIqzhijseSb - RlXW+zoqkSJMoyZreWDHKms8Bt1urzG+1+vhsgwjllaWkef5qB+2lsoHfEj8 - PoZ3QQjeU5QFRVFSlRUh+Oa8qIK1gVAwxozEWLpN3Tr6oIhRjIJY0yhHsbEB - qQWaMRapPN1uh36/z8TEBN1ul8xliAHrsjnGG2PY88I+Zo4dZ6I3EVnHB4qy - ZDgYUpYVGkJqbUO0SAEJqAYq72MEAG+SFtc6DwREU6+bIhCA4AMWgzhpEnek - c2KE6iJWV+I4jbA4Z2vubqK96aHHokQuo5eHRYEGT0hDBG0wLU0VltRi+qqK - CxARX+uKV+J/1HhHcRXVo+C9EvB4FWwAYwLz5p+IwZC1crrdLp1Oh3a7jRhD - 5QODwSAZBoPhkLvv/RXfuP4mPIbS+5iA49t4m9QcjwUt+EBRFrV0I4y8ImOV - Q5qOKiZzrUINKlBVnrzlWLFsCWefdQbr113CLx94BCNCp9Oh0+nQarWoqujZ - m370U3bs3MWik+Zx5OhRfnHPJnrdLsOyZPr4MarKY63BGtMYKnXhIsKmXogP - nqIogajuGwjVTKQyd+yROnQCUJYVJ05NsWb1Kt74hks4c+XpnPKqxfT7fZ58 - 5lmyVqsxPsuilsqtsPrMM7jktWs5/bRl9HtdrvnYh7HWMhgMefHAQR7c/Dg/ - u3Mjj27djnEWI6aJQNJ0zcd7T1EMI4RUtaqTamxWMoJOUoo+KKcsWsglF13I - 773hEk6av4B+vzcnYV8+fKQpUs45nHMcPTrNT757Heede04zwfhfcAXeuv5S - Pvepj3PHXffw2c9/kWd378Vg0DAXRqrgK89gMCSEMJbEafxBrVoZNS55nnP5 - G9dx+frLmgJVU+TR6Vnu+O/7+Pdb/4vHt2zjfe/ZEKdsaTRTVSWLTl6Ic5ay - qjg2e4ytTz3NDf96C4889jjHBkP+/E+v5sMfeC/tPOcdb38LU/0+7//jT3J0 - enpsXDDKCx88xTAtQKFsIKRjA6t6WqZw9qvP4PL1lzE5OcnExATtdocHHn6M - +x/azP0PPkorb7P23HO4MG8nre6oqdmK4cCBg+zavYc77v4lP7/rHrZse4oz - Vqxg7bnn8o4r1vPmy9Y1zATw4oGDBO/RkPJRx1pKjRAaDCMpOIGqSWIZTdqU - URIfPjpNnrdHnncZe/e/xAknnMDVH/0Q6y+9hFVnvZp/+s73CaqM15V+v8s1 - n72W5/fsY3Z2lt9/y3o+9fErOX/NOSxfthTnRoOmF/bt58bv3sz1N93CzOzs - qJGRxEAoSCB4z3A4yoFiVAdovB6naQYV4bnd+/jCV7/BuzdcwaVvuJjTly/i - z675GO12m06n00gDl2WNWhyfXBw9Ms2nr7qSd2+4gkUnL6Tdzkd5oPCrBx/m - m9d/h433PcjR6RmGRTXWTupcFKnifcWwzgERKWMEatYZCdjxAe2uF/bxtW/d - yNe/fSNrV69i1dmvZvHCRbSyDLGW/fv38/O77uX1//CVOcl5+MhRbv/xTSw6 - eWGjX7z3TE9P88Nbf8oNN93MY1ufjHoqiUljYncW6sSlrgFRRnhfMSzqHFAt - jJFGsMXRRuR+bSZjMULORSmxdfuveXzbMzFlxiYS5XDI3n37eenAQebPOzFC - CeLMCXjpwEGe3P4Mt/zoNv7z9l/w/J59KYKt6NwxxlFlrIAx+h0ghEAxLOIC - gmpRj/5C7XV5xfiiRkRiVWcdtOq5T2z9xBjaeYu/+uLf8YN/u5ULzlvNhisu - ZzAcsOnBh9m9dy+3/+JeNm95giNHZ8haGZNT/cjxGtvGKB9CQkpACQRCwkBI - 8jouoCxLvPfqNIRBnQOicY6TXBvlrMaGew60dCT8JIUcBWMNBw4d5t5ND3Pf - A4/wvVt+wuzsMbZt/zXT09MMyxJjLZ1Op1GUUmuexsPjsoH4m7lsFEKgrLXQ - KInndIdzJs9xRhPHHLFKayrtBiQZks4REWxm0QAHXz4MCoNiCBiyzKVnNJiI - 9wmRYXTMeG2eERKca4qJLBRqNaqqRZ7nWOua1q2REPWKAs1UTALxfVkawMYb - +9F8RxQNZvz9B6iMTbLjTUMIc7yu9Z4wFoUR89T72ODXL0oEZ4yUcQFWVcbZ - TZtmRhtRFXm4rtIRXqnZVghGRzYzPmtPhKraDK8aVtG52J/LOjp6hUVI3lVE - RK2NswsHlK34llCa7BeNuKd2uU0tTkA1hiJG1qNqmh6C1F01EJyzklFyJspJ - JBNSDigStDlWGz96AZGco4qNr31qOS1F1spod9ujKXP9Uq5OgWa0B0ZHN2s8 - Qz3XTBBibpvYxLSBgI4aljpx0Yb3m1eHiaHGtZ8I5O0cUMqy9KaqyuPe+4OL - Fy4kc07rmzH2kDjqCOnBPr4F0YCGufuAJwSPBo+G6hVbOlc9IV2j9bWEdN8k - F9SPYEZgjH5oOdHFCxcwHBb7q6oqzNGj00cOHjz05No1q1lw4qSoD801UlfC - Bn5a3yfOMTUWn7gF8CkR/4+NEFknfq/vXz9z9LwRtBI0gxK8Z+H8E2XtmtXs - 3bv38enp6VlzbHb25W3bnnhANQzeseFtKBWVL0bYk9jU61jySTP1Do2XGsrT - MOa5sU1HXZXq+LFRtyK11yXMmciB4qsCoeRd73w7RVEc37x586YjR44ctsba - 7NChQ3m73T7ltRe+Zumac1ax9Yltenx6RsSmF26M6aRxlkpo1zQASEgevQTU - MRgSKTJomHMMJb7pb/7RRDbWBk91/DiTUxN6zVUfkWVLlnDvvffed//99/8Y - +I0VkWCtMc/s2DHw3i9at+71C996+Xrp9Sd01/O7ZHD8GASP+gpClfbxt097 - rY/7ilAlvPt4bHwLVUmo4n1COten65rzqmL0PXgmum3eueEK/ciH/lBOmJrU - 2267bevtt9/+XeBRYJ8Att3OT6oqf6b3/pJ58+a96ROf+MRFZ5115sTk5JTp - 93vSzttYF//OwaU/2siyLPatiSqNiXI8TjhoeoIRe0gjr4MGqjI6oKoqyqKk - KAqGxRBf+TQIGFKWJbMzszozOxt27tw5e9111z1w4MCBO4H7gKeBlwWg3c5b - 3of5VVWtUNVzgfMvvvji80477bQFS5Ys6VprTd301IaNG2iMaWBR9wKNwa/Y - 69j8sqoqQhpeeR8Nr+V22sKePXuO7969+6WHHnroseT1x4GdwCGgbFzU7XSy - wXDYDyGcDKwAlgOLgUmgzf/PZwgcAV4Ank2G7wemgRLgfwDIFWZCNtkwCgAA - AABJRU5ErkJggg== diff --git a/debian_maemo/copyright b/debian_maemo/copyright deleted file mode 100644 index 75a6b06d..00000000 --- a/debian_maemo/copyright +++ /dev/null @@ -1,2 +0,0 @@ -this package was maemonized by Roman Deninberg -Mon, 10 Jan 2011 02:00:13 +0100 diff --git a/debian_maemo/dirs b/debian_maemo/dirs deleted file mode 100644 index 33359b87..00000000 --- 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 e845566c..00000000 --- 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 0cc57dd6..00000000 --- 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 a260186e..00000000 --- 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 5230bf73..00000000 --- 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/frontend/320240/caanoo.gpe b/frontend/320240/caanoo.gpe deleted file mode 100755 index 9d6154a4..00000000 --- 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 '\'; then - oldmount=`grep mmcblk /proc/mounts | grep '\' | 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 624056df..00000000 --- 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 3585a719..00000000 --- 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 deleted file mode 100644 index ed220a0f..00000000 Binary files a/frontend/320240/pcsx26.png and /dev/null differ diff --git a/frontend/320240/pcsx_rearmed.ini b/frontend/320240/pcsx_rearmed.ini deleted file mode 100644 index b15497f4..00000000 --- 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 deleted file mode 100644 index ff5a48a2..00000000 Binary files a/frontend/320240/pcsxb.png and /dev/null differ diff --git a/frontend/320240/pollux_set.c b/frontend/320240/pollux_set.c deleted file mode 100644 index f49e7775..00000000 --- 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 -#include -#include -//#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 -#include -#include -#include -#include - -static void usage(const char *binary) -{ - int i; - printf("usage:\n%s \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 deleted file mode 100644 index 0efdd183..00000000 Binary files a/frontend/320240/skin/background.png and /dev/null differ diff --git a/frontend/320240/skin/font.png b/frontend/320240/skin/font.png deleted file mode 100644 index c526a086..00000000 Binary files a/frontend/320240/skin/font.png and /dev/null differ diff --git a/frontend/320240/skin/readme.txt b/frontend/320240/skin/readme.txt deleted file mode 100644 index dd839639..00000000 --- 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 deleted file mode 100644 index 5062cc23..00000000 Binary files a/frontend/320240/skin/selector.png and /dev/null differ diff --git a/frontend/320240/skin/skin.txt b/frontend/320240/skin/skin.txt deleted file mode 100644 index 1d6979f8..00000000 --- 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 a9c4413e..00000000 --- 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/libpicofe b/frontend/libpicofe deleted file mode 160000 index 21604a04..00000000 --- a/frontend/libpicofe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 21604a047941b8fe81d381ede0371c75da964afd diff --git a/frontend/libretro.c b/frontend/libretro.c index 4d56356a..bf94f16e 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -64,6 +64,7 @@ static int is_pal_mode; /* memory card data */ extern char Mcd1Data[MCD_SIZE]; +extern char Mcd2Data[MCD_SIZE]; extern char McdDisable[2]; /* PCSX ReARMed core calls and stuff */ @@ -1711,6 +1712,7 @@ void retro_init(void) McdDisable[0] = 0; McdDisable[1] = 1; init_memcard(Mcd1Data); + init_memcard(Mcd2Data); SaveFuncs.open = save_open; SaveFuncs.read = save_read; diff --git a/frontend/main.c b/frontend/main.c index 6887dd1e..2d438aa1 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -721,10 +721,10 @@ void SysReset() { // reset can run code, timing must be set pl_timing_prepare(Config.PsxType); - EmuReset(); - - // hmh core forgets this + // hmh core forgets this CDR_stop(); + + EmuReset(); GPU_updateLace = real_lace; g_emu_resetting = 0; diff --git a/frontend/pandora/pcsx.png b/frontend/pandora/pcsx.png deleted file mode 100644 index 71f36d0e..00000000 Binary files a/frontend/pandora/pcsx.png and /dev/null differ diff --git a/frontend/pandora/pcsx.pxml.templ b/frontend/pandora/pcsx.pxml.templ deleted file mode 100644 index f748065d..00000000 --- a/frontend/pandora/pcsx.pxml.templ +++ /dev/null @@ -1,42 +0,0 @@ - - - - - PCSX ReARMed - - - - - - - PCSX ReARMed %PR% - - PCSX ReARMed %PR% - - - PCSX ReARMed is heavily optimized PlayStation Emulator. It's a PCSX fork based on the PCSX-Reloaded project, which itself contains code from PCSX, PCSX-df and PCSX-Revolution. - -The emulator features MIPS->ARM recompiler by Ari64 and ARM NEON GPU by Exophase, that in many cases produces pixel perfect graphics at very high performance. There is also NEON-optimized GTE code, optimized P.E.Op.S. (Pete's) SPU; PCSX4ALL and traditional P.E.Op.S. GPUs are also available. - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/pandora/pcsx.sh b/frontend/pandora/pcsx.sh deleted file mode 100755 index 710f6413..00000000 --- a/frontend/pandora/pcsx.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# stupid nub mode thing -nub0mode=`cat /proc/pandora/nub0/mode` -nub1mode=`cat /proc/pandora/nub1/mode` -/usr/pandora/scripts/op_nubchange.sh absolute absolute - -# 4MB for RAM (2+align) + 2MB for vram (1+overdraw) -# + 10MB for gpu_neon (8+overdraw) + 8MB LUTs -# no big deal if this fails, only performance loss -sudo -n /usr/pandora/scripts/op_hugetlb.sh 24 - -# C64x DSP for SPU -sudo -n /usr/pandora/scripts/op_dsp_c64.sh - -./pcsx "$@" - -# restore stuff if pcsx crashes -./picorestore -sudo -n /usr/pandora/scripts/op_lcdrate.sh 60 -sudo -n /usr/pandora/scripts/op_gamma.sh 0 -sudo -n /usr/pandora/scripts/op_hugetlb.sh 0 - -/usr/pandora/scripts/op_nubchange.sh $nub0mode $nub1mode diff --git a/frontend/pandora/picorestore.c b/frontend/pandora/picorestore.c deleted file mode 100644 index 77f57202..00000000 --- a/frontend/pandora/picorestore.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * picorestore - clean up after an omapfb program crash - * - * Copyright (c) Gražvydas "notaz" Ignotas, 2010 - * - * 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int main() -{ - struct fb_var_screeninfo fbvar; - struct omapfb_plane_info pi; - struct omapfb_mem_info mi; - int ret, fbdev, kbdfd; - - fbdev = open("/dev/fb0", O_RDWR); - if (fbdev == -1) { - perror("open fb0"); - goto end_fb0; - } - - ret = ioctl(fbdev, FBIOGET_VSCREENINFO, &fbvar); - if (ret == -1) { - perror("FBIOGET_VSCREENINFO ioctl"); - goto end_fb0; - } - - if (fbvar.yoffset != 0) { - printf("fixing yoffset.. "); - fbvar.yoffset = 0; - ret = ioctl(fbdev, FBIOPAN_DISPLAY, &fbvar); - if (ret < 0) - perror("ioctl FBIOPAN_DISPLAY"); - else - printf("ok\n"); - } - -end_fb0: - if (fbdev >= 0) - close(fbdev); - - fbdev = open("/dev/fb1", O_RDWR); - if (fbdev == -1) { - perror("open fb1"); - goto end_fb1; - } - - ret = ioctl(fbdev, OMAPFB_QUERY_PLANE, &pi); - ret |= ioctl(fbdev, OMAPFB_QUERY_MEM, &mi); - if (ret != 0) - perror("QUERY_*"); - - pi.enabled = 0; - ret = ioctl(fbdev, OMAPFB_SETUP_PLANE, &pi); - if (ret != 0) - perror("SETUP_PLANE"); - - mi.size = 0; - ret = ioctl(fbdev, OMAPFB_SETUP_MEM, &mi); - if (ret != 0) - perror("SETUP_MEM"); - -end_fb1: - if (fbdev >= 0) - close(fbdev); - - kbdfd = open("/dev/tty", O_RDWR); - if (kbdfd == -1) { - perror("open /dev/tty"); - return 1; - } - - if (ioctl(kbdfd, KDSETMODE, KD_TEXT) == -1) - perror("KDSETMODE KD_TEXT"); - - close(kbdfd); - - return 0; -} diff --git a/frontend/pandora/skin/background.png b/frontend/pandora/skin/background.png deleted file mode 100644 index f4b45239..00000000 Binary files a/frontend/pandora/skin/background.png and /dev/null differ diff --git a/frontend/pandora/skin/font.png b/frontend/pandora/skin/font.png deleted file mode 100644 index 707a5b43..00000000 Binary files a/frontend/pandora/skin/font.png and /dev/null differ diff --git a/frontend/pandora/skin/readme.txt b/frontend/pandora/skin/readme.txt deleted file mode 100644 index dd839639..00000000 --- a/frontend/pandora/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/pandora/skin/selector.png b/frontend/pandora/skin/selector.png deleted file mode 100644 index a4391696..00000000 Binary files a/frontend/pandora/skin/selector.png and /dev/null differ diff --git a/frontend/pandora/skin/skin.txt b/frontend/pandora/skin/skin.txt deleted file mode 100644 index 1d6979f8..00000000 --- a/frontend/pandora/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/pandora/ui_feat.h b/frontend/pandora/ui_feat.h deleted file mode 100644 index 3bb808af..00000000 --- a/frontend/pandora/ui_feat.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef UI_FEATURES_H -#define UI_FEATURES_H - -#define MENU_BIOS_PATH "/pandora/appdata/pcsx_rearmed/bios/" -#define BOOT_MSG "Booting up... (press SPACE for menu)" -#define MENU_SHOW_VARSCALER 1 -#define MENU_SHOW_VOUTMODE 0 -#define MENU_SHOW_SCALER2 0 -#define MENU_SHOW_NUBS_BTNS 1 -#define MENU_SHOW_VIBRATION 0 -#define MENU_SHOW_DEADZONE 0 -#define MENU_SHOW_MINIMIZE 1 -#define MENU_SHOW_FULLSCREEN 0 -#define MENU_SHOW_VOLUME 0 - -#endif // UI_FEATURES_H diff --git a/frontend/warm b/frontend/warm deleted file mode 160000 index a6f015da..00000000 --- a/frontend/warm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6f015da3b10b82a476250793645c071340decbc diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index 82eb8857..22341c54 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -50,7 +50,7 @@ int psxInit() { void psxReset() { psxMemReset(); - memset(&psxRegs, 0, sizeof(psxRegs)); + memset(&psxRegs, 0x00, sizeof(psxRegs)); psxRegs.pc = 0xbfc00000; // Start in bootstrap diff --git a/maemo/hildon.c b/maemo/hildon.c deleted file mode 100644 index 7e9cd9fe..00000000 --- a/maemo/hildon.c +++ /dev/null @@ -1,843 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -#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 -#include - -#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 -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 -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 ace0bfde..00000000 --- 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 52af2ca6..00000000 --- a/maemo/maemo_xkb.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2009, Wei Mingzhi . - * 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 . - */ - -#include -#include -#include -#include -#include -#include -#include - -#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 85db400b..00000000 --- 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 -#include -#include -#include - -#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", PACKAGE_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; - - 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 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 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; -} -