\r
#include "plat_gp2x.h"\r
#include "soc.h"\r
+#include "soc_pollux.h"\r
#include "../common/plat.h"\r
#include "../common/menu.h"\r
#include "../common/arm_utils.h"\r
extern int crashed_940;\r
\r
static short __attribute__((aligned(4))) sndBuffer[2*(44100+100)/50];\r
-static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];\r
-unsigned char *PicoDraw2FB = PicoDraw2FB_;\r
static int osd_fps_x, osd_y, doing_bg_frame;\r
const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };\r
soc = soc_detect();\r
if (soc == SOCID_MMSP2)\r
defaultConfig.s_PicoOpt |= POPT_EXT_FM;\r
- else if (soc == SOCID_POLLUX)\r
+ else if (soc == SOCID_POLLUX) {\r
defaultConfig.EmuOpt |= EOPT_WIZ_TEAR_FIX|EOPT_SHOW_RTC;\r
+ defaultConfig.s_PicoOpt |= POPT_EN_MCD_GFX;\r
+ }\r
}\r
\r
void pemu_validate_config(void)\r
// Wiz 16bit is an exception, uses line rendering due to rotation mess\r
if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {\r
PicoDrawSetOutFormat(PDF_RGB555, 1);\r
- PicoDraw32xSetFrameMode(0, 0);\r
}\r
else {\r
PicoDrawSetOutFormat(PDF_NONE, 0);\r
- PicoDraw32xSetFrameMode(1, 0);\r
}\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
gp2x_mode = 16;\r
}\r
}\r
\r
-static void updateSound(int len)\r
+static void oss_write_nonblocking(int len)\r
{\r
- len <<= 1;\r
- if (PicoOpt & POPT_EN_STEREO)\r
- len <<= 1;\r
-\r
+ // sndout_oss_can_write() is not reliable, only use with no_frmlimit\r
if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))\r
return;\r
\r
- /* avoid writing audio when lagging behind to prevent audio lag */\r
- if (PicoSkipFrame != 2)\r
- sndout_oss_write(PsndOut, len);\r
+ sndout_oss_write_nb(PsndOut, len);\r
}\r
\r
void pemu_sound_start(void)\r
if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
{\r
int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
- int target_fps = Pico.m.pal ? 50 : 60;\r
- int frame_samples, snd_excess_add;\r
int snd_rate_oss = PsndRate;\r
gp2x_soc_t soc;\r
\r
+ memset(sndBuffer, 0, sizeof(sndBuffer));\r
+ PsndOut = sndBuffer;\r
+ PicoWriteSound = oss_write_nonblocking;\r
+ plat_update_volume(0, 0);\r
+\r
+ printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\r
+ PsndRate, PsndLen, is_stereo, Pico.m.pal);\r
+ sndout_oss_start(snd_rate_oss, is_stereo, 1);\r
+ sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
+\r
soc = soc_detect();\r
- if (soc == SOCID_POLLUX) {\r
- /* POLLUX pain: DPLL1 / mclk_div / bitclk_div / 4 */\r
- switch (PsndRate) {\r
- case 44100: PsndRate = 44171; break; // 44170.673077\r
- case 22050: PsndRate = 22086; break; // 22085.336538\r
- case 11025: PsndRate = 11043; break; // 11042.668269\r
- default: break;\r
- }\r
- }\r
+ if (soc == SOCID_POLLUX)\r
+ PsndRate = pollux_get_real_snd_rate(PsndRate);\r
\r
#define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)\r
if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||\r
PsndRerate(Pico.m.frame_count ? 1 : 0);\r
}\r
\r
- memset(sndBuffer, 0, sizeof(sndBuffer));\r
- PsndOut = sndBuffer;\r
- PicoWriteSound = updateSound;\r
PsndRate_old = PsndRate;\r
PicoOpt_old = PicoOpt;\r
pal_old = Pico.m.pal;\r
- plat_update_volume(0, 0);\r
-\r
- frame_samples = PsndLen;\r
- snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;\r
- if (snd_excess_add != 0)\r
- frame_samples++;\r
- if (soc == SOCID_POLLUX)\r
- frame_samples *= 2; /* force larger buffer */\r
-\r
- printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
- PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);\r
- sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
- sndout_oss_start(snd_rate_oss, frame_samples, is_stereo);\r
-\r
- /* Wiz's sound hardware needs more prebuffer */\r
- if (soc == SOCID_POLLUX)\r
- updateSound(frame_samples);\r
}\r
}\r
\r
+static const int sound_rates[] = { 44100, 32000, 22050, 16000, 11025, 8000 };\r
+\r
void pemu_sound_stop(void)\r
{\r
- /* get back from Wiz pain */\r
- switch (PsndRate) {\r
- case 44171: PsndRate = 44100; break;\r
- case 22086: PsndRate = 22050; break;\r
- case 11043: PsndRate = 11025; break;\r
- default: break;\r
+ int i;\r
+\r
+ /* get back from Pollux pain */\r
+ PsndRate += 1000;\r
+ for (i = 0; i < ARRAY_SIZE(sound_rates); i++) {\r
+ if (PsndRate >= sound_rates[i]) {\r
+ PsndRate = sound_rates[i];\r
+ break;\r
+ }\r
}\r
}\r
\r
\r
void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
- int po_old = PicoOpt;\r
-\r
doing_bg_frame = 1;\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
- PicoOpt |= POPT_ACC_SPRITES;\r
- if (!no_scale)\r
- PicoOpt |= POPT_EN_SOFTSCALE;\r
-\r
- memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
-\r
- PicoDrawSetOutFormat(PDF_RGB555, 1);\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- PicoDraw32xSetFrameMode(0, 0);\r
PicoDrawSetCallbacks(NULL, NULL);\r
Pico.m.dirtyPal = 1;\r
\r
- if (do_emu)\r
- PicoFrame();\r
- else\r
- PicoFrameDrawOnly();\r
+ emu_cmn_forced_frame(no_scale, do_emu);\r
\r
g_menubg_src_ptr = g_screen_ptr;\r
doing_bg_frame = 0;\r
- PicoOpt = po_old;\r
}\r
\r
void plat_debug_cat(char *str)\r
pemu_forced_frame(0, 1);\r
}\r
\r
-const char *plat_get_credits(void)\r
-{\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
- "\n"\r
- "special thanks (for docs, ideas):\n"\r
- " Charles MacDonald, Haze,\n"\r
- " Stephane Dallongeville,\n"\r
- " Lordus, Exophase, Rokas,\n"\r
- " Nemesis, Tasco Deluxe";\r
-}\r