Remove dead non retroarch platforms, prepare for second memcard

27 files changed, 5 insertions, 657 deletions

diff --git a/frontend/320240/caanoo.gpe b/frontend/320240/caanoo.gpe
deleted file mode 100755
index 9d6154a..0000000
--- a/frontend/320240/caanoo.gpe
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Wiz's timings are already good, apply this for Caanoo
-if [ -e /dev/accel ]; then
-  ./pollux_set "ram_timings=3,9,4,1,1,1,1"
-fi
-
-# the sync mount causes problems when writing saves,
-# probably due to many write calls, so have to get rid of it
-if grep mmcblk /proc/mounts | grep -q '\<sync\>'; then
-  oldmount=`grep mmcblk /proc/mounts | grep '\<sync\>' | awk '{print $4}'`
-  mount /dev/mmcblk0p1 /mnt/sd/ -o remount,dirsync,noatime
-fi
-
-./pcsx "$@"
-sync
-
-if [ -n "$oldmount" ]; then
-  mount /dev/mmcblk0p1 /mnt/sd/ -o remount,$oldmount
-fi
-
-cd /usr/gp2x
-exec ./gp2xmenu
diff --git a/frontend/320240/haptic_s.cfg b/frontend/320240/haptic_s.cfg
deleted file mode 100644
index 624056d..0000000
--- a/frontend/320240/haptic_s.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-0	126
-100	-126
-115	0
diff --git a/frontend/320240/haptic_w.cfg b/frontend/320240/haptic_w.cfg
deleted file mode 100644
index 3585a71..0000000
--- a/frontend/320240/haptic_w.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-0       54
-100     -126
-105     0
diff --git a/frontend/320240/pcsx26.png b/frontend/320240/pcsx26.png
deleted file mode 100644
index ed220a0..0000000
--- a/frontend/320240/pcsx26.png
+++ /dev/null
diff --git a/frontend/320240/pcsx_rearmed.ini b/frontend/320240/pcsx_rearmed.ini
deleted file mode 100644
index b15497f..0000000
--- a/frontend/320240/pcsx_rearmed.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[info]
-name="PCSX ReARMed"
-icon="/pcsx_rearmed/pcsx26.png"
-path="/pcsx_rearmed/pcsx.gpe"
-title="/pcsx_rearmed/pcsxb.png"
-group="GAMES"
diff --git a/frontend/320240/pcsxb.png b/frontend/320240/pcsxb.png
deleted file mode 100644
index ff5a48a..0000000
--- a/frontend/320240/pcsxb.png
+++ /dev/null
diff --git a/frontend/320240/pollux_set.c b/frontend/320240/pollux_set.c
deleted file mode 100644
index f49e777..0000000
--- a/frontend/320240/pollux_set.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * quick tool to set various timings for Wiz
- *
- * Copyright (c) Gražvydas "notaz" Ignotas, 2009
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the organization nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * HTOTAL:    X VTOTAL:  341
- * HSWIDTH:   1 VSWIDTH:   0
- * HASTART:  37 VASTART:  17
- * HAEND:   277 VAEND:   337
- *
- * 120Hz
- * pcd  8, 447: + 594us
- * pcd  9, 397: +  36us
- * pcd 10, 357: - 523us
- * pcd 11, 325: +1153us
- *
- * 'lcd_timings=397,1,37,277,341,0,17,337;dpc_clkdiv0=9'
- * 'ram_timings=2,9,4,1,1,1,1'
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-//#include "pollux_set.h"
-#define BINARY
-
-/* parse stuff */
-static int parse_lcd_timings(const char *str, void *data)
-{
-	int *lcd_timings = data;
-	const char *p = str;
-	int ret, c;
-	ret = sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d",
-			&lcd_timings[0], &lcd_timings[1], &lcd_timings[2], &lcd_timings[3],
-			&lcd_timings[4], &lcd_timings[5], &lcd_timings[6], &lcd_timings[7]);
-	if (ret != 8)
-		return -1;
-	/* skip seven commas */
-	for (c = 0; c < 7 && *p != 0; p++)
-		if (*p == ',')
-			c++;
-	if (c != 7)
-		return -1;
-	/* skip last number */
-	while ('0' <= *p && *p <= '9')
-		p++;
-
-	return p - str;
-}
-
-static int parse_ram_timings(const char *str, void *data)
-{
-	int *ram_timings = data;
-	const char *p = str;
-	int ret, c;
-	float cas;
-
-	ret = sscanf(p, "%f,%d,%d,%d,%d,%d,%d",
-			&cas, &ram_timings[1], &ram_timings[2], &ram_timings[3],
-			&ram_timings[4], &ram_timings[5], &ram_timings[6]);
-	if (ret != 7)
-		return -1;
-	if (cas == 2)
-		ram_timings[0] = 1;
-	else if (cas == 2.5)
-		ram_timings[0] = 2;
-	else if (cas == 3)
-		ram_timings[0] = 3;
-	else
-		return -1;
-	for (c = 0; c < 6 && *p != 0; p++)
-		if (*p == ',')
-			c++;
-	if (c != 6)
-		return -1;
-	while ('0' <= *p && *p <= '9')
-		p++;
-
-	return p - str;
-}
-
-static int parse_decimal(const char *str, void *data)
-{
-	char *ep;
-
-	*(int *)data = strtoul(str, &ep, 10);
-	if (ep == str)
-		return -1;
-
-	return ep - str;
-}
-
-/* validate and apply stuff */
-static int apply_lcd_timings(volatile unsigned short *memregs, void *data)
-{
-	int *lcd_timings = data;
-	int i;
-
-	for (i = 0; i < 8; i++) {
-		if (lcd_timings[i] & ~0xffff) {
-			fprintf(stderr, "pollux_set: invalid lcd timing %d: %d\n", i, lcd_timings[i]);
-			return -1;
-		}
-	}
-
-	for (i = 0; i < 8; i++)
-		memregs[(0x307c>>1) + i] = lcd_timings[i];
-
-	return 0;
-}
-
-static const struct {
-	signed char adj;	/* how to adjust value passed by user */
-	signed short min;	/* range of */
-	signed short max;	/* allowed values (inclusive) */
-}
-ram_ranges[] = {
-	{  0,  1,  3 },	/* cas (cl) */
-	{ -2,  0, 15 },	/* trc */
-	{ -2,  0, 15 },	/* tras */
-	{  0,  0, 15 },	/* twr */
-	{  0,  0, 15 },	/* tmrd */
-	{  0,  0, 15 },	/* trp */
-	{  0,  0, 15 },	/* trcd */
-};
-
-static int apply_ram_timings(volatile unsigned short *memregs, void *data)
-{
-	int *ram_timings = data;
-	int i, val;
-
-	for (i = 0; i < 7; i++)
-	{
-		ram_timings[i] += ram_ranges[i].adj;
-		if (ram_timings[i] < ram_ranges[i].min || ram_timings[i] > ram_ranges[i].max) {
-			fprintf(stderr, "pollux_set: invalid RAM timing %d\n", i);
-			return -1;
-		}
-	}
-
-	val = memregs[0x14802>>1] & 0x0f00;
-	val |= (ram_timings[4] << 12) | (ram_timings[5] << 4) | ram_timings[6];
-	memregs[0x14802>>1] = val;
-
-	val = memregs[0x14804>>1] & 0x4000;
-	val |= (ram_timings[0] << 12) | (ram_timings[1] << 8) |
-		(ram_timings[2] << 4) | ram_timings[3];
-	val |= 0x8000;
-	memregs[0x14804>>1] = val;
-
-	for (i = 0; i < 0x100000 && (memregs[0x14804>>1] & 0x8000); i++)
-		;
-
-	return 0;
-}
-
-static int apply_dpc_clkdiv0(volatile unsigned short *memregs, void *data)
-{
-	int pcd = *(int *)data;
-	int tmp;
-
-	if ((pcd - 1) & ~0x3f) {
-		fprintf(stderr, "pollux_set: invalid lcd clkdiv0: %d\n", pcd);
-		return -1;
-	}
-
-	pcd = (pcd - 1) & 0x3f;
-	tmp = memregs[0x31c4>>1];
-	memregs[0x31c4>>1] = (tmp & ~0x3f0) | (pcd << 4);
-
-	return 0;
-}
-
-static int apply_cpuclk(volatile unsigned short *memregs, void *data)
-{
-	volatile unsigned int *memregl = (volatile void *)memregs;
-	int mhz = *(int *)data;
-	int adiv, mdiv, pdiv, sdiv = 0;
-	int i, vf000, vf004;
-
-	// m = MDIV, p = PDIV, s = SDIV
-	#define SYS_CLK_FREQ 27
-	pdiv = 9;
-	mdiv = (mhz * pdiv) / SYS_CLK_FREQ;
-	if (mdiv & ~0x3ff)
-		return -1;
-	vf004 = (pdiv<<18) | (mdiv<<8) | sdiv;
-
-	// attempt to keep AHB the divider close to 250, but not higher
-	for (adiv = 1; mhz / adiv > 250; adiv++)
-		;
-
-	vf000 = memregl[0xf000>>2];
-	vf000 = (vf000 & ~0x3c0) | ((adiv - 1) << 6);
-	memregl[0xf000>>2] = vf000;
-	memregl[0xf004>>2] = vf004;
-	memregl[0xf07c>>2] |= 0x8000;
-	for (i = 0; (memregl[0xf07c>>2] & 0x8000) && i < 0x100000; i++)
-		;
-
-	printf("clock set to %dMHz, AHB set to %dMHz\n", mhz, mhz / adiv);
-	return 0;
-}
-
-static int lcd_timings[8];
-static int ram_timings[7];
-static int dpc_clkdiv0;
-static int cpuclk;
-
-static const char lcd_t_help[] = "htotal,hswidth,hastart,haend,vtotal,vswidth,vastart,vaend";
-static const char ram_t_help[] = "CAS,tRC,tRAS,tWR,tMRD,tRP,tRCD";
-
-static const struct {
-	const char *name;
-	const char *help;
-	int (*parse)(const char *str, void *data);
-	int (*apply)(volatile unsigned short *memregs, void *data);
-	void *data;
-}
-all_params[] = {
-	{ "lcd_timings", lcd_t_help, parse_lcd_timings, apply_lcd_timings, lcd_timings  },
-	{ "ram_timings", ram_t_help, parse_ram_timings, apply_ram_timings, ram_timings  },
-	{ "dpc_clkdiv0", "divider",  parse_decimal,     apply_dpc_clkdiv0, &dpc_clkdiv0 },
-	{ "clkdiv0",     "divider",  parse_decimal,     apply_dpc_clkdiv0, &dpc_clkdiv0 }, /* alias */
-	{ "cpuclk",      "MHZ",      parse_decimal,     apply_cpuclk,      &cpuclk      },
-};
-#define ALL_PARAM_COUNT (sizeof(all_params) / sizeof(all_params[0]))
-
-/*
- * set timings based on preformated string
- * returns 0 on success.
- */
-int pollux_set(volatile unsigned short *memregs, const char *str)
-{
-	int parsed_params[ALL_PARAM_COUNT];
-	int applied_params[ALL_PARAM_COUNT];
-	int applied_something = 0;
-	const char *p, *po;
-	int i, ret;
-
-	if (str == NULL)
-		return -1;
-
-	memset(parsed_params, 0, sizeof(parsed_params));
-	memset(applied_params, 0, sizeof(applied_params));
-
-	p = str;
-	while (1)
-	{
-again:
-		while (*p == ';' || *p == ' ')
-			p++;
-		if (*p == 0)
-			break;
-
-		for (i = 0; i < ALL_PARAM_COUNT; i++)
-		{
-			int param_len = strlen(all_params[i].name);
-			if (strncmp(p, all_params[i].name, param_len) == 0 && p[param_len] == '=')
-			{
-				p += param_len + 1;
-				ret = all_params[i].parse(p, all_params[i].data);
-				if (ret < 0) {
-					fprintf(stderr, "pollux_set parser: error at %-10s\n", p);
-					fprintf(stderr, "  valid format is: <%s>\n", all_params[i].help);
-					return -1;
-				}
-				parsed_params[i] = 1;
-				p += ret;
-				goto again;
-			}
-		}
-
-		/* Unknown param. Attempt to be forward compatible and ignore it. */
-		for (po = p; *p != 0 && *p != ';'; p++)
-			;
-
-		fprintf(stderr, "unhandled param: ");
-		fwrite(po, 1, p - po, stderr);
-		fprintf(stderr, "\n");
-	}
-
-	/* validate and apply */
-	for (i = 0; i < ALL_PARAM_COUNT; i++)
-	{
-		if (!parsed_params[i])
-			continue;
-
-		ret = all_params[i].apply(memregs, all_params[i].data);
-		if (ret < 0) {
-			fprintf(stderr, "pollux_set: failed to apply %s (bad value?)\n",
-				all_params[i].name);
-			continue;
-		}
-
-		applied_something = 1;
-		applied_params[i] = 1;
-	}
-
-	if (applied_something)
-	{
-		int c;
-		printf("applied: ");
-		for (i = c = 0; i < ALL_PARAM_COUNT; i++)
-		{
-			if (!applied_params[i])
-				continue;
-			if (c != 0)
-				printf(", ");
-			printf("%s", all_params[i].name);
-			c++;
-		}
-		printf("\n");
-	}
-
-	return 0;
-}
-
-#ifdef BINARY
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-static void usage(const char *binary)
-{
-	int i;
-	printf("usage:\n%s <set_str[;set_str[;...]]>\n"
-		"set_str:\n", binary);
-	for (i = 0; i < ALL_PARAM_COUNT; i++)
-		printf("  %s=<%s>\n", all_params[i].name, all_params[i].help);
-}
-
-int main(int argc, char *argv[])
-{
-	volatile unsigned short *memregs;
-	int ret, memdev;
-
-	if (argc != 2) {
-		usage(argv[0]);
-		return 1;
-	}
-
-	memdev = open("/dev/mem", O_RDWR);
-	if (memdev == -1)
-	{
-		perror("open(/dev/mem) failed");
-		return 1;
-	}
-
-	memregs	= mmap(0, 0x20000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0xc0000000);
-	if (memregs == MAP_FAILED)
-	{
-		perror("mmap(memregs) failed");
-		close(memdev);
-		return 1;
-	}
-
-	ret = pollux_set(memregs, argv[1]);
-
-	munmap((void *)memregs, 0x20000);
-	close(memdev);
-
-	return ret;
-}
-#endif
diff --git a/frontend/320240/skin/background.png b/frontend/320240/skin/background.png
deleted file mode 100644
index 0efdd18..0000000
--- a/frontend/320240/skin/background.png
+++ /dev/null
diff --git a/frontend/320240/skin/font.png b/frontend/320240/skin/font.png
deleted file mode 100644
index c526a08..0000000
--- a/frontend/320240/skin/font.png
+++ /dev/null
diff --git a/frontend/320240/skin/readme.txt b/frontend/320240/skin/readme.txt
deleted file mode 100644
index dd83963..0000000
--- a/frontend/320240/skin/readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-The skin images can be customized, but there are several limitations:

