From: notaz Date: Sat, 25 Dec 2010 19:53:50 +0000 (+0200) Subject: add .pnd stuff X-Git-Tag: r1^0 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=303ee308587f4d2d24047ed5c43de999777cd275;p=pcsx_rearmed.git add .pnd stuff --- diff --git a/Makefile b/Makefile index 30627530..f195b9b6 100644 --- a/Makefile +++ b/Makefile @@ -91,3 +91,15 @@ spunull.so: plugins/spunull/spunull.c clean: $(RM) $(TARGET) $(OBJS) +# ----------- release ----------- + +PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh + +VER ?= $(shell git describe --abbrev=0 master) + +rel: pcsx pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \ + pandora/picorestore pandora/readme.txt skin COPYING + rm -rf out + mkdir out + cp -r $^ out/ + $(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x pandora/pcsx.pxml -i pandora/pcsx.png -c diff --git a/pandora/pcsx.png b/pandora/pcsx.png new file mode 100644 index 00000000..71f36d0e Binary files /dev/null and b/pandora/pcsx.png differ diff --git a/pandora/pcsx.pxml b/pandora/pcsx.pxml new file mode 100644 index 00000000..3ffe8b0b --- /dev/null +++ b/pandora/pcsx.pxml @@ -0,0 +1,23 @@ + + + + PCSX ReARMed + + PlayStation 1 Emulator. + + + + + + + + + + + + + + + + + diff --git a/pandora/pcsx.sh b/pandora/pcsx.sh new file mode 100755 index 00000000..a4017141 --- /dev/null +++ b/pandora/pcsx.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +./pcsx "$@" + +# restore stuff if pcsx crashes +./picorestore diff --git a/pandora/picorestore.c b/pandora/picorestore.c new file mode 100644 index 00000000..77f57202 --- /dev/null +++ b/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 +#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 new file mode 100644 index 00000000..36c55d95 --- /dev/null +++ b/pandora/readme.txt @@ -0,0 +1,49 @@ + +PCSX-ReARMed - yet another PCSX fork + + +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. It was created for Pandora handheld, but should be usable on other +devices after some code adjustments. + +It does not, however, have anything in common with similar psx4all and +pcsx4all projects, except that all of these are PCSX ports. + + +Usage +----- + +This version features a framebuffer driven menu that can be used to run +games and configure the emulator. + +Supportd CD image formats: +- .cue/.bin +- .toc/.bin +- .img +- .mds +- .Z/.Z.table + +CDDA (CD audio) support requires .cue/.bin format. + + +Credits / License +----------------- + +(C) 1999-2003 PCSX Team +(C) 2005-2009 PCSX-df Team +(C) 2009-2010 PCSX-Reloaded Team +GPU and SPU code by Pete Bernert and the P.E.Op.S. team +ARM recompiler (C) 2009-2010 Ari64 +integration, optimization and frontend (C) 2010 notaz + +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 +