Merge branch 'master' into libretro

2025-02-16 22:58:12 +00:00 · 2024-10-28 00:01:49 +02:00 · 2024-10-28 00:01:49 +02:00 · 06442b6813
commit 06442b6813
parent 9593502677 79c4d4343e
36 changed files with 2048 additions and 67 deletions
--- a/.github/extract-foreign-all.sh
+++ b/.github/extract-foreign-all.sh
@ -0,0 +1,37 @@
+#!/bin/bash
+
+ARCH_="$1"
+.github/extract-foreign.sh "zlib1g-dev:${ARCH_}"
+.github/extract-foreign.sh "zlib1g:${ARCH_}"
+.github/extract-foreign.sh "libpng-dev:${ARCH_}"
+.github/extract-foreign.sh "libpng[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libsdl1.2-dev:${ARCH_}"
+.github/extract-foreign.sh "libsdl1.2debian:${ARCH_}"
+# endless libsdl deps
+.github/extract-foreign.sh "libasound[2-9]:${ARCH_}"
+.github/extract-foreign.sh "libpulse[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libx11-[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libx11-dev:${ARCH_}"
+.github/extract-foreign.sh "x11proto-dev"
+.github/extract-foreign.sh "libxext[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libxcb1:${ARCH_}"
+.github/extract-foreign.sh "libxau[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libxdmcp[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libcaca[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libdbus-[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libslang[2-9]:${ARCH_}"
+.github/extract-foreign.sh "libncursesw[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libtinfo[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libsystemd[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libwrap[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libsndfile[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libasyncns[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libbsd[0-9]:${ARCH_}"
+.github/extract-foreign.sh "liblzma[0-9]:${ARCH_}"
+.github/extract-foreign.sh "liblz[4-9]-*:${ARCH_}"
+.github/extract-foreign.sh "libgcrypt[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libflac[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libogg[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libvorbis[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libvorbisenc[2-9]:${ARCH_}"
+.github/extract-foreign.sh "libgpg-error[0-9]:${ARCH_}"
--- a/.github/extract-foreign.sh
+++ b/.github/extract-foreign.sh
@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+url_base="http://ports.ubuntu.com/ubuntu-ports/"
+paths=`apt-cache show "$@" | grep '^Filename:' | awk '{print $2}'`
+for p in $paths; do
+  base=`basename $p`
+  wget -nv "${url_base}${p}"
+  echo "exctacting $base"
+  dpkg-deb -x "$base" .
+done
--- a/.github/workflows/ci-linux-arm64.yml
+++ b/.github/workflows/ci-linux-arm64.yml
@ -0,0 +1,22 @@
+name: CI (Linux arm64)
+on: [push, pull_request]
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: |
+        whoami
+        sudo bash -c 'echo ''deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe'' > /etc/apt/sources.list.d/arm64.list'
+        sudo sed -i 's/^deb \([^[]\)/deb [arch=amd64] \1/' /etc/apt/sources.list
+        sudo dpkg --add-architecture arm64
+        sudo apt-get update -qq
+        sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+        .github/extract-foreign-all.sh arm64
+    - name: configure
+      run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=aarch64-linux-gnu- SDL_CONFIG=usr/bin/sdl-config PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/aarch64-linux-gnu/ -Llib/aarch64-linux-gnu/ -Wl,-rpath-link=lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/pulseaudio/' ./configure
+    - name: make
+      run: make
--- a/.github/workflows/ci-linux-armhf.yml
+++ b/.github/workflows/ci-linux-armhf.yml
@ -0,0 +1,22 @@
+name: CI (Linux armhf)
+on: [push, pull_request]
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: |
+        whoami
+        sudo bash -c 'echo ''deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe'' > /etc/apt/sources.list.d/armhf.list'
+        sudo sed -i 's/^deb \([^[]\)/deb [arch=amd64] \1/' /etc/apt/sources.list
+        sudo dpkg --add-architecture armhf
+        sudo apt-get update -qq
+        sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
+        .github/extract-foreign-all.sh armhf
+    - name: configure
+      run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=arm-linux-gnueabihf- SDL_CONFIG=usr/bin/sdl-config PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/arm-linux-gnueabihf/ -Llib/arm-linux-gnueabihf/ -Wl,-rpath-link=lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/pulseaudio/' ./configure
+    - name: make
+      run: make
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@ -0,0 +1,17 @@
+name: CI (Linux)
+on: [push, pull_request]
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -y libsdl1.2-dev libasound2-dev libpng-dev libz-dev
+    - name: configure
+      run: DUMP_CONFIG_LOG=1 ./configure
+    - name: make
+      run: make
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "frontend/libpicofe"]
-	path = frontend/libpicofe
-	url = https://github.com/notaz/libpicofe.git
--- a/.travis.yml
+++ b/.travis.yml
@ -1,33 +0,0 @@
-language: generic
-os: linux
-dist: trusty
-sudo: required
-addons:
-  apt:
-    packages:
-      - g++-7
-    sources:
-      - ubuntu-toolchain-r-test
-env:
-  global:
-    - CORE=pcsx_rearmed
-    - COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7
-  matrix:
-    - PLATFORM=3ds
-    - PLATFORM=linux_x64
-before_script:
-  - pwd
-  - mkdir -p ~/bin
-  - ln -s /usr/bin/gcc-7 ~/bin/gcc
-  - ln -s /usr/bin/g++-7 ~/bin/g++
-  - ln -s /usr/bin/cpp-7 ~/bin/cpp
-  - export PATH=~/bin:$PATH
-  - ls -l ~/bin
-  - echo $PATH
-  - g++-7 --version
-  - g++ --version
-script:
-  - cd ~/
-  - git clone --depth=50 https://github.com/libretro/libretro-super
-  - cd libretro-super/travis
-  - ./build.sh
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 PCSX-ReARMed - yet another PCSX fork
 ====================================