-

-background.png - must be 320x240 image with 24bit RGB colors.

-font.png       - must be 128x160 8bit grayscale image.

-selector.png   - must be 8x10 8bit grayscale image.

-

-Font and selector colors can be changed by editing skin.txt.

-

diff --git a/frontend/320240/skin/selector.png b/frontend/320240/skin/selector.png
deleted file mode 100644
index 5062cc2..0000000
--- a/frontend/320240/skin/selector.png
+++ /dev/null
diff --git a/frontend/320240/skin/skin.txt b/frontend/320240/skin/skin.txt
deleted file mode 100644
index 1d6979f..0000000
--- a/frontend/320240/skin/skin.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// html-style hex color codes, ex. ff0000 is red, 0000ff is blue, etc.

-text_color=ffffc0

-selection_color=808010

-

diff --git a/frontend/320240/ui_gp2x.h b/frontend/320240/ui_gp2x.h
deleted file mode 100644
index a9c4413..0000000
--- a/frontend/320240/ui_gp2x.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef UI_FEATURES_H
-#define UI_FEATURES_H
-
-#define MENU_BIOS_PATH "pcsx_rearmed/bios/"
-#define MENU_SHOW_VARSCALER 0
-#define MENU_SHOW_VOUTMODE 0
-#define MENU_SHOW_SCALER2 1
-#define MENU_SHOW_NUBS_BTNS 0
-#define MENU_SHOW_VIBRATION 1
-#define MENU_SHOW_DEADZONE 1
-#define MENU_SHOW_MINIMIZE 0
-#define MENU_SHOW_FULLSCREEN 0
-#define MENU_SHOW_VOLUME 1
-
-#endif // UI_FEATURES_H
diff --git a/frontend/libpicofe b/frontend/libpicofe
deleted file mode 160000
-Subproject 21604a047941b8fe81d381ede0371c75da964af
diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4d56356..bf94f16 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 6887dd1..2d438aa 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 71f36d0..0000000
--- a/frontend/pandora/pcsx.png
+++ /dev/null
diff --git a/frontend/pandora/pcsx.pxml.templ b/frontend/pandora/pcsx.pxml.templ
deleted file mode 100644
index f748065..0000000
--- a/frontend/pandora/pcsx.pxml.templ
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
diff --git a/frontend/pandora/pcsx.sh b/frontend/pandora/pcsx.sh
deleted file mode 100755
index 710f641..0000000
--- 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 77f5720..0000000
--- 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 <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;
-}
diff --git a/frontend/pandora/skin/background.png b/frontend/pandora/skin/background.png
deleted file mode 100644
index f4b4523..0000000
--- a/frontend/pandora/skin/background.png
+++ /dev/null
diff --git a/frontend/pandora/skin/font.png b/frontend/pandora/skin/font.png
deleted file mode 100644
index 707a5b4..0000000
--- a/frontend/pandora/skin/font.png
+++ /dev/null
diff --git a/frontend/pandora/skin/readme.txt b/frontend/pandora/skin/readme.txt
deleted file mode 100644
index dd83963..0000000
--- 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 a439169..0000000
--- a/frontend/pandora/skin/selector.png
+++ /dev/null
diff --git a/frontend/pandora/skin/skin.txt b/frontend/pandora/skin/skin.txt
deleted file mode 100644
index 1d6979f..0000000
--- 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 3bb808a..0000000
--- a/frontend/pandora/ui_feat.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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
diff --git a/frontend/warm b/frontend/warm
deleted file mode 160000
-Subproject a6f015da3b10b82a476250793645c071340decb