From 492d353af951b6a34a1f62d07ec64456b6e34600 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Wed, 23 Jul 2008 11:21:08 +0000
Subject: [PATCH] more Pandora porting work
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@560 be3aeb3a-fb24-0410-a615-afba39da0efa
---
common/common.h | 8 +-
gp2x/Makefile | 6 +-
pandora/Makefile | 8 +-
pandora/emu.c | 1014 +++++++++++++++++++++++++++++++++++++++++++++
pandora/main.c | 9 +-
pandora/pandora.c | 262 ++----------
6 files changed, 1070 insertions(+), 237 deletions(-)
create mode 100644 pandora/emu.c
diff --git a/common/common.h b/common/common.h
index f2964bc..72bd17d 100644
--- a/common/common.h
+++ b/common/common.h
@@ -101,8 +101,8 @@ void gp2x_pd_clone_buffer2(void);
void menu_darken_bg(void *dst, int pixels, int darker);
void menu_flip(void);
-#define SCREEN_WIDTH 320
-#define SCREEN_HEIGHT 240
+#define SCREEN_WIDTH 800
+#define SCREEN_HEIGHT 480
#define SCREEN_BUFFER gp2x_screen
#define read_buttons(which) \
@@ -112,9 +112,9 @@ void menu_flip(void);
#define menu_draw_begin() \
gp2x_pd_clone_buffer2()
#define clear_screen() \
- memset(gp2x_screen, 0, 320*240*2)
+ memset(gp2x_screen, 0, 800*480*2)
#define darken_screen() \
- menu_darken_bg(gp2x_screen, 320*240, 0)
+ menu_darken_bg(gp2x_screen, 800*480, 0)
#define menu_draw_end() \
menu_flip()
diff --git a/gp2x/Makefile b/gp2x/Makefile
index b032133..57bd810 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -147,7 +147,7 @@ DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound
all: mkdirs PicoDrive.gpe
-PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
+PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
@echo ">>>" $@
$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
ifeq ($(DEBUG),)
@@ -228,8 +228,8 @@ Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
# build helix libs
-../common/helix/helix_mp3.a:
- make -C ../common/helix
+../common/helix/$(CROSS)helix-mp3.a:
+ make -C ../common/helix clean all
readme.txt: ../../tools/textfilter ../base_readme.txt
../../tools/textfilter ../base_readme.txt $@ GP2X
diff --git a/pandora/Makefile b/pandora/Makefile
index ffa1d72..016a76f 100644
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -49,7 +49,7 @@ LD = $(CROSS)ld
OBJCOPY = $(CROSS)objcopy
# frontend
-OBJS += pandora.o main.o platform/gp2x/menu.o platform/gp2x/usbjoy.o platform/gp2x/emu.o
+OBJS += pandora.o main.o emu.o platform/gp2x/menu.o platform/gp2x/usbjoy.o
# common
OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
@@ -141,7 +141,7 @@ DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound
all: mkdirs PicoDrive
-PicoDrive : $(OBJS) ../common/helix/helix_mp3.a
+PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
@echo ">>>" $@
$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng
ifeq ($(DEBUG),)
@@ -218,8 +218,8 @@ Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
# build helix libs
-../common/helix/helix_mp3.a:
- make -C ../common/helix
+../common/helix/$(CROSS)helix-mp3.a:
+ make -C ../common/helix clean all
readme.txt: ../../tools/textfilter ../base_readme.txt
../../tools/textfilter ../base_readme.txt $@ GP2X
diff --git a/pandora/emu.c b/pandora/emu.c
new file mode 100644
index 0000000..16fa519
--- /dev/null
+++ b/pandora/emu.c
@@ -0,0 +1,1014 @@
+// (c) Copyright 2006-2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <linux/limits.h>
+#include <ctype.h>
+#include <unistd.h>
+
+#include <stdarg.h>
+
+#include "../gp2x/emu.h"
+#include "../gp2x/usbjoy.h"
+#include "../gp2x/menu.h"
+#include "../common/arm_utils.h"
+#include "../common/fonts.h"
+#include "../common/emu.h"
+#include "../common/config.h"
+#include "../common/common.h"
+
+#include <Pico/PicoInt.h>
+#include <Pico/Patch.h>
+#include <Pico/sound/mix.h>
+#include <zlib/zlib.h>
+
+//#define PFRAMES
+
+#ifdef BENCHMARK
+#define OSD_FPS_X (800-200)
+#else
+#define OSD_FPS_X (800-120)
+#endif
+
+
+int engineState;
+int select_exits = 0;
+
+char romFileName[PATH_MAX];
+
+static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
+static struct timeval noticeMsgTime = { 0, 0 }; // when started showing
+static int osd_fps_x;
+char noticeMsg[64]; // notice msg to draw
+unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer
+int reset_timing = 0;
+
+#define PICO_PEN_ADJUST_X 4
+#define PICO_PEN_ADJUST_Y 2
+static int pico_pen_x = SCREEN_WIDTH/2, pico_pen_y = 240/2;
+
+static void emu_msg_cb(const char *msg);
+static void emu_msg_tray_open(void);
+
+
+void emu_noticeMsgUpdated(void)
+{
+ gettimeofday(¬iceMsgTime, 0);
+}
+
+void emu_getMainDir(char *dst, int len)
+{
+ extern char **g_argv;
+ int j;
+
+ strncpy(dst, g_argv[0], len);
+ len -= 32; // reserve
+ if (len < 0) len = 0;
+ dst[len] = 0;
+ for (j = strlen(dst); j > 0; j--)
+ if (dst[j] == '/') { dst[j+1] = 0; break; }
+}
+
+void emu_Init(void)
+{
+ // make temp buffer for alt renderer
+ PicoDraw2FB = malloc((8+320)*(8+240+8));
+ if (!PicoDraw2FB)
+ {
+ printf("PicoDraw2FB == 0\n");
+ }
+
+ // make dirs for saves, cfgs, etc.
+ mkdir("mds", 0777);
+ mkdir("srm", 0777);
+ mkdir("brm", 0777);
+ mkdir("cfg", 0777);
+
+ PicoInit();
+ PicoMessage = emu_msg_cb;
+ PicoMCDopenTray = emu_msg_tray_open;
+ PicoMCDcloseTray = menu_loop_tray;
+}
+
+
+static void scaling_update(void)
+{
+ PicoOpt &= ~0x4100;
+ switch (currentConfig.scaling) {
+ default: break; // off
+ case 1: // hw hor
+ case 2: PicoOpt |= 0x0100; break; // hw hor+vert
+ case 3: PicoOpt |= 0x4000; break; // sw hor
+ }
+}
+
+
+void emu_Deinit(void)
+{
+ // save SRAM
+ if((currentConfig.EmuOpt & 1) && SRam.changed) {
+ emu_SaveLoadGame(0, 1);
+ SRam.changed = 0;
+ }
+
+ if (!(currentConfig.EmuOpt & 0x20)) {
+ config_writelrom(PicoConfigFile);
+#ifndef NO_SYNC
+ sync();
+#endif
+ }
+
+ free(PicoDraw2FB);
+
+ PicoExit();
+}
+
+void emu_prepareDefaultConfig(void)
+{
+ memset(&defaultConfig, 0, sizeof(defaultConfig));
+ defaultConfig.EmuOpt = 0x9f | 0x00700; // | <- ram_tmng, confirm_save, cd_leds
+ defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES|POPT_EN_MCD_GFX;
+ defaultConfig.s_PsndRate = 44100;
+ defaultConfig.s_PicoRegion = 0; // auto
+ defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
+ defaultConfig.s_PicoCDBuffers = 0;
+ defaultConfig.Frameskip = 0; // auto
+ defaultConfig.CPUclock = 200;
+ defaultConfig.volume = 50;
+ defaultConfig.scaling = 0;
+ defaultConfig.turbo_rate = 15;
+}
+
+void emu_setDefaultConfig(void)
+{
+ memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));
+ PicoOpt = currentConfig.s_PicoOpt;
+ PsndRate = currentConfig.s_PsndRate;
+ PicoRegionOverride = currentConfig.s_PicoRegion;
+ PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
+ PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+}
+
+static void textOut16(int x, int y, const char *text)
+{
+ int i,l,len=strlen(text);
+ unsigned int *screen = (unsigned int *)((unsigned short *)SCREEN_BUFFER + (x&~1) + y*SCREEN_WIDTH);
+
+ for (i = 0; i < len; i++)
+ {
+ for (l=0;l<16;l+=2)
+ {
+ unsigned char fd = fontdata8x8[((text[i])*8)+l/2];
+ int u = l+1;
+ if(fd&0x80) screen[l*SCREEN_WIDTH/2+0]=screen[u*SCREEN_WIDTH/2+0]=0xffffffff;
+ if(fd&0x40) screen[l*SCREEN_WIDTH/2+1]=screen[u*SCREEN_WIDTH/2+1]=0xffffffff;
+ if(fd&0x20) screen[l*SCREEN_WIDTH/2+2]=screen[u*SCREEN_WIDTH/2+2]=0xffffffff;
+ if(fd&0x10) screen[l*SCREEN_WIDTH/2+3]=screen[u*SCREEN_WIDTH/2+3]=0xffffffff;
+ if(fd&0x08) screen[l*SCREEN_WIDTH/2+4]=screen[u*SCREEN_WIDTH/2+4]=0xffffffff;
+ if(fd&0x04) screen[l*SCREEN_WIDTH/2+5]=screen[u*SCREEN_WIDTH/2+5]=0xffffffff;
+ if(fd&0x02) screen[l*SCREEN_WIDTH/2+6]=screen[u*SCREEN_WIDTH/2+6]=0xffffffff;
+ if(fd&0x01) screen[l*SCREEN_WIDTH/2+7]=screen[u*SCREEN_WIDTH/2+7]=0xffffffff;
+ }
+ screen += 8;
+ }
+}
+
+
+void osd_text(int x, int y, const char *text)
+{
+ int len = strlen(text)*8;
+
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+ int *p, i, h;
+ x &= ~3; // align x
+ len = (len+3) >> 2;
+ for (h = 0; h < 8; h++) {
+ p = (int *) ((unsigned char *) gp2x_screen+x+SCREEN_WIDTH*(y+h));
+ for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
+ }
+ emu_textOut8(x, y, text);
+ } else {
+ int *p, i, h;
+ x &= ~1; // align x
+ len++;
+ for (h = 0; h < 16; h++) {
+ p = (int *) ((unsigned short *) gp2x_screen+x+SCREEN_WIDTH*(y+h));
+ for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;
+ }
+ textOut16(x, y, text);
+ }
+}
+
+static void draw_cd_leds(void)
+{
+// static
+ int old_reg;
+// if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change // mmu hack problems?
+ old_reg = Pico_mcd->s68k_regs[0];
+
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+ // 8-bit modes
+ unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;
+ unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;
+ *(unsigned int *)((char *)gp2x_screen + SCREEN_WIDTH*2+ 4) =
+ *(unsigned int *)((char *)gp2x_screen + SCREEN_WIDTH*3+ 4) =
+ *(unsigned int *)((char *)gp2x_screen + SCREEN_WIDTH*4+ 4) = col_g;
+ *(unsigned int *)((char *)gp2x_screen + SCREEN_WIDTH*2+12) =
+ *(unsigned int *)((char *)gp2x_screen + SCREEN_WIDTH*3+12) =
+ *(unsigned int *)((char *)gp2x_screen + SCREEN_WIDTH*4+12) = col_r;
+ } else {
+ // 16-bit modes
+ unsigned int *p = (unsigned int *)((short *)gp2x_screen + SCREEN_WIDTH*2+4);
+ unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;
+ unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;
+ *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += SCREEN_WIDTH/2 - 12/2;
+ *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += SCREEN_WIDTH/2 - 12/2;
+ *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
+ }
+}
+
+static void draw_pico_ptr(void)
+{
+ unsigned short *p = (unsigned short *)gp2x_screen;
+
+ // only if pen enabled and for 16bit modes
+ if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;
+
+ if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))
+ p += 32;
+
+ p += SCREEN_WIDTH * (pico_pen_y + PICO_PEN_ADJUST_Y);
+ p += pico_pen_x + PICO_PEN_ADJUST_X;
+ p[0] ^= 0xffff;
+ p[319] ^= 0xffff;
+ p[320] ^= 0xffff;
+ p[321] ^= 0xffff;
+ p[640] ^= 0xffff;
+}
+
+static int EmuScanEnd16(unsigned int num)
+{
+ unsigned char *ps=HighCol+8;
+ unsigned short *pd;
+ unsigned short *pal=HighPal;
+ int sh = Pico.video.reg[0xC]&8;
+ int len, mask = 0xff;
+
+ if (!(Pico.video.reg[1]&8)) num += 8;
+ pd=(unsigned short *)gp2x_screen + num*800*2 + 800/2 - 320*2/2;
+
+ if (Pico.m.dirtyPal)
+ PicoDoHighPal555(sh);
+
+ if (Pico.video.reg[12]&1) {
+ len = 320;
+ } else {
+ pd+=32;
+ len = 256;
+ }
+
+ if (!sh && (rendstatus & PDRAW_ACC_SPRITES))
+ mask=0x3f; // accurate sprites, upper bits are priority stuff
+
+
+ for (; len > 0; len--)
+ {
+ unsigned int p = pal[*ps++ & mask];
+ p |= p << 16;
+ *(unsigned int *)pd = p;
+ *(unsigned int *)(&pd[800]) = p;
+ pd += 2;
+ }
+
+ return 0;
+}
+
+static int EmuScanBegin8(unsigned int num)
+{
+ if (!(Pico.video.reg[1]&8)) num += 8;
+ DrawLineDest = (unsigned char *) gp2x_screen + SCREEN_WIDTH * num;
+
+ return 0;
+}
+
+int localPal[0x100];
+static void (*vidCpyM2)(void *dest, void *src) = NULL;
+
+static void blit(const char *fps, const char *notice)
+{
+ int emu_opt = currentConfig.EmuOpt;
+
+ if (PicoOpt&0x10)
+ {
+ // 8bit fast renderer
+ if (Pico.m.dirtyPal) {
+ Pico.m.dirtyPal = 0;
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+ // feed new palette to our device
+ gp2x_video_setpalette(localPal, 0x40);
+ }
+ // a hack for VR
+ if (PicoRead16Hook == PicoSVPRead16)
+ memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
+ // do actual copy
+ vidCpyM2((unsigned char *)gp2x_screen+SCREEN_WIDTH*8, PicoDraw2FB+328*8);
+ }
+ else if (!(emu_opt&0x80))
+ {
+ // 8bit accurate renderer
+ if (Pico.m.dirtyPal)
+ {
+ int pallen = 0x40;
+ Pico.m.dirtyPal = 0;
+ if (Pico.video.reg[0xC]&8) // shadow/hilight mode
+ {
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+ vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
+ vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);
+ memcpy32(localPal+0xc0, localPal+0x40, 0x40);
+ pallen = 0x100;
+ }
+ else if (rendstatus & PDRAW_ACC_SPRITES) {
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+ memcpy32(localPal+0x40, localPal, 0x40);
+ memcpy32(localPal+0x80, localPal, 0x40);
+ memcpy32(localPal+0xc0, localPal, 0x40);
+ pallen = 0x100;
+ }
+ else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+ vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);
+ vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);
+ pallen = 0xc0;
+ }
+ else {
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+ }
+ if (pallen > 0xc0) {
+ localPal[0xc0] = 0x0000c000;
+ localPal[0xd0] = 0x00c00000;
+ localPal[0xe0] = 0x00000000; // reserved pixels for OSD
+ localPal[0xf0] = 0x00ffffff;
+ }
+ gp2x_video_setpalette(localPal, pallen);
+ }
+ }
+
+ if (notice || (emu_opt & 2)) {
+ int h = SCREEN_HEIGHT-16;
+ if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) h -= 16;
+ if (notice) osd_text(4, h, notice);
+ if (emu_opt & 2)
+ osd_text(osd_fps_x+24*2, h-8, fps);
+ }
+ if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+ draw_cd_leds();
+ if (PicoAHW & PAHW_PICO)
+ draw_pico_ptr();
+{
+//static int u=0;
+//memset((char *)gp2x_screen+800*471*2, (u++)>>1, 800*9*2);
+}
+
+ //gp2x_video_wait_vsync();
+ gp2x_video_flip();
+}
+
+
+// clears whole screen or just the notice area (in all buffers)
+static void clearArea(int full)
+{
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+ // 8-bit renderers
+ if (full) gp2x_memset_all_buffers(0, 0xe0, SCREEN_WIDTH*240);
+ else gp2x_memset_all_buffers(SCREEN_WIDTH*232, 0xe0, SCREEN_WIDTH*8);
+ } else {
+ // 16bit accurate renderer
+ if (full) gp2x_memset_all_buffers(0, 0, SCREEN_WIDTH*SCREEN_HEIGHT*2);
+ else gp2x_memset_all_buffers(SCREEN_WIDTH*(SCREEN_HEIGHT-16)*2, 0, SCREEN_WIDTH*16*2);
+ }
+}
+
+
+static void vidResetMode(void)
+{
+ if (PicoOpt&0x10) {
+ gp2x_video_changemode(8);
+ } else if (currentConfig.EmuOpt&0x80) {
+ gp2x_video_changemode(16);
+ PicoDrawSetColorFormat(-1);
+ PicoScanEnd = EmuScanEnd16;
+ } else {
+ gp2x_video_changemode(8);
+ PicoDrawSetColorFormat(2);
+ PicoScanBegin = EmuScanBegin8;
+ }
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+ // setup pal for 8-bit modes
+ localPal[0xc0] = 0x0000c000; // MCD LEDs
+ localPal[0xd0] = 0x00c00000;
+ localPal[0xe0] = 0x00000000; // reserved pixels for OSD
+ localPal[0xf0] = 0x00ffffff;
+ gp2x_video_setpalette(localPal, 0x100);
+ gp2x_memset_all_buffers(0, 0xe0, 320*240);
+ gp2x_video_flip();
+ }
+ Pico.m.dirtyPal = 1;
+ // reset scaling
+ if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8))
+ gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224);
+ else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);
+}
+
+
+static void emu_msg_cb(const char *msg)
+{
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+ // 8-bit renderers
+ gp2x_memset_all_buffers(SCREEN_WIDTH*(SCREEN_HEIGHT-16), 0xe0, SCREEN_WIDTH*16);
+ osd_text(4, SCREEN_HEIGHT-16, msg);
+ gp2x_memcpy_all_buffers((char *)gp2x_screen+SCREEN_WIDTH*(SCREEN_HEIGHT-16),
+ SCREEN_WIDTH*(SCREEN_HEIGHT-16), SCREEN_WIDTH*16);
+ } else {
+ // 16bit accurate renderer
+ gp2x_memset_all_buffers(SCREEN_WIDTH*(SCREEN_HEIGHT-16)*2, 0, SCREEN_WIDTH*16*2);
+ osd_text(4, SCREEN_HEIGHT-16, msg);
+ gp2x_memcpy_all_buffers((char *)gp2x_screen+SCREEN_WIDTH*(SCREEN_HEIGHT-16)*2,
+ SCREEN_WIDTH*(SCREEN_HEIGHT-16)*2, SCREEN_WIDTH*16*2);
+ }
+ gettimeofday(¬iceMsgTime, 0);
+ noticeMsgTime.tv_sec -= 2;
+
+ /* assumption: emu_msg_cb gets called only when something slow is about to happen */
+ reset_timing = 1;
+}
+
+static void emu_state_cb(const char *str)
+{
+ clearArea(0);
+ blit("", str);
+}
+
+static void emu_msg_tray_open(void)
+{
+ strcpy(noticeMsg, "CD tray opened");
+ gettimeofday(¬iceMsgTime, 0);
+}
+
+static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
+{
+ int ret, px, py, lim_x;
+ static int pdown_frames = 0;
+
+ emu_RunEventsPico(events);
+
+ if (pico_inp_mode == 0) return;
+
+ // for F200
+ ret = gp2x_touchpad_read(&px, &py);
+ if (ret >= 0)
+ {
+ if (ret > 35000)
+ {
+ if (pdown_frames++ > 5)
+ PicoPad[0] |= 0x20;
+
+ pico_pen_x = px;
+ pico_pen_y = py;
+ if (!(Pico.video.reg[12]&1)) {
+ pico_pen_x -= 32;
+ if (pico_pen_x < 0) pico_pen_x = 0;
+ if (pico_pen_x > 248) pico_pen_x = 248;
+ }
+ if (pico_pen_y > 224) pico_pen_y = 224;
+ }
+ else
+ pdown_frames = 0;
+
+ //if (ret == 0)
+ // PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;
+ }
+
+ PicoPad[0] &= ~0x0f; // release UDLR
+ if (gp2x_keys & GP2X_UP) pico_pen_y--;
+ if (gp2x_keys & GP2X_DOWN) pico_pen_y++;
+ if (gp2x_keys & GP2X_LEFT) pico_pen_x--;
+ if (gp2x_keys & GP2X_RIGHT) pico_pen_x++;
+
+ lim_x = (Pico.video.reg[12]&1) ? 319 : 255;
+ if (pico_pen_y < 8) pico_pen_y = 8;
+ if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y;
+ if (pico_pen_x < 0) pico_pen_x = 0;
+ if (pico_pen_x > lim_x-PICO_PEN_ADJUST_X) pico_pen_x = lim_x-PICO_PEN_ADJUST_X;
+
+ PicoPicohw.pen_pos[0] = pico_pen_x;
+ if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;
+ PicoPicohw.pen_pos[0] += 0x3c;
+ PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
+}
+
+static void update_volume(int has_changed, int is_up)
+{
+ static int prev_frame = 0, wait_frames = 0;
+ int vol = currentConfig.volume;
+
+ if (has_changed)
+ {
+ if (vol < 5 && (PicoOpt&8) && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)
+ wait_frames++;
+ else {
+ if (is_up) {
+ if (vol < 99) vol++;
+ } else {
+ if (vol > 0) vol--;
+ }
+ wait_frames = 0;
+ gp2x_sound_volume(vol, vol);
+ currentConfig.volume = vol;
+ }
+ sprintf(noticeMsg, "VOL: %02i", vol);
+ gettimeofday(¬iceMsgTime, 0);
+ prev_frame = Pico.m.frame_count;
+ }
+
+ // set the right mixer func
+ if (!(PicoOpt&8)) return; // just use defaults for mono
+ if (vol >= 5)
+ PsndMix_32_to_16l = mix_32_to_16l_stereo;
+ else {
+ mix_32_to_16l_level = 5 - vol;
+ PsndMix_32_to_16l = mix_32_to_16l_stereo_lvl;
+ }
+}
+
+static void RunEvents(unsigned int which)
+{
+ if (which & 0x1800) // save or load (but not both)
+ {
+ int do_it = 1;
+ if ( emu_checkSaveFile(state_slot) &&
+ (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
+ (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save
+ unsigned long keys;
+ blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)");
+ while ( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )
+ usleep(50*1024);
+ if (keys & GP2X_X) do_it = 0;
+ while ( gp2x_joystick_read(1) & (GP2X_X|GP2X_Y) ) // wait for release
+ usleep(50*1024);
+ clearArea(0);
+ }
+ if (do_it) {
+ osd_text(4, SCREEN_HEIGHT-16, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
+ PicoStateProgressCB = emu_state_cb;
+ gp2x_memcpy_all_buffers(gp2x_screen, 0, SCREEN_WIDTH*SCREEN_HEIGHT*2);
+ emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+ PicoStateProgressCB = NULL;
+ }
+
+ reset_timing = 1;
+ }
+ if (which & 0x0400) // switch renderer
+ {
+ if ( PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; }
+ else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10;
+ else currentConfig.EmuOpt &= ~0x80;
+
+ vidResetMode();
+
+ if (PicoOpt&0x10) {
+ strcpy(noticeMsg, " 8bit fast renderer");
+ } else if (currentConfig.EmuOpt&0x80) {
+ strcpy(noticeMsg, "16bit accurate renderer");
+ } else {
+ strcpy(noticeMsg, " 8bit accurate renderer");
+ }
+
+ gettimeofday(¬iceMsgTime, 0);
+ }
+ if (which & 0x0300)
+ {
+ if(which&0x0200) {
+ state_slot -= 1;
+ if(state_slot < 0) state_slot = 9;
+ } else {
+ state_slot += 1;
+ if(state_slot > 9) state_slot = 0;
+ }
+ sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
+ gettimeofday(¬iceMsgTime, 0);
+ }
+ if (which & 0x0080) {
+ engineState = PGS_Menu;
+ }
+}
+
+static void updateKeys(void)
+{
+ unsigned int keys, keys2, allActions[2] = { 0, 0 }, events;
+ static unsigned int prevEvents = 0;
+ int joy, i;
+
+ keys = gp2x_joystick_read(0);
+ if (keys & GP2X_SELECT) {
+ engineState = select_exits ? PGS_Quit : PGS_Menu;
+ // wait until select is released, so menu would not resume game
+ while (gp2x_joystick_read(1) & GP2X_SELECT) usleep(50*1000);
+ }
+
+ keys &= CONFIGURABLE_KEYS;
+ keys2 = keys;
+
+ for (i = 0; i < 32; i++)
+ {
+ if (keys2 & (1 << i))
+ {
+ int pl, acts = currentConfig.KeyBinds[i];
+ if (!acts) continue;
+ pl = (acts >> 16) & 1;
+ if (kb_combo_keys & (1 << i))
+ {
+ int u = i+1, acts_c = acts & kb_combo_acts;
+ // let's try to find the other one
+ if (acts_c) {
+ for (; u < 32; u++)
+ if ( (keys2 & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
+ allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
+ keys2 &= ~((1 << i) | (1 << u));
+ break;
+ }
+ }
+ // add non-combo actions if combo ones were not found
+ if (!acts_c || u == 32)
+ allActions[pl] |= acts & ~kb_combo_acts;
+ } else {
+ allActions[pl] |= acts;
+ }
+ }
+ }
+
+ // add joy inputs
+ if (num_of_joys > 0)
+ {
+ gp2x_usbjoy_update();
+ for (joy = 0; joy < num_of_joys; joy++) {
+ int btns = gp2x_usbjoy_check2(joy);
+ for (i = 0; i < 32; i++) {
+ if (btns & (1 << i)) {
+ int acts = currentConfig.JoyBinds[joy][i];
+ int pl = (acts >> 16) & 1;
+ allActions[pl] |= acts;
+ }
+ }
+ }
+ }
+
+ PicoPad[0] = allActions[0] & 0xfff;
+ PicoPad[1] = allActions[1] & 0xfff;
+
+ if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
+ if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]);
+
+ events = (allActions[0] | allActions[1]) >> 16;
+
+ // volume is treated in special way and triggered every frame
+ if (events & 0x6000)
+ update_volume(1, events & 0x2000);
+
+ if ((events ^ prevEvents) & 0x40) {
+ emu_changeFastForward(events & 0x40);
+ update_volume(0, 0);
+ reset_timing = 1;
+ }
+
+ events &= ~prevEvents;
+
+ if (PicoAHW == PAHW_PICO)
+ RunEventsPico(events, keys);
+ if (events) RunEvents(events);
+ if (movie_data) emu_updateMovie();
+
+ prevEvents = (allActions[0] | allActions[1]) >> 16;
+}
+
+
+static void updateSound(int len)
+{
+ if (PicoOpt&8) len<<=1;
+
+ /* avoid writing audio when lagging behind to prevent audio lag */
+ if (PicoSkipFrame != 2)
+ gp2x_sound_write(PsndOut, len<<1);
+}
+
+
+static void SkipFrame(int do_audio)
+{
+ PicoSkipFrame=do_audio ? 1 : 2;
+ PicoFrame();
+ PicoSkipFrame=0;
+}
+
+
+void emu_forcedFrame(int opts)
+{
+ int po_old = PicoOpt;
+ int eo_old = currentConfig.EmuOpt;
+
+ PicoOpt &= ~0x10;
+ PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites
+ currentConfig.EmuOpt |= 0x80;
+
+ //vidResetMode();
+ PicoDrawSetColorFormat(-1);
+ PicoScanEnd = EmuScanEnd16;
+ Pico.m.dirtyPal = 1;
+ PicoFrameDrawOnly();
+
+/*
+ if (!(Pico.video.reg[12]&1)) {
+ vidCpyM2 = vidCpyM2_32col;
+ clearArea(1);
+ } else vidCpyM2 = vidCpyM2_40col;
+
+ vidCpyM2((unsigned char *)gp2x_screen+SCREEN_WIDTH*8, PicoDraw2FB+328*8);
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+ gp2x_video_setpalette(localPal, 0x40);
+*/
+ PicoOpt = po_old;
+ currentConfig.EmuOpt = eo_old;
+}
+
+static void simpleWait(int thissec, int lim_time)
+{
+ struct timeval tval;
+
+ spend_cycles(1024);
+ gettimeofday(&tval, 0);
+ if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
+
+ while (tval.tv_usec < lim_time)
+ {
+ spend_cycles(1024);
+ gettimeofday(&tval, 0);
+ if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
+ }
+}
+
+
+void emu_Loop(void)
+{
+ static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
+ char fpsbuff[24]; // fps count c string
+ struct timeval tval; // timing
+ int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync
+ int frames_done, frames_shown, thissec; // actual frames
+ int oldmodes = 0, target_fps, target_frametime, lim_time, vsync_offset, i;
+ char *notice = 0;
+
+ printf("entered emu_Loop()\n");
+
+ fpsbuff[0] = 0;
+
+ // make sure we are in correct mode
+ vidResetMode();
+ scaling_update();
+ Pico.m.dirtyPal = 1;
+ oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
+ emu_findKeyBindCombos();
+
+ // pal/ntsc might have changed, reset related stuff
+ target_fps = Pico.m.pal ? 50 : 60;
+ target_frametime = 1000000/target_fps;
+ reset_timing = 1;
+
+ // prepare sound stuff
+ if (currentConfig.EmuOpt & 4)
+ {
+ int snd_excess_add;
+ if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old)
+ PsndRerate(Pico.m.frame_count ? 1 : 0);
+
+ snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
+ printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
+ PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
+ gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);
+ gp2x_sound_volume(currentConfig.volume, currentConfig.volume);
+ PicoWriteSound = updateSound;
+ update_volume(0, 0);
+ memset(sndBuffer, 0, sizeof(sndBuffer));
+ PsndOut = sndBuffer;
+ PsndRate_old = PsndRate;
+ PicoOpt_old = PicoOpt;
+ pal_old = Pico.m.pal;
+ } else {
+ PsndOut = NULL;
+ }
+
+ // prepare CD buffer
+ if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
+
+ // calc vsync offset to sync timing code with vsync
+ if (currentConfig.EmuOpt&0x2000) {
+ gettimeofday(&tval, 0);
+ gp2x_video_wait_vsync();
+ gettimeofday(&tval, 0);
+ vsync_offset = tval.tv_usec;
+ while (vsync_offset >= target_frametime)
+ vsync_offset -= target_frametime;
+ if (!vsync_offset) vsync_offset++;
+ printf("vsync_offset: %i\n", vsync_offset);
+ } else
+ vsync_offset = 0;
+
+ frames_done = frames_shown = thissec =
+ pframes_done = pframes_shown = pthissec = 0;
+
+ // loop
+ while (engineState == PGS_Running)
+ {
+ int modes;
+
+ gettimeofday(&tval, 0);
+ if (reset_timing) {
+ reset_timing = 0;
+ pthissec = tval.tv_sec;
+ pframes_shown = pframes_done = tval.tv_usec/target_frametime;
+ }
+
+ // show notice message?
+ if (noticeMsgTime.tv_sec)
+ {
+ static int noticeMsgSum;
+ if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec
+ noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0;
+ clearArea(0);
+ notice = 0;
+ } else {
+ int sum = noticeMsg[0]+noticeMsg[1]+noticeMsg[2];
+ if (sum != noticeMsgSum) { clearArea(0); noticeMsgSum = sum; }
+ notice = noticeMsg;
+ }
+ }
+
+ // check for mode changes
+ modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);
+ if (modes != oldmodes)
+ {
+ int scalex = SCREEN_WIDTH;
+ osd_fps_x = OSD_FPS_X;
+ if (modes & 4) {
+ vidCpyM2 = vidCpyM2_40col;
+ } else {
+ if (PicoOpt & 0x100) {
+ vidCpyM2 = vidCpyM2_32col_nobord;
+ scalex = 256;
+ osd_fps_x = OSD_FPS_X - 64;
+ } else {
+ vidCpyM2 = vidCpyM2_32col;
+ }
+ }
+ if (currentConfig.scaling == 2 && !(modes&8)) // want vertical scaling and game is not in 240 line mode
+ gp2x_video_RGB_setscaling(8, scalex, 224);
+ else gp2x_video_RGB_setscaling(0, scalex, 240);
+ oldmodes = modes;
+ clearArea(1);
+ }
+
+ // second changed?
+ if (thissec != tval.tv_sec)
+ {
+#ifdef BENCHMARK
+ static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];
+ if (++bench == 10) {
+ bench = 0;
+ bench_fps_s = bench_fps;
+ bf[bfp++ & 3] = bench_fps;
+ bench_fps = 0;
+ }
+ bench_fps += frames_shown;
+ sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
+#else
+ if (currentConfig.EmuOpt & 2) {
+ //sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
+ sprintf(fpsbuff, "%4i", frames_shown);
+ if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
+ }
+#endif
+ frames_shown = frames_done = 0;
+ thissec = tval.tv_sec;
+ }
+#ifdef PFRAMES
+ sprintf(fpsbuff, "%i", Pico.m.frame_count);
+#endif
+
+ if (pthissec != tval.tv_sec)
+ {
+ if (PsndOut == 0 && currentConfig.Frameskip >= 0) {
+ pframes_done = pframes_shown = 0;
+ } else {
+ // it is quite common for this implementation to leave 1 fame unfinished
+ // when second changes, but we don't want buffer to starve.
+ if(PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) {
+ updateKeys();
+ SkipFrame(1); pframes_done++;
+ }
+
+ pframes_done -= target_fps; if (pframes_done < 0) pframes_done = 0;
+ pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0;
+ if (pframes_shown > pframes_done) pframes_shown = pframes_done;
+ }
+ pthissec = tval.tv_sec;
+ }
+
+ lim_time = (pframes_done+1) * target_frametime + vsync_offset;
+ if (currentConfig.Frameskip >= 0) // frameskip enabled
+ {
+ for(i = 0; i < currentConfig.Frameskip; i++) {
+ updateKeys();
+ SkipFrame(1); pframes_done++; frames_done++;
+ if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled
+ gettimeofday(&tval, 0);
+ if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;
+ if (tval.tv_usec < lim_time) { // we are too fast
+ simpleWait(pthissec, lim_time);
+ }
+ }
+ lim_time += target_frametime;
+ }
+ }
+ else if (tval.tv_usec > lim_time) // auto frameskip
+ {
+ // no time left for this frame - skip
+ if (tval.tv_usec - lim_time >= 300000) {
+ /* something caused a slowdown for us (disk access? cache flush?)
+ * try to recover by resetting timing... */
+ reset_timing = 1;
+ continue;
+ }
+ updateKeys();
+ SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++;
+ continue;
+ }
+
+ updateKeys();
+ PicoFrame();
+
+ // check time
+ gettimeofday(&tval, 0);
+ if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;
+
+ if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection
+ reset_timing = 1;
+/* else if (PsndOut != NULL || currentConfig.Frameskip < 0)
+ {
+ // sleep or vsync if we are still too fast
+ // usleep sleeps for ~20ms minimum, so it is not a solution here
+ if (!reset_timing && tval.tv_usec < lim_time)
+ {
+ // we are too fast
+ if (vsync_offset) {
+ if (lim_time - tval.tv_usec > target_frametime/2)
+ simpleWait(pthissec, lim_time - target_frametime/4);
+ gp2x_video_wait_vsync();
+ } else {
+ simpleWait(pthissec, lim_time);
+ }
+ }
+ }
+*/
+ blit(fpsbuff, notice);
+
+ pframes_done++; pframes_shown++;
+ frames_done++; frames_shown++;
+ }
+
+ emu_changeFastForward(0);
+
+ if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+
+ // save SRAM
+ if((currentConfig.EmuOpt & 1) && SRam.changed) {
+ emu_state_cb("Writing SRAM/BRAM..");
+ emu_SaveLoadGame(0, 1);
+ SRam.changed = 0;
+ }
+
+ // if in 8bit mode, generate 16bit image for menu background
+ if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
+ emu_forcedFrame(POPT_EN_SOFTSCALE);
+}
+
+
+void emu_ResetGame(void)
+{
+ PicoReset();
+ reset_timing = 1;
+}
+
diff --git a/pandora/main.c b/pandora/main.c
index 8261446..55ece53 100644
--- a/pandora/main.c
+++ b/pandora/main.c
@@ -18,7 +18,6 @@
#include "../gp2x/version.h"
-extern char *ext_menu, *ext_state;
extern int select_exits;
extern char *PicoConfigFile;
int mmuhack_status = 0; // TODO rm
@@ -32,13 +31,7 @@ void parse_cmd_line(int argc, char *argv[])
{
if(argv[x][0] == '-')
{
- if(strcasecmp(argv[x], "-menu") == 0) {
- if(x+1 < argc) { ++x; ext_menu = argv[x]; } /* External Frontend: Program Name */
- }
- else if(strcasecmp(argv[x], "-state") == 0) {
- if(x+1 < argc) { ++x; ext_state = argv[x]; } /* External Frontend: Arguments */
- }
- else if(strcasecmp(argv[x], "-config") == 0) {
+ if(strcasecmp(argv[x], "-config") == 0) {
if(x+1 < argc) { ++x; PicoConfigFile = argv[x]; }
}
else if(strcasecmp(argv[x], "-selectexit") == 0) {
diff --git a/pandora/pandora.c b/pandora/pandora.c
index 3fc4690..1779725 100644
--- a/pandora/pandora.c
+++ b/pandora/pandora.c
@@ -1,24 +1,3 @@
-/**
- * All this is mostly based on rlyeh's minimal library.
- * Copied here to review all his code and understand what's going on.
-**/
-
-/*
-
- GP2X minimal library v0.A by rlyeh, (c) 2005. emulnation.info@rlyeh (swap it!)
-
- Thanks to Squidge, Robster, snaff, Reesy and NK, for the help & previous work! :-)
-
- License
- =======
-
- Free for non-commercial projects (it would be nice receiving a mail from you).
- Other cases, ask me first.
-
- GamePark Holdings is not allowed to use this library and/or use parts from it.
-
-*/
-
#include <stdio.h>
#include <stdlib.h>
@@ -37,177 +16,84 @@
#include "../gp2x/usbjoy.h"
#include "../common/arm_utils.h"
-volatile unsigned short *gp2x_memregs;
-//static
-volatile unsigned long *gp2x_memregl;
-static void *gp2x_screens[4];
-static int screensel = 0;
+static volatile unsigned int *memregs;
//static
int memdev = 0;
static int sounddev = -1, mixerdev = -1, touchdev = -1;
static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 };
+#define SCREEN_MAP_SIZE (((800*(480+11)*2)+0xfff)&~0xfff)
+static void *screen;
void *gp2x_screen;
-#define FRAMEBUFF_WHOLESIZE (0x30000*4) // 320*240*2 + some more
-#define FRAMEBUFF_ADDR0 (0x4000000-FRAMEBUFF_WHOLESIZE)
-#define FRAMEBUFF_ADDR1 (FRAMEBUFF_ADDR0+0x30000)
-#define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1+0x30000)
-#define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)
-
-static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };
-static int gp2x_screenaddrs_use[4];
-static unsigned short gp2x_screenaddr_old[4];
-
/* video stuff */
void gp2x_video_flip(void)
{
- unsigned short lsw = (unsigned short) gp2x_screenaddrs_use[screensel&3];
- unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&3] >> 16);
-
- gp2x_memregs[0x2910>>1] = msw;
- gp2x_memregs[0x2914>>1] = msw;
- gp2x_memregs[0x290E>>1] = lsw;
- gp2x_memregs[0x2912>>1] = lsw;
-
- // jump to other buffer:
- gp2x_screen = gp2x_screens[++screensel&3];
}
/* doulblebuffered flip */
void gp2x_video_flip2(void)
{
- unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);
-
- gp2x_memregs[0x2910>>1] = msw;
- gp2x_memregs[0x2914>>1] = msw;
- gp2x_memregs[0x290E>>1] = 0;
- gp2x_memregs[0x2912>>1] = 0;
-
- // jump to other buffer:
- gp2x_screen = gp2x_screens[++screensel&1];
}
void gp2x_video_changemode2(int bpp)
{
- gp2x_memregs[0x28DA>>1]=(((bpp+1)/8)<<9)|0xAB; /*8/15/16/24bpp...*/
- gp2x_memregs[0x290C>>1]=320*((bpp+1)/8); /*line width in bytes*/
}
void gp2x_video_changemode(int bpp)
{
- gp2x_video_changemode2(bpp);
-
- gp2x_memset_all_buffers(0, 0, 320*240*2);
- gp2x_video_flip();
}
void gp2x_video_setpalette(int *pal, int len)
{
- unsigned short *g=(unsigned short *)pal;
- volatile unsigned short *memreg = &gp2x_memregs[0x295A>>1];
- gp2x_memregs[0x2958>>1] = 0;
-
- len *= 2;
- while(len--) *memreg=*g++;
}
-// TV Compatible function //
void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
{
- float escalaw, escalah;
- int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3;
- unsigned short scalw;
-
- // set offset
- gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp;
- gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp;
- gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp;
- gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp;
-
- escalaw = 1024.0; // RGB Horiz LCD
- escalah = 320.0; // RGB Vert LCD
-
- if(gp2x_memregs[0x2800>>1]&0x100) //TV-Out
- {
- escalaw=489.0; // RGB Horiz TV (PAL, NTSC)
- if (gp2x_memregs[0x2818>>1] == 287) //PAL
- escalah=274.0; // RGB Vert TV PAL
- else if (gp2x_memregs[0x2818>>1] == 239) //NTSC
- escalah=331.0; // RGB Vert TV NTSC
- }
-
- // scale horizontal
- scalw = (unsigned short)((float)escalaw *(W/320.0));
- /* if there is no horizontal scaling, vertical doesn't work. Here is a nasty wrokaround... */
- if (H != 240 && W == 320) scalw--;
- gp2x_memregs[0x2906>>1]=scalw;
- // scale vertical
- gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0));
}
void gp2x_video_wait_vsync(void)
{
- unsigned short v = gp2x_memregs[0x1182>>1];
- while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10)) spend_cycles(1024);
}
void gp2x_video_flush_cache(void)
{
- // since we are using the mmu hack, we must flush the cache first
- // (the params are most likely wrong, but they seem to work somehow)
- //flushcache(addr, addr + 320*240*2, 0);
- flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
+// flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
}
void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
{
- char *dst;
- if (buffers & (1<<0)) { dst = (char *)gp2x_screens[0] + offset; if (dst != data) memcpy(dst, data, len); }
- if (buffers & (1<<1)) { dst = (char *)gp2x_screens[1] + offset; if (dst != data) memcpy(dst, data, len); }
- if (buffers & (1<<2)) { dst = (char *)gp2x_screens[2] + offset; if (dst != data) memcpy(dst, data, len); }
- if (buffers & (1<<3)) { dst = (char *)gp2x_screens[3] + offset; if (dst != data) memcpy(dst, data, len); }
}
void gp2x_memcpy_all_buffers(void *data, int offset, int len)
{
- gp2x_memcpy_buffers(0xf, data, offset, len);
}
void gp2x_memset_all_buffers(int offset, int byte, int len)
{
- memset((char *)gp2x_screens[0] + offset, byte, len);
- memset((char *)gp2x_screens[1] + offset, byte, len);
- memset((char *)gp2x_screens[2] + offset, byte, len);
- memset((char *)gp2x_screens[3] + offset, byte, len);
+ memset((char *)gp2x_screen + offset, byte, len);
}
void gp2x_pd_clone_buffer2(void)
{
- memcpy(gp2x_screen, gp2x_screens[2], 320*240*2);
}
unsigned long gp2x_joystick_read(int allow_usb_joy)
{
+ unsigned long value = 0;
int i;
- unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF); // GPIO M
- if(value==0xFD) value=0xFA;
- if(value==0xF7) value=0xEB;
- if(value==0xDF) value=0xAF;
- if(value==0x7F) value=0xBE;
- value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16)); // C D
if (allow_usb_joy && num_of_joys > 0) {
// check the usb joy as well..
@@ -252,10 +138,11 @@ int gp2x_touchpad_read(int *x, int *y)
}
-static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
+//static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
void gp2x_start_sound(int rate, int bits, int stereo)
{
+#if 0
int frag = 0, bsize, buffers;
// if no settings change, we don't need to do anything
@@ -282,72 +169,36 @@ void gp2x_start_sound(int rate, int bits, int stereo)
rate, bits, stereo?"stereo":"mono", frag>>16, 1<<(frag&0xffff));
s_oldrate = rate; s_oldbits = bits; s_oldstereo = stereo;
+#endif
}
void gp2x_sound_write(void *buff, int len)
{
- write(sounddev, buff, len);
+// write(sounddev, buff, len);
}
void gp2x_sound_sync(void)
{
- ioctl(sounddev, SOUND_PCM_SYNC, 0);
+// ioctl(sounddev, SOUND_PCM_SYNC, 0);
}
void gp2x_sound_volume(int l, int r)
{
+#if 0
l=l<0?0:l; l=l>255?255:l; r=r<0?0:r; r=r>255?255:r;
l<<=8; l|=r;
ioctl(mixerdev, SOUND_MIXER_WRITE_PCM, &l); /*SOUND_MIXER_WRITE_VOLUME*/
-}
-
-
-/* 940 */
-void Pause940(int yes)
-{
- if(yes)
- gp2x_memregs[0x0904>>1] &= 0xFFFE;
- else
- gp2x_memregs[0x0904>>1] |= 1;
-}
-
-
-void Reset940(int yes, int bank)
-{
- gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03);
-}
-
-static void proc_set(const char *path, const char *val)
-{
- FILE *f;
- char tmp[16];
-
- f = fopen(path, "w");
- if (f == NULL) {
- printf("failed to open: %s\n", path);
- return;
- }
-
- fprintf(f, "0\n");
- fclose(f);
-
- printf("\"%s\" is set to: ", path);
- f = fopen(path, "r");
- if (f == NULL) {
- printf("(open failed)\n");
- return;
- }
-
- fgets(tmp, sizeof(tmp), f);
- printf("%s", tmp);
- fclose(f);
+#endif
}
/* common */
void gp2x_init(void)
{
+// struct fb_fix_screeninfo fbfix;
+ int fbdev;
+
printf("entering init()\n"); fflush(stdout);
memdev = open("/dev/mem", O_RDWR);
@@ -357,38 +208,37 @@ void gp2x_init(void)
exit(1);
}
- gp2x_memregs = mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0xc0000000);
- printf("memregs are @ %p\n", gp2x_memregs);
- if(gp2x_memregs == MAP_FAILED)
+ memregs = mmap(0, 0x01000000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x48000000);
+ if (memregs == MAP_FAILED)
{
printf("mmap(memregs) failed with %i\n", errno);
exit(1);
}
- gp2x_memregl = (unsigned long *) gp2x_memregs;
- gp2x_memregs[0x2880>>1] &= ~0x383; // disable cursor, subpict, osd, video layers
-
- gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR0);
- if(gp2x_screens[0] == MAP_FAILED)
+ fbdev = open("/dev/fb0", O_RDWR);
+ if (fbdev == -1)
{
- printf("mmap(gp2x_screen) failed with %i\n", errno);
+ printf("open(\"/dev/fb0\") failed with %i\n", errno);
exit(1);
}
- printf("framebuffers point to %p\n", gp2x_screens[0]);
- gp2x_screens[1] = (char *) gp2x_screens[0]+0x30000;
- gp2x_screens[2] = (char *) gp2x_screens[1]+0x30000;
- gp2x_screens[3] = (char *) gp2x_screens[2]+0x30000;
-
- gp2x_screen = gp2x_screens[0];
- screensel = 0;
- gp2x_screenaddr_old[0] = gp2x_memregs[0x290E>>1];
- gp2x_screenaddr_old[1] = gp2x_memregs[0x2910>>1];
- gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1];
- gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1];
+/*
+ ret = ioctl(fbdev, FBIOGET_FSCREENINFO, &fbfix);
+ if (ret == -1)
+ {
+ printf("ioctl(fbdev) failed with %i\n", errno);
+ exit(1);
+ }
+*/
+ screen = mmap(0, SCREEN_MAP_SIZE, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev, 0);
+ if (screen == MAP_FAILED)
+ {
+ printf("mmap(fbptr) failed with %i\n", errno);
+ exit(1);
+ }
+ printf("fbptr %p\n", screen);
+ gp2x_screen = (char *)screen + 800*10*2-64;
- memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs));
- gp2x_memset_all_buffers(0, 0, 320*240*2);
// snd
mixerdev = open("/dev/mixer", O_RDWR);
@@ -410,49 +260,23 @@ void gp2x_init(void)
printf("found touchscreen/wm97xx\n");
}
- /* disable Linux read-ahead */
- proc_set("/proc/sys/vm/max-readahead", "0\n");
- proc_set("/proc/sys/vm/min-readahead", "0\n");
-
printf("exitting init()\n"); fflush(stdout);
}
-char *ext_menu = 0, *ext_state = 0;
-
void gp2x_deinit(void)
{
- Reset940(1, 3);
- Pause940(1);
-
- gp2x_video_changemode(15);
- gp2x_memregs[0x290E>>1] = gp2x_screenaddr_old[0];
- gp2x_memregs[0x2910>>1] = gp2x_screenaddr_old[1];
- gp2x_memregs[0x2912>>1] = gp2x_screenaddr_old[2];
- gp2x_memregs[0x2914>>1] = gp2x_screenaddr_old[3];
+ //gp2x_video_changemode(15);
- munmap(gp2x_screens[0], FRAMEBUFF_WHOLESIZE);
- munmap((void *)gp2x_memregs, 0x10000);
+ munmap(screen, SCREEN_MAP_SIZE);
+ munmap((void *)memregs, 0x10000);
close(memdev);
- close(mixerdev);
+ if (mixerdev >= 0) close(mixerdev);
if (sounddev >= 0) close(sounddev);
if (touchdev >= 0) close(touchdev);
gp2x_usbjoy_deinit();
- printf("all done, running ");
-
- // Zaq121's alternative frontend support from MAME
- if(ext_menu && ext_state) {
- printf("%s -state %s\n", ext_menu, ext_state);
- execl(ext_menu, ext_menu, "-state", ext_state, NULL);
- } else if(ext_menu) {
- printf("%s\n", ext_menu);
- execl(ext_menu, ext_menu, NULL);
- } else {
- printf("gp2xmenu\n");
- chdir("/usr/gp2x");
- execl("gp2xmenu", "gp2xmenu", NULL);
- }
+ printf("all done");
}
/* lprintf */
@@ -474,4 +298,6 @@ void set_gamma(int g100, int A_SNs_curve) {}
void set_FCLK(unsigned MHZ) {}
void set_LCD_custom_rate(int rate) {}
void unset_LCD_custom_rate(void) {}
+void Pause940(int yes) {}
+void Reset940(int yes, int bank) {}
--
2.39.5