-[![Build Status](https://travis-ci.org/libretro/pcsx_rearmed.svg?branch=master)](https://travis-ci.org/libretro/pcsx_rearmed)
+![CI (Linux)](https://github.com/notaz/pcsx_rearmed/workflows/CI%20(Linux)/badge.svg)

 *see [readme.txt](readme.txt) for more complete documentation*

--- a/frontend/320240/caanoo.gpe
+++ b/frontend/320240/caanoo.gpe
@ -0,0 +1,23 @@
+#!/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
--- a/frontend/320240/haptic_s.cfg
+++ b/frontend/320240/haptic_s.cfg
@ -0,0 +1,3 @@
+0	126
+100	-126
+115	0
--- a/frontend/320240/haptic_w.cfg
+++ b/frontend/320240/haptic_w.cfg
@ -0,0 +1,3 @@
+0       54
+100     -126
+105     0
--- a/frontend/320240/pcsx26.png
+++ b/frontend/320240/pcsx26.png
--- a/frontend/320240/pcsx_rearmed.ini
+++ b/frontend/320240/pcsx_rearmed.ini
@ -0,0 +1,6 @@
+[info]
+name="PCSX ReARMed"
+icon="/pcsx_rearmed/pcsx26.png"
+path="/pcsx_rearmed/pcsx.gpe"
+title="/pcsx_rearmed/pcsxb.png"
+group="GAMES"
--- a/frontend/320240/pcsxb.png
+++ b/frontend/320240/pcsxb.png
--- a/frontend/320240/pollux_set.c
+++ b/frontend/320240/pollux_set.c
@ -0,0 +1,389 @@
+/*
+ * 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
--- a/frontend/320240/skin/background.png
+++ b/frontend/320240/skin/background.png
--- a/frontend/320240/skin/font.png
+++ b/frontend/320240/skin/font.png
--- a/frontend/320240/skin/readme.txt
+++ b/frontend/320240/skin/readme.txt
@ -0,0 +1,8 @@
+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.
+
--- a/frontend/320240/skin/selector.png
+++ b/frontend/320240/skin/selector.png
--- a/frontend/320240/skin/skin.txt
+++ b/frontend/320240/skin/skin.txt
@ -0,0 +1,4 @@
+// html-style hex color codes, ex. ff0000 is red, 0000ff is blue, etc.
+text_color=ffffc0
+selection_color=808010
+
--- a/frontend/320240/ui_gp2x.h
+++ b/frontend/320240/ui_gp2x.h
@ -0,0 +1,15 @@
+#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
--- a/frontend/cspace.c
+++ b/frontend/cspace.c
@ -94,20 +94,20 @@ void bgr555_to_rgb565(void * __restrict__ dst_, const void *  __restrict__ src_,

 void bgr555_to_rgb565(void *dst_, const void *src_, int bytes)
 {
-    // source can be misaligned, but it's very rare, so just force
-    const unsigned int *src = (const void *)((intptr_t)src_ & ~3);
-    unsigned int *dst = dst_;
-    unsigned int x, p, r, g, b;
+	// source can be misaligned, but it's very rare, so just force
+	const unsigned int *src = (const void *)((intptr_t)src_ & ~3);
+	unsigned int *dst = dst_;
+	unsigned int x, p, r, g, b;

-    for (x = 0; x < bytes / 4; x++) {
-        p = LE16TOHx2(src[x]);
+	for (x = 0; x < bytes / 4; x++) {
+		p = LE16TOHx2(src[x]);

-        r = (p & 0x001f001f) << 11;
-        g = (p & 0x03e003e0) << 1;
-        b = (p & 0x7c007c00) >> 10;
+		r = (p & 0x001f001f) << 11;
+		g = (p & 0x03e003e0) << 1;
+		b = (p & 0x7c007c00) >> 10;

-        dst[x] = r | g | b;
-    }
+		dst[x] = r | g | b;
+	}
 }

 #endif
@ -116,25 +116,25 @@ void bgr555_to_rgb565(void *dst_, const void *src_, int bytes)

 void attr_weak bgr888_to_rgb565(void *dst_, const void *src_, int bytes)
 {
-    const unsigned char *src = src_;
-    unsigned int *dst = dst_;
-    unsigned int r1, g1, b1, r2, g2, b2;
+	const unsigned char *src = src_;
+	unsigned int *dst = dst_;
+	unsigned int r1, g1, b1, r2, g2, b2;

-    for (; bytes >= 6; bytes -= 6, src += 6, dst++) {
-        r1 = src[0] & 0xf8;
-        g1 = src[1] & 0xfc;
-        b1 = src[2] & 0xf8;
-        r2 = src[3] & 0xf8;
-        g2 = src[4] & 0xfc;
-        b2 = src[5] & 0xf8;
+	for (; bytes >= 6; bytes -= 6, src += 6, dst++) {
+		r1 = src[0] & 0xf8;
+		g1 = src[1] & 0xfc;
+		b1 = src[2] & 0xf8;
+		r2 = src[3] & 0xf8;
+		g2 = src[4] & 0xfc;
+		b2 = src[5] & 0xf8;
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-        *dst = (r1 << 24) | (g1 << 19) | (b1 << 13) |
-               (r2 << 8) | (g2 << 3) | (b2 >> 3);
+		*dst = (r1 << 24) | (g1 << 19) | (b1 << 13) |
+			(r2 << 8) | (g2 << 3) | (b2 >> 3);
 #else
-        *dst = (r2 << 24) | (g2 << 19) | (b2 << 13) |
-               (r1 << 8) | (g1 << 3) | (b1 >> 3);
+		*dst = (r2 << 24) | (g2 << 19) | (b2 << 13) |
+			(r1 << 8) | (g1 << 3) | (b1 >> 3);
 #endif
-    }
+	}
 }

 // TODO?
--- a/frontend/pandora/pcsx.png
+++ b/frontend/pandora/pcsx.png
--- a/frontend/pandora/pcsx.pxml.templ
+++ b/frontend/pandora/pcsx.pxml.templ
@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PXML xmlns="http://openpandora.org/namespaces/PXML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PXML_schema.xsd">
+<package id="package.pcsx_rearmed.notaz">
+  <titles>
+    <title lang="en_US">PCSX ReARMed</title>
+  </titles>
+  <version major="1" minor="9" release="93" build="%PR%"/>
+  <author name="PCSX team/notaz" website="http://notaz.gp2x.de/"/>
+</package>
+<application id="pcsx_rearmed.notaz.%PR%" appdata="pcsx_rearmed">
+  <titles>
+    <title lang="en_US">PCSX ReARMed %PR%</title>
+  </titles>
+  <title lang="en_US">PCSX ReARMed %PR%</title>
+
+  <descriptions>
+    <description lang="en_US">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.</description>
+  </descriptions>
+
+  <exec command="pcsx.sh"/>
+
+  <icon src="pcsx.png"/>
+
+  <author name="PCSX team/notaz" website="http://notaz.gp2x.de/"/>
+
+  <version major="1" minor="9" release="93" build="%PR%"/>
+
+  <licenses>
+    <license name="GPLv2+" url="http://www.gnu.org/licenses/gpl-2.0.html" sourcecodeurl="http://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git"/>
+  </licenses>
+
+  <info name="PCSX ReARMed %PR% readme" type="text/plain" src="readme.txt"/>
+ 
+  <categories>
+    <category name="Game">
+    <subcategory name="Emulator"/>
+    </category>
+  </categories>
+</application>
+</PXML>
--- a/frontend/pandora/pcsx.sh
+++ b/frontend/pandora/pcsx.sh
@ -0,0 +1,24 @@
+#!/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
--- a/frontend/pandora/picorestore.c
+++ b/frontend/pandora/picorestore.c
@ -0,0 +1,109 @@
+/*
+ * 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 <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <linux/fb.h>
+#include <linux/omapfb.h>
+#include <linux/kd.h>
+
+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;
+}
--- a/frontend/pandora/skin/background.png
+++ b/frontend/pandora/skin/background.png
--- a/frontend/pandora/skin/font.png
+++ b/frontend/pandora/skin/font.png
--- a/frontend/pandora/skin/readme.txt
+++ b/frontend/pandora/skin/readme.txt
@ -0,0 +1,8 @@
+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.
+
--- a/frontend/pandora/skin/selector.png
+++ b/frontend/pandora/skin/selector.png
--- a/frontend/pandora/skin/skin.txt
+++ b/frontend/pandora/skin/skin.txt
@ -0,0 +1,4 @@
+// html-style hex color codes, ex. ff0000 is red, 0000ff is blue, etc.
+text_color=ffffc0
+selection_color=808010
+
--- a/frontend/pandora/ui_feat.h
+++ b/frontend/pandora/ui_feat.h
@ -0,0 +1,16 @@
+#ifndef UI_FEATURES_H
+#define UI_FEATURES_H
+
+#define MENU_BIOS_PATH "<SD card>/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
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@ -132,7 +132,7 @@ void *plat_gvideo_set_mode(int *w_in, int *h_in, int *bpp)
 	h -= t + b;

 	buf = vout_fbdev_resize(layer_fb, w, h, *bpp,
-		l, r, t, b, 3);
+		l, r, t, b, 3, 1);

 	vout_fbdev_clear(layer_fb);

@ -154,9 +154,10 @@ void plat_gvideo_close(void)
 void plat_video_menu_enter(int is_rom_loaded)
 {
 	g_menuscreen_ptr = vout_fbdev_resize(main_fb,
-		g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 3);
+		g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 3, 0);
 	if (g_menuscreen_ptr == NULL)
 		fprintf(stderr, "warning: vout_fbdev_resize failed\n");
+	vout_fbdev_clear(main_fb);

 	xenv_update(NULL, NULL, NULL, NULL);
 }
@ -174,11 +175,11 @@ void plat_video_menu_leave(void)
 {
 	/* have to get rid of panning so that plugins that
 	 * use fb0 and don't ever pan can work. */
-	vout_fbdev_clear(main_fb);
 	g_menuscreen_ptr = vout_fbdev_resize(main_fb,
-		g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 1);
+		g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 1, 0);
 	if (g_menuscreen_ptr == NULL)
 		fprintf(stderr, "warning: vout_fbdev_resize failed\n");
+	vout_fbdev_clear(main_fb);
 }

 void plat_minimize(void)
--- a/maemo/hildon.c
+++ b/maemo/hildon.c
@ -0,0 +1,842 @@
+#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 "../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, &param)) {
+				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)
+{
+}
--- a/maemo/main.c
+++ b/maemo/main.c
@ -0,0 +1,410 @@
+/*
+ * (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/dfsound/spu_config.h"
+#include "maemo_common.h"
+
+extern int in_enable_vibration;
+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], "-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")) 	        Config.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");
+
+	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;
+}
+
--- a/plugins/gpu_neon/Makefile
+++ b/plugins/gpu_neon/Makefile
@ -4,6 +4,7 @@ include ../../config.mak

 SRC += psx_gpu_if.c

+CFLAGS += -I../../include
 CFLAGS += -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
 CFLAGS += -DNEON_BUILD
 ifeq "$(HAVE_NEON)" "1"