-// (c) Copyright 2006-2007 notaz, All rights reserved.\r
+// (c) Copyright 2006-2008 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
#include <stdarg.h>\r
\r
#include "../gp2x/emu.h"\r
-#include "../gp2x/usbjoy.h"\r
#include "../gp2x/menu.h"\r
#include "../common/arm_utils.h"\r
#include "../common/fonts.h"\r
#include "../common/emu.h"\r
#include "../common/config.h"\r
#include "../common/common.h"\r
+#include "../linux/usbjoy.h"\r
+#include "../linux/sndout_oss.h"\r
+#include "asm_utils.h"\r
\r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/sound/mix.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/sound/mix.h>\r
#include <zlib/zlib.h>\r
\r
//#define PFRAMES\r
+#define BENCHMARK\r
+//#define USE_320_SCREEN 1\r
\r
#ifdef BENCHMARK\r
#define OSD_FPS_X (800-200)\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing\r
static int osd_fps_x;\r
-char noticeMsg[64]; // notice msg to draw\r
unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer\r
int reset_timing = 0;\r
\r
gettimeofday(¬iceMsgTime, 0);\r
}\r
\r
-void emu_getMainDir(char *dst, int len)\r
+int emu_getMainDir(char *dst, int len)\r
{\r
extern char **g_argv;\r
int j;\r
dst[len] = 0;\r
for (j = strlen(dst); j > 0; j--)\r
if (dst[j] == '/') { dst[j+1] = 0; break; }\r
+\r
+ return j + 1;\r
}\r
\r
void emu_Init(void)\r
}\r
\r
\r
-static void scaling_update(void)\r
-{\r
- PicoOpt &= ~0x4100;\r
- switch (currentConfig.scaling) {\r
- default: break; // off\r
- case 1: // hw hor\r
- case 2: PicoOpt |= 0x0100; break; // hw hor+vert\r
- case 3: PicoOpt |= 0x4000; break; // sw hor\r
- }\r
-}\r
-\r
-\r
void emu_Deinit(void)\r
{\r
// save SRAM\r
void emu_prepareDefaultConfig(void)\r
{\r
memset(&defaultConfig, 0, sizeof(defaultConfig));\r
- defaultConfig.EmuOpt = 0x9f | 0x00700; // | <- ram_tmng, confirm_save, cd_leds\r
- 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;\r
+ defaultConfig.EmuOpt = 0x8f | 0x00600; // | <- confirm_save, cd_leds\r
+ defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC;\r
+ defaultConfig.s_PicoOpt |= POPT_ACC_SPRITES|POPT_EN_MCD_GFX;\r
+// defaultConfig.s_PicoOpt &= ~POPT_EN_SVP_DRC; // crashes :(\r
+ defaultConfig.EmuOpt &= ~8; // no save gzip\r
defaultConfig.s_PsndRate = 44100;\r
- defaultConfig.s_PicoRegion = 0; // auto\r
+ defaultConfig.s_PicoRegion = 0;\r
defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP\r
defaultConfig.s_PicoCDBuffers = 0;\r
- defaultConfig.Frameskip = 0; // auto\r
+ defaultConfig.Frameskip = 0;\r
defaultConfig.CPUclock = 200;\r
defaultConfig.volume = 50;\r
defaultConfig.scaling = 0;\r
defaultConfig.turbo_rate = 15;\r
}\r
\r
-void emu_setDefaultConfig(void)\r
-{\r
- memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));\r
- PicoOpt = currentConfig.s_PicoOpt;\r
- PsndRate = currentConfig.s_PsndRate;\r
- PicoRegionOverride = currentConfig.s_PicoRegion;\r
- PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
- PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
-}\r
-\r
static void textOut16(int x, int y, const char *text)\r
{\r
int i,l,len=strlen(text);\r
\r
for (i = 0; i < len; i++)\r
{\r
- for (l=0;l<16;l+=2)\r
+ for (l=0;l<16;)\r
{\r
unsigned char fd = fontdata8x8[((text[i])*8)+l/2];\r
- int u = l+1;\r
- if(fd&0x80) screen[l*SCREEN_WIDTH/2+0]=screen[u*SCREEN_WIDTH/2+0]=0xffffffff;\r
- if(fd&0x40) screen[l*SCREEN_WIDTH/2+1]=screen[u*SCREEN_WIDTH/2+1]=0xffffffff;\r
- if(fd&0x20) screen[l*SCREEN_WIDTH/2+2]=screen[u*SCREEN_WIDTH/2+2]=0xffffffff;\r
- if(fd&0x10) screen[l*SCREEN_WIDTH/2+3]=screen[u*SCREEN_WIDTH/2+3]=0xffffffff;\r
- if(fd&0x08) screen[l*SCREEN_WIDTH/2+4]=screen[u*SCREEN_WIDTH/2+4]=0xffffffff;\r
- if(fd&0x04) screen[l*SCREEN_WIDTH/2+5]=screen[u*SCREEN_WIDTH/2+5]=0xffffffff;\r
- if(fd&0x02) screen[l*SCREEN_WIDTH/2+6]=screen[u*SCREEN_WIDTH/2+6]=0xffffffff;\r
- if(fd&0x01) screen[l*SCREEN_WIDTH/2+7]=screen[u*SCREEN_WIDTH/2+7]=0xffffffff;\r
+ unsigned int *d = &screen[l*SCREEN_WIDTH/2];\r
+ if (fd&0x80) d[0]=0xffffffff;\r
+ if (fd&0x40) d[1]=0xffffffff;\r
+ if (fd&0x20) d[2]=0xffffffff;\r
+ if (fd&0x10) d[3]=0xffffffff;\r
+ if (fd&0x08) d[4]=0xffffffff;\r
+ if (fd&0x04) d[5]=0xffffffff;\r
+ if (fd&0x02) d[6]=0xffffffff;\r
+ if (fd&0x01) d[7]=0xffffffff;\r
+ l++; d = &screen[l*SCREEN_WIDTH/2];\r
+ if (fd&0x80) d[0]=0xffffffff;\r
+ if (fd&0x40) d[1]=0xffffffff;\r
+ if (fd&0x20) d[2]=0xffffffff;\r
+ if (fd&0x10) d[3]=0xffffffff;\r
+ if (fd&0x08) d[4]=0xffffffff;\r
+ if (fd&0x04) d[5]=0xffffffff;\r
+ if (fd&0x02) d[6]=0xffffffff;\r
+ if (fd&0x01) d[7]=0xffffffff;\r
+ l++;\r
}\r
screen += 8;\r
}\r
len++;\r
for (h = 0; h < 16; h++) {\r
p = (int *) ((unsigned short *) gp2x_screen+x+SCREEN_WIDTH*(y+h));\r
- for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;\r
+ for (i = len; i; i--, p++) *p = 0;//(*p>>2)&0x39e7;\r
}\r
textOut16(x, y, text);\r
}\r
p[640] ^= 0xffff;\r
}\r
\r
+#ifdef USE_320_SCREEN\r
+\r
+static int EmuScanBegin16(unsigned int num)\r
+{\r
+ if (!(Pico.video.reg[1]&8)) num += 8;\r
+ DrawLineDest = (unsigned short *)gp2x_screen + num*800 + 800/2 - 320/2;\r
+ //int w = (Pico.video.reg[12]&1) ? 320 : 256;\r
+ //DrawLineDest = (unsigned short *)gp2x_screen + num*w;\r
+\r
+ return 0;\r
+}\r
+\r
+#else // USE_320_SCREEN\r
+\r
static int EmuScanEnd16(unsigned int num)\r
{\r
unsigned char *ps=HighCol+8;\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- pd+=32;\r
+ pd += 32*2;\r
len = 256;\r
}\r
\r
- if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
- mask=0x3f; // accurate sprites, upper bits are priority stuff\r
-\r
+ if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
+ mask=0x3f; // messed sprites, upper bits are priority stuff\r
\r
+#if 1\r
+ clut_line(pd, ps, pal, (mask<<16) | len);\r
+#else\r
for (; len > 0; len--)\r
{\r
unsigned int p = pal[*ps++ & mask];\r
*(unsigned int *)(&pd[800]) = p;\r
pd += 2;\r
}\r
+#endif\r
\r
return 0;\r
}\r
\r
+#endif // USE_320_SCREEN\r
+\r
static int EmuScanBegin8(unsigned int num)\r
{\r
if (!(Pico.video.reg[1]&8)) num += 8;\r
// 8bit accurate renderer\r
if (Pico.m.dirtyPal)\r
{\r
- int pallen = 0x40;\r
+ int pallen = 0xc0;\r
Pico.m.dirtyPal = 0;\r
if (Pico.video.reg[0xC]&8) // shadow/hilight mode\r
{\r
memcpy32(localPal+0xc0, localPal+0x40, 0x40);\r
pallen = 0x100;\r
}\r
- else if (rendstatus & PDRAW_ACC_SPRITES) {\r
- vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
- memcpy32(localPal+0x40, localPal, 0x40);\r
- memcpy32(localPal+0x80, localPal, 0x40);\r
- memcpy32(localPal+0xc0, localPal, 0x40);\r
- pallen = 0x100;\r
- }\r
else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);\r
}\r
else {\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
+ memcpy32(localPal+0x80, localPal, 0x40);\r
}\r
if (pallen > 0xc0) {\r
localPal[0xc0] = 0x0000c000;\r
if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) h -= 16;\r
if (notice) osd_text(4, h, notice);\r
if (emu_opt & 2)\r
- osd_text(osd_fps_x+24*2, h-8, fps);\r
+ osd_text(osd_fps_x, h, fps);\r
}\r
if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))\r
draw_cd_leds();\r
gp2x_video_changemode(8);\r
} else if (currentConfig.EmuOpt&0x80) {\r
gp2x_video_changemode(16);\r
+#ifdef USE_320_SCREEN\r
+ PicoDrawSetColorFormat(1);\r
+ PicoScanBegin = EmuScanBegin16;\r
+#else\r
PicoDrawSetColorFormat(-1);\r
PicoScanEnd = EmuScanEnd16;\r
+#endif\r
} else {\r
gp2x_video_changemode(8);\r
PicoDrawSetColorFormat(2);\r
if (vol > 0) vol--;\r
}\r
wait_frames = 0;\r
- gp2x_sound_volume(vol, vol);\r
+ sndout_oss_setvol(vol, vol);\r
currentConfig.volume = vol;\r
}\r
sprintf(noticeMsg, "VOL: %02i", vol);\r
// add joy inputs\r
if (num_of_joys > 0)\r
{\r
- gp2x_usbjoy_update();\r
+ usbjoy_update();\r
for (joy = 0; joy < num_of_joys; joy++) {\r
- int btns = gp2x_usbjoy_check2(joy);\r
+ int btns = usbjoy_check2(joy);\r
for (i = 0; i < 32; i++) {\r
if (btns & (1 << i)) {\r
int acts = currentConfig.JoyBinds[joy][i];\r
\r
/* avoid writing audio when lagging behind to prevent audio lag */\r
if (PicoSkipFrame != 2)\r
- gp2x_sound_write(PsndOut, len<<1);\r
+ sndout_oss_write(PsndOut, len<<1);\r
}\r
\r
\r
currentConfig.EmuOpt |= 0x80;\r
\r
//vidResetMode();\r
+#ifdef USE_320_SCREEN\r
+ PicoDrawSetColorFormat(1);\r
+ PicoScanBegin = EmuScanBegin16;\r
+#else\r
PicoDrawSetColorFormat(-1);\r
PicoScanEnd = EmuScanEnd16;\r
+#endif\r
Pico.m.dirtyPal = 1;\r
PicoFrameDrawOnly();\r
\r
currentConfig.EmuOpt = eo_old;\r
}\r
\r
+void emu_platformDebugCat(char *str)\r
+{\r
+ // nothing\r
+}\r
+\r
static void simpleWait(int thissec, int lim_time)\r
{\r
struct timeval tval;\r
\r
// make sure we are in correct mode\r
vidResetMode();\r
- scaling_update();\r
Pico.m.dirtyPal = 1;\r
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
emu_findKeyBindCombos();\r
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\r
- gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);\r
- gp2x_sound_volume(currentConfig.volume, currentConfig.volume);\r
+ sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);\r
+ sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
PicoWriteSound = updateSound;\r
update_volume(0, 0);\r
memset(sndBuffer, 0, sizeof(sndBuffer));\r
{\r
#ifdef BENCHMARK\r
static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];\r
- if (++bench == 10) {\r
+ if (++bench == 4) {\r
bench = 0;\r
- bench_fps_s = bench_fps;\r
- bf[bfp++ & 3] = bench_fps;\r
+ bench_fps_s = bench_fps / 4;\r
+ bf[bfp++ & 3] = bench_fps / 4;\r
bench_fps = 0;\r
}\r
bench_fps += frames_shown;\r
- sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
+ sprintf(fpsbuff, "%3i/%3i/%3i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
+ printf("%s\n", fpsbuff);\r
#else\r
if (currentConfig.EmuOpt & 2) {\r
- //sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
- sprintf(fpsbuff, "%4i", frames_shown);\r
+ sprintf(fpsbuff, "%3i/%3i", frames_shown, frames_done);\r
if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
}\r
#endif\r
\r
if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection\r
reset_timing = 1;\r
-/* else if (PsndOut != NULL || currentConfig.Frameskip < 0)\r
+#if 1\r
+ else if (PsndOut != NULL || currentConfig.Frameskip < 0)\r
{\r
// sleep or vsync if we are still too fast\r
// usleep sleeps for ~20ms minimum, so it is not a solution here\r
}\r
}\r
}\r
-*/\r
+#endif\r
blit(fpsbuff, notice);\r
\r
pframes_done++; pframes_shown++;\r
notaz.gp2x.de / libpicofe.git / blobdiff