\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
#include "../common/fonts.h"\r
#include "../common/emu.h"\r
#include "../common/config.h"\r
+#include "../common/input.h"\r
#include "../linux/sndout_oss.h"\r
#include "version.h"\r
\r
\r
defaultConfig.CPUclock = default_cpu_clock;\r
defaultConfig.renderer32x = RT_8BIT_FAST;\r
+ defaultConfig.analog_deadzone = 50;\r
\r
soc = soc_detect();\r
if (soc == SOCID_MMSP2)\r
}\r
else {\r
PicoDrawSetOutFormat(PDF_NONE, 0);\r
- PicoDraw32xSetFrameMode(1, (renderer == RT_16BIT) ? 1 : 0);\r
+ PicoDraw32xSetFrameMode(1, 0);\r
}\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ gp2x_mode = 16;\r
}\r
\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
else\r
osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
- gp2x_mode = -gp2x_mode;\r
-\r
gp2x_video_wait_vsync();\r
- gp2x_video_changemode(gp2x_mode);\r
-\r
if (!is_16bit_mode()) {\r
// setup pal for 8-bit modes\r
localPal[0xc0] = 0x0000c000; // MCD LEDs\r
else\r
gp2x_memset_all_buffers(0, 0, 320*240*2);\r
\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
+ gp2x_mode = -gp2x_mode;\r
+\r
+ gp2x_video_changemode(gp2x_mode);\r
+\r
Pico.m.dirtyPal = 1;\r
\r
PicoOpt &= ~POPT_EN_SOFTSCALE;\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
// don't need to do anything, writes will block by themselves\r
}\r
\r
-void pemu_forced_frame(int opts, int no_scale)\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 |= opts|POPT_ACC_SPRITES;\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 (no_scale == -9)\r
- // yes I'm lazy, see pemu_forced_frame call below\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
unset_lcd_custom_rate();\r
}\r
\r
+ if (gp2x_dev_id == GP2X_DEV_CAANOO)\r
+ in_set_config_int(in_name_to_id("evdev:pollux-analog"), IN_CFG_ABS_DEAD_ZONE,\r
+ currentConfig.analog_deadzone);\r
+\r
if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_MMUHACK)\r
gp2x_make_fb_bufferable(currentConfig.EmuOpt & EOPT_MMUHACK);\r
\r
pemu_sound_stop();\r
\r
/* do one more frame for menu bg */\r
- pemu_forced_frame(POPT_EN_SOFTSCALE, -9);\r
- g_menubg_src_ptr = g_screen_ptr;\r
+ pemu_forced_frame(0, 1);\r
}\r
\r
const char *plat_get_credits(void)\r