From 9e0630ab54cbf6b6e3ec525f1088aa54e163c938 Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 9 Oct 2011 22:15:00 +0300 Subject: add caanoo frontend files, move pandora files --- pandora/pcsx.png | Bin 7981 -> 0 bytes pandora/pcsx.pxml.templ | 40 ------- pandora/pcsx.sh | 16 --- pandora/picorestore.c | 109 ------------------- pandora/readme.txt | 256 -------------------------------------------- pandora/skin/background.png | Bin 183772 -> 0 bytes pandora/skin/font.png | Bin 11264 -> 0 bytes pandora/skin/readme.txt | 8 -- pandora/skin/selector.png | Bin 386 -> 0 bytes pandora/skin/skin.txt | 4 - 10 files changed, 433 deletions(-) delete mode 100644 pandora/pcsx.png delete mode 100644 pandora/pcsx.pxml.templ delete mode 100755 pandora/pcsx.sh delete mode 100644 pandora/picorestore.c delete mode 100644 pandora/readme.txt delete mode 100644 pandora/skin/background.png delete mode 100644 pandora/skin/font.png delete mode 100644 pandora/skin/readme.txt delete mode 100644 pandora/skin/selector.png delete mode 100644 pandora/skin/skin.txt (limited to 'pandora') diff --git a/pandora/pcsx.png b/pandora/pcsx.png deleted file mode 100644 index 71f36d0..0000000 Binary files a/pandora/pcsx.png and /dev/null differ diff --git a/pandora/pcsx.pxml.templ b/pandora/pcsx.pxml.templ deleted file mode 100644 index 5c53f24..0000000 --- a/pandora/pcsx.pxml.templ +++ /dev/null @@ -1,40 +0,0 @@ - - - - - PCSX ReARMed - - - - - - - PCSX ReARMed %PR% - - PCSX ReARMed %PR% - - - PlayStation Emulator. - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pandora/pcsx.sh b/pandora/pcsx.sh deleted file mode 100755 index 2077a29..0000000 --- a/pandora/pcsx.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# stupid nub mode thing -nub0mode=`cat /proc/pandora/nub0/mode` -nub1mode=`cat /proc/pandora/nub1/mode` -echo absolute > /proc/pandora/nub0/mode -echo absolute > /proc/pandora/nub1/mode - -./pcsx "$@" - -# restore stuff if pcsx crashes -./picorestore -sudo -n /usr/pandora/scripts/op_lcdrate.sh 60 - -echo "$nub0mode" > /proc/pandora/nub0/mode -echo "$nub1mode" > /proc/pandora/nub1/mode diff --git a/pandora/picorestore.c b/pandora/picorestore.c deleted file mode 100644 index 77f5720..0000000 --- a/pandora/picorestore.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * picorestore - clean up after an omapfb program crash - * - * Copyright (c) GraÅžvydas "notaz" Ignotas, 2010 - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the organization nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int main() -{ - struct fb_var_screeninfo fbvar; - struct omapfb_plane_info pi; - struct omapfb_mem_info mi; - int ret, fbdev, kbdfd; - - fbdev = open("/dev/fb0", O_RDWR); - if (fbdev == -1) { - perror("open fb0"); - goto end_fb0; - } - - ret = ioctl(fbdev, FBIOGET_VSCREENINFO, &fbvar); - if (ret == -1) { - perror("FBIOGET_VSCREENINFO ioctl"); - goto end_fb0; - } - - if (fbvar.yoffset != 0) { - printf("fixing yoffset.. "); - fbvar.yoffset = 0; - ret = ioctl(fbdev, FBIOPAN_DISPLAY, &fbvar); - if (ret < 0) - perror("ioctl FBIOPAN_DISPLAY"); - else - printf("ok\n"); - } - -end_fb0: - if (fbdev >= 0) - close(fbdev); - - fbdev = open("/dev/fb1", O_RDWR); - if (fbdev == -1) { - perror("open fb1"); - goto end_fb1; - } - - ret = ioctl(fbdev, OMAPFB_QUERY_PLANE, &pi); - ret |= ioctl(fbdev, OMAPFB_QUERY_MEM, &mi); - if (ret != 0) - perror("QUERY_*"); - - pi.enabled = 0; - ret = ioctl(fbdev, OMAPFB_SETUP_PLANE, &pi); - if (ret != 0) - perror("SETUP_PLANE"); - - mi.size = 0; - ret = ioctl(fbdev, OMAPFB_SETUP_MEM, &mi); - if (ret != 0) - perror("SETUP_MEM"); - -end_fb1: - if (fbdev >= 0) - close(fbdev); - - kbdfd = open("/dev/tty", O_RDWR); - if (kbdfd == -1) { - perror("open /dev/tty"); - return 1; - } - - if (ioctl(kbdfd, KDSETMODE, KD_TEXT) == -1) - perror("KDSETMODE KD_TEXT"); - - close(kbdfd); - - return 0; -} diff --git a/pandora/readme.txt b/pandora/readme.txt deleted file mode 100644 index d9dc903..0000000 --- a/pandora/readme.txt +++ /dev/null @@ -1,256 +0,0 @@ - -PCSX-ReARMed - yet another PCSX fork - -http://notaz.gp2x.de/pcsx_rearmed.php - - -About ------ - -PCSX ReARMed is yet another PCSX fork based on the PCSX-Reloaded project, -which itself contains code from PCSX, PCSX-df and PCSX-Revolution. This -version is ARM architecture oriented and features MIPS->ARM recompiler by -Ari64, NEON GTE code and more performance improvements. It was created for -Pandora handheld, but should be usable on other devices after some code -adjustments (N900 version is also available). - -PCSX ReARMed features GPU plugin from PCSX4ALL project. - - -Usage ------ - -This version features a framebuffer driven menu that can be used to run -games and configure the emulator. - -Supported CD image formats: -- .bin/.cue -- .bin/.toc -- .img/.ccd/.sub -- .mdf/.mds -- .Z/.Z.table -- .bz/.bz.table -- .ZNX/.ZNX.table (partial) -- EBOOT.PBP (PSP, partial) - -CDDA (CD audio) only supported when .cue/.toc/.ccd/.mds files are present. -There is support for redump.org .sbi files, which can be used instead of -.sub files to save space (name it the same as .cue/.bin, just use .sbi -extension). This is required for Libcrypt copy protected game support. - -The emulator can simulate BIOS, which means BIOS files are not required, -however implementation is not complete and some games still need real BIOS -to work. To use real BIOS, copy uncompressed BIOS files to -[sd card]/pandora/appdata/pcsx_rearmed/bios/ -then select the BIOS you want to use in Options->BIOS/Plugins menu. - -Analog controllers are supported using nubs, but this is disabled by -default and needs to be enabled in 'Controls' menu. -There is also touchscreen based GunCon support, which also requires -appropriate controller selected in controls configuration. - - -Plugins -------- - -GPU (graphics) and SPU (sound) plugins can be selected in -[BIOS/Plugins] menu: - -builtin_gpu - the P.E.Op.S. GPU plugin, most accurate but slow. -gpuPCSX4ALL.so - plugin from PCSX4ALL project. Faster but has some glitches. -gpuGLES.so - experimental port of P.E.Op.S. MesaGL plugin to OpenGL ES. - Occasionally faster but has lots of glitches and seems to - be rather unstable (may crash the system). -builtin_spu - P.E.Op.S. SPU plugin. -spunull.so - NULL plugin, i.e. no sound emulation. - - -Changelog ---------- - -r10 (2011-09-23) -+ added fixed frameskip option -* fixed a crash in PCSX4ALL GPU plugin -* fixed several dynarec compatibility related issues (hopefully) -* fixed several SPU regressions from r9 -* fixed frame limiter issue that sometimes caused stuttering -* fixed some minor GUI issues - -r9 (2011-08-13) -* fixed various dynarec integration issues that were causing instability -* merged latest Ari64 dynarec code for some performance improvement -* changed frameskip handling in builtin and PCSX4ALL plugins, - fixes some cases where it would not work -* merged PCSX4ALL 2.2 GPU code to it's plugin -* fixed PCSX4ALL GPU inline asm, was miscompiling for ARMv7. -+ added CDDA handling for eboot format -* improved CDDA handling for all image formats that support it -* various compatibility/accuracy improvements -* optimized PEOPS SPU core -* various menu adjustments -* changed scaling options a bit, there are now two 4:3 options: - integer and fractional -+ added some basic memory card manager, which allows to change - or remove cards (remove needed for Tenka) -+ added GunCon support -+ added gpuPEOPS2 plugin (peops rendering + new emulation code) - -r8 (2011-03-22) -* improved recompiler performance for some games -* fixed a few recompiler related compatibility issues - (also fixes broken memcard support in some games) -* fixed some graphics problems caused by frameskip. - Note that not all problems were fixed, so if you see graphics - glitches try turning off frameskip or using different GPU plugin. -+ added screenshot function -+ added some code to attempt to sync with pandora's LCD better -* merged a few compatibility fixes from PCSX-Reloaded -* fixed and issue with external controllers -* added experimental ability to use nubs as buttons - -r7 (2011-03-02) -+ implemented most used GTE operations in NEON -* merged latest Ari64's recompiler patches -* removed some code from the recompiler that is unneeded for R3k -* added some special handlers for constant reads -* some moderate builtin GPU and SPU optimizations -+ added redump.org SBI support -* tuned frameskip code again -* fixed one 'analog controller not working' issue -* fixed a crash in builtin gpu code -* fixed cdrom slowdown issue -* fixed my stupid bug in the recompiler that slowed down - recompilation a lot -* some other refactoring - -r6 (2011-02-10) -+ added analog controller support using nubs (disabled by default) -+ added control config saving -+ added support for ingame actions (eg. savestate load) -+ added 'auto' region option and made it default -+ added cd swap functionality -+ added maemo frontend from Bonapart - (with some tuning, source code only) -* reworked key configuration to be less confusing -* fixed 'SPU IRQ wait' option sometimes causing noise - and turned it on by default -* fixed mono xa masking (was causing noise) -* fixed word access macros in dfxvideo (darkness problem) -* changed GPU DMA timing back to 1.92 levels -* backported more fixes from PCSX-Reloaded project - (mostly shalma's work, see GIT) -* fixed a few more recompiler issues -+ fixed frameskip in builtin plugin - -r5 (2011-01-31) -+ added support for .bz format, also partial support for - .znx and eboot.pbp formats -+ merged latest cdrom code from PCSX-Reloaded project -* fixed remaining savestate incompatibilities between PCSX4ALL - and P.E.Op.S. GPU plugins -* fixed channel disable preventing irqs in P.E.Op.S. SPU plugin -* fixed some alignment issues -+ added handling for branches in delay slots -+ fixed some unexpected drops to menu -* fixed lots of recompiler related issues (see GIT) -+ added watchdog thread to detect emulator lockups -* minor frontend adjustments - -r4 (2011-01-15) -+ added real BIOS support (and various things for it to work) -* fixed various recompiler issues -+ added interpreter option (useful to overcome dynarec bugs) -* fixed some memory card related issues with HLE bios -* rewrote frame limiter (old was sometimes sleeping needlessly) - -r3 (2011-01-05): -+ added Pickle's port of gpu-gles from psx4m project -+ added PCSX4ALL gpu as a plugin -* improved gpu plugin support -+ added savestate preview -* various frontend fixes - -r2 (2010-12-29): -* fixed memcard paths -* fixed a keybind copy-paste bug -* properly implemented pad handling - (inputs no longer control both emulated pads at once) -* fixed a crash caused by framebuffer out of range access -* fixed SWL/SWR handling (usually resulted in graphic glitches) -* fixed BxxZAL (Medal of Honor) -* fixed alignment crash in color space conversion code (Lunar) -* fixed SWC2 occasional use of wrong address register (Parasite Eve) -* fixed firstfile() handling in HLE BIOS (broken memory cards in some games) -+ added per-game configs (controls still not saved though) -+ added simple plugin select interface to the menu - -r1 (2010-12-25): -* initial release - - -Credits / License ------------------ - -Emulator core: - -(C) 1999-2003 PCSX Team - (c) 1998 Vision Thing - Linuzappz - Shadow - Pete Bernett - NoComp - Nik3d - Akumax - -(C) 2005-2009 PCSX-df Team - (c) Ryan Schultz - (c) Andrew Burton - (c) Stephen Chao - (c) Marcus Comstedt - Stefan Sikora - -(C) 2009-2011 PCSX-Reloaded Team - edgbla (Root counters, various core/plugin fixes) - shalma (GTE Divider, many core improvements, sound plugin fixes) - Firnis (GTE code from PCSX-Revolution Project) - Gabriele Gorla (MDEC decoder) - Peter Collingbourne (Various core/psxbios fixes) - Dario, NeToU, siveritas (Various bugfixes) - Wei Mingzhi (Maintainer, input plugin, iso/cheat support, misc stuff) - -PCSX4ALL GPU plugin: - (C) 2010 PCSX4ALL Team - (C) 2010 Unai - Franxis - Chui - -GLES plugin (psx4m project): - (C) 1999-2009 by Pete Bernert - EQ - Olli Hinkka - Proger - Pickle - -builtin GPU/SPU plugin: - (C) Pete Bernert and the P.E.Op.S. team - -builtin SPU plugin: - (C) Pete Bernert and the P.E.Op.S. team - (C) SPU2-X, gigaherz, Pcsx2 Development Team - shalma - -MIPS->ARM recompiler: - (C) 2009-2011 Ari64 - -integration, optimization and frontend: - (C) 2010-2011 notaz - -some implementation ideas (and maybe code?) likely originated from -MAME/smf/pSXauthor and were integrated by various people to PCSX. - -Source code is released under GNU GPL license, version 2 or later. -See COPYING included in the archive (.pnd can be extracted using unsquashfs). -The source code is available in a GIT repository at: - -git://notaz.gp2x.de/~notaz/pcsx_rearmed.git - diff --git a/pandora/skin/background.png b/pandora/skin/background.png deleted file mode 100644 index f4b4523..0000000 Binary files a/pandora/skin/background.png and /dev/null differ diff --git a/pandora/skin/font.png b/pandora/skin/font.png deleted file mode 100644 index 707a5b4..0000000 Binary files a/pandora/skin/font.png and /dev/null differ diff --git a/pandora/skin/readme.txt b/pandora/skin/readme.txt deleted file mode 100644 index dd83963..0000000 --- a/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/pandora/skin/selector.png b/pandora/skin/selector.png deleted file mode 100644 index a439169..0000000 Binary files a/pandora/skin/selector.png and /dev/null differ diff --git a/pandora/skin/skin.txt b/pandora/skin/skin.txt deleted file mode 100644 index 1d6979f..0000000 --- a/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 - -- cgit v1.2.3