\r
#include <pico/pico_int.h>\r
\r
-//#define USE_320_SCREEN 1\r
-\r
\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
static unsigned char temp_frame[g_screen_width * g_screen_height * 2];\r
unsigned char *PicoDraw2FB = temp_frame;\r
-char cpu_clk_name[] = "unused";\r
+const char *renderer_names[] = { NULL };\r
+const char *renderer_names32x[] = { NULL };\r
+char cpu_clk_name[] = "Max CPU clock";\r
+\r
+enum {\r
+ SCALE_1x1,\r
+ SCALE_2x2_3x2,\r
+ SCALE_2x2_2x2,\r
+};\r
\r
+static int get_cpu_clock(void)\r
+{\r
+ FILE *f;\r
+ int ret = 0;\r
+ f = fopen("/proc/pandora/cpu_mhz_max", "r");\r
+ if (f) {\r
+ fscanf(f, "%d", &ret);\r
+ fclose(f);\r
+ }\r
+ return ret;\r
+}\r
\r
void pemu_prep_defconfig(void)\r
{\r
g_menubg_ptr = temp_frame;\r
\r
defaultConfig.EmuOpt |= EOPT_VSYNC;\r
+ defaultConfig.scaling = SCALE_2x2_3x2;\r
}\r
\r
void pemu_validate_config(void)\r
{\r
+ currentConfig.CPUclock = get_cpu_clock();\r
}\r
\r
// FIXME: cleanup\r
{\r
int len = strlen(text)*8;\r
\r
- if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+ if (0) {\r
int *p, i, h;\r
x &= ~3; // align x\r
len = (len+3) >> 2;\r
// if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change // mmu hack problems?\r
old_reg = Pico_mcd->s68k_regs[0];\r
\r
- if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+ if (0) {\r
// 8-bit modes\r
unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
}\r
}\r
\r
-#ifdef USE_320_SCREEN\r
-\r
-static int EmuScanBegin16(unsigned int num)\r
+static int emuscan_1x1(unsigned int num)\r
{\r
DrawLineDest = (unsigned short *)g_screen_ptr + num*800 + 800/2 - 320/2;\r
//int w = (Pico.video.reg[12]&1) ? 320 : 256;\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
- unsigned short *pd;\r
- unsigned short *pal=HighPal;\r
- int sh = Pico.video.reg[0xC]&8;\r
- int len, mask = 0xff;\r
-\r
- pd=(unsigned short *)g_screen_ptr + num*800*2 + 800/2 - 320*2/2;\r
-\r
- if (Pico.m.dirtyPal)\r
- PicoDoHighPal555(sh);\r
-\r
- if (Pico.video.reg[12]&1) {\r
- len = 320;\r
- } else {\r
- pd += 32*2;\r
- len = 256;\r
- }\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
- p |= p << 16;\r
- *(unsigned int *)pd = p;\r
- *(unsigned int *)(&pd[800]) = p;\r
- pd += 2;\r
- }\r
-#endif\r
-\r
- return 0;\r
+#define MAKE_EMUSCAN(name_, clut_name_, offs_, len_) \\r
+static int name_(unsigned int num) \\r
+{ \\r
+ unsigned char *ps = HighCol+8; \\r
+ unsigned short *pd, *pal = HighPal; \\r
+ int sh = Pico.video.reg[0xC] & 8; \\r
+ int mask = 0xff; \\r
+ \\r
+ pd = (unsigned short *)g_screen_ptr + num*800*2 + offs_;\\r
+ \\r
+ if (Pico.m.dirtyPal) \\r
+ PicoDoHighPal555(sh); \\r
+ \\r
+ if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI)) \\r
+ mask = 0x3f; /* upper bits are priority stuff */\\r
+ \\r
+ clut_line##clut_name_(pd, ps, pal, (mask<<16) | len_); \\r
+ \\r
+ return 0; \\r
}\r
\r
+MAKE_EMUSCAN(emuscan_2x2_40, 2x2, 800/2 - 320*2/2, 320)\r
+MAKE_EMUSCAN(emuscan_2x2_32, 2x2, 800/2 - 256*2/2, 256)\r
+MAKE_EMUSCAN(emuscan_3x2_32, 3x2, 800/2 - 256*3/2, 256)\r
+\r
+#if 0 /* FIXME */\r
static int EmuScanEnd16_32x(unsigned int num)\r
{\r
unsigned int *ps;\r
\r
return 0;\r
}\r
-#endif // USE_320_SCREEN\r
+#endif\r
\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
draw_cd_leds();\r
}\r
\r
-void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu)\r
+void plat_video_toggle_renderer(int change, int is_menu)\r
{\r
// this will auto-select SMS/32X renderers\r
- PicoDrawSetColorFormat(1);\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
}\r
\r
void plat_video_menu_enter(int is_rom_loaded)\r
void pemu_forced_frame(int opts)\r
{\r
int po_old = PicoOpt;\r
- int eo_old = currentConfig.EmuOpt;\r
\r
PicoOpt &= ~0x10;\r
PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
- currentConfig.EmuOpt |= 0x80;\r
\r
Pico.m.dirtyPal = 1;\r
PicoFrameDrawOnly();\r
\r
PicoOpt = po_old;\r
- currentConfig.EmuOpt = eo_old;\r
}\r
\r
static void updateSound(int len)\r
for (i = 0; i < fbdev_buffer_count; i++)\r
memset32(fbdev_buffers[i], 0, g_screen_width * g_screen_height * 2 / 4);\r
\r
-#ifdef USE_320_SCREEN\r
- PicoDrawSetColorFormat(1);\r
- PicoScanBegin = EmuScanBegin16;\r
-#else\r
+ PicoScanBegin = NULL;\r
+ PicoScanEnd = NULL;\r
+\r
+#if 0\r
if (PicoAHW & PAHW_32X) {\r
+ /* FIXME */\r
DrawLineDest = (unsigned short *)temp_frame;\r
- PicoDrawSetColorFormat(1);\r
- PicoScanBegin = NULL;\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
PicoScanEnd = EmuScanEnd16_32x;\r
- } else {\r
- PicoDrawSetColorFormat(-1);\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = EmuScanEnd16;\r
- }\r
+ } else\r
#endif\r
+ {\r
+ switch (currentConfig.scaling) {\r
+ case SCALE_1x1:\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ PicoScanBegin = emuscan_1x1;\r
+ break;\r
+ case SCALE_2x2_3x2:\r
+ PicoDrawSetOutFormat(PDF_NONE, 0);\r
+ PicoScanEnd = is_32cols ? emuscan_3x2_32 : emuscan_2x2_40;\r
+ break;\r
+ case SCALE_2x2_2x2:\r
+ PicoDrawSetOutFormat(PDF_NONE, 0);\r
+ PicoScanEnd = is_32cols ? emuscan_2x2_32 : emuscan_2x2_40;\r
+ break;\r
+ }\r
+ }\r
}\r
\r
void pemu_loop_prep(void)\r
{\r
emu_video_mode_change(0, 0, 0);\r
+ \r
+ if (currentConfig.CPUclock != get_cpu_clock()) {\r
+ FILE *f = fopen("/proc/pandora/cpu_mhz_max", "w");\r
+ if (f != NULL) {\r
+ fprintf(f, "%d\n", currentConfig.CPUclock);\r
+ fclose(f);\r
+ }\r
+ }\r
+\r
pemu_sound_start();\r
}\r
\r
PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
currentConfig.EmuOpt |= EOPT_16BPP;\r
\r
- PicoDrawSetColorFormat(1);\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
Pico.m.dirtyPal = 1;\r
PicoFrame();\r
\r
\r
now = plat_get_ticks_us();\r
\r
- // XXX: need to check NOHZ and djw kernel\r
+ // XXX: need to check NOHZ\r
diff = (signed int)(us_to - now);\r
if (diff > 10000) {\r
//printf("sleep %d\n", us_to - now);\r
\r
const char *plat_get_credits(void)\r
{\r
- return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n"\r
+ return "PicoDrive v" VERSION " (c) notaz, 2006-2010\n\n\n"\r
"Credits:\n"\r
"fDave: Cyclone 68000 core,\n"\r
" base code of PicoDrive\n"\r
"Reesy & FluBBa: DrZ80 core\n"\r
"MAME devs: YM2612 and SN76496 cores\n"\r
- "rlyeh and others: minimal SDK\n"\r
- "Squidge: mmuhack\n"\r
- "Dzz: ARM940 sample\n"\r
- "GnoStiC / Puck2099: USB joy code\n"\r
- "craigix: GP2X hardware\n"\r
- "ketchupgun: skin design\n"\r
+ "Pandora team: Pandora\n"\r
+ "Inder: menu bg\n"\r
"\n"\r
"special thanks (for docs, ideas):\n"\r
" Charles MacDonald, Haze,\n"\r
notaz.gp2x.de / libpicofe.git / blobdiff