* - 8bpp tile renderer\r
* In 32x mode:\r
* - 32x layer is overlayed on top of 16bpp one\r
- * - line internal one done on PicoDraw2FB, then mixed with 32x\r
- * - tile internal one done on PicoDraw2FB, then mixed with 32x\r
+ * - line internal one done on .Draw2FB, then mixed with 32x\r
+ * - tile internal one done on .Draw2FB, then mixed with 32x\r
*/\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
#include <unistd.h>\r
\r
-#include "plat_gp2x.h"\r
-#include "soc.h"\r
-#include "../common/plat.h"\r
-#include "../common/menu.h"\r
+#include "../libpicofe/gp2x/plat_gp2x.h"\r
+#include "../libpicofe/gp2x/soc.h"\r
+#include "../libpicofe/input.h"\r
+#include "../libpicofe/plat.h"\r
+#include "../libpicofe/gp2x/soc_pollux.h"\r
+#include "../common/menu_pico.h"\r
#include "../common/arm_utils.h"\r
-#include "../common/fonts.h"\r
#include "../common/emu.h"\r
-#include "../common/config.h"\r
-#include "../linux/sndout_oss.h"\r
-#include "version.h"\r
+#include "../common/config_file.h"\r
+#include "../common/version.h"\r
+#include "plat.h"\r
\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
#include <pico/sound/mix.h>\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
\r
#ifdef BENCHMARK\r
#define OSD_FPS_X 220\r
#endif\r
\r
\r
-extern int crashed_940;\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;\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
enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
\r
-extern void *gp2x_screens[4];\r
-\r
-\r
-static void scaling_update(void)\r
-{\r
- PicoOpt &= ~(POPT_DIS_32C_BORDER|POPT_EN_SOFTSCALE);\r
- switch (currentConfig.scaling) {\r
- default:break;\r
- case EOPT_SCALE_HW_H:\r
- case EOPT_SCALE_HW_HV:\r
- PicoOpt |= POPT_DIS_32C_BORDER;\r
- break;\r
- case EOPT_SCALE_SW_H:\r
- PicoOpt |= POPT_EN_SOFTSCALE;\r
- break;\r
- }\r
-}\r
+static int (*emu_scan_begin)(unsigned int num) = NULL;\r
+static int (*emu_scan_end)(unsigned int num) = NULL;\r
\r
\r
void pemu_prep_defconfig(void)\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
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
{\r
- gp2x_soc_t soc;\r
-\r
- soc = soc_detect();\r
- if (soc != SOCID_MMSP2)\r
- PicoOpt &= ~POPT_EXT_FM;\r
- if (soc != SOCID_POLLUX)\r
+ if (gp2x_dev_id != GP2X_DEV_GP2X)\r
+ PicoIn.opt &= ~POPT_EXT_FM;\r
+ if (gp2x_dev_id != GP2X_DEV_WIZ)\r
currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;\r
\r
if (currentConfig.gamma < 10 || currentConfig.gamma > 300)\r
\r
static int get_renderer(void)\r
{\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
return currentConfig.renderer32x;\r
else\r
return currentConfig.renderer;\r
static void change_renderer(int diff)\r
{\r
int *r;\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
r = ¤tConfig.renderer32x;\r
else\r
r = ¤tConfig.renderer;\r
*r += diff;\r
+\r
+ // 8bpp fast is not there (yet?)\r
+ if ((PicoIn.AHW & PAHW_SMS) && *r == RT_8BIT_FAST)\r
+ (*r)++;\r
+\r
if (*r >= RT_COUNT)\r
*r = 0;\r
else if (*r < 0)\r
}\r
\r
#define is_16bit_mode() \\r
- (get_renderer() == RT_16BIT || (PicoAHW & PAHW_32X))\r
+ (get_renderer() == RT_16BIT || (PicoIn.AHW & PAHW_32X))\r
\r
static void (*osd_text)(int x, int y, const char *text);\r
\r
emu_text_out8(x, y, text);\r
}\r
\r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
- int len = strlen(text)*8;\r
- int *p, i, h, offs;\r
-\r
- len = (len+1) >> 1;\r
- for (h = 0; h < 8; h++) {\r
- offs = (x + g_screen_width * (y+h)) & ~1;\r
- p = (int *) ((short *)g_screen_ptr + offs);\r
- for (i = len; i; i--, p++)\r
- *p = (*p >> 2) & 0x39e7;\r
- }\r
- emu_text_out16(x, y, text);\r
-}\r
-\r
static void osd_text8_rot(int x, int y, const char *text)\r
{\r
int len = strlen(text) * 8;\r
\r
x = pico_pen_x + PICO_PEN_ADJUST_X;\r
y = pico_pen_y + PICO_PEN_ADJUST_Y;\r
- if (!(Pico.video.reg[12]&1) && !(PicoOpt & POPT_DIS_32C_BORDER))\r
+ if (!(Pico.video.reg[12]&1) && !(PicoIn.opt & POPT_DIS_32C_BORDER))\r
x += 32;\r
\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
\r
static int EmuScanBegin16_rot(unsigned int num)\r
{\r
- DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
+ Pico.est.DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
return 0;\r
}\r
\r
if ((num & 3) != 3)\r
return 0;\r
rotated_blit16(g_screen_ptr, rot_buff, num + 1,\r
- !(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));\r
+ !(Pico.video.reg[12] & 1) && !(PicoIn.opt & POPT_EN_SOFTSCALE));\r
return 0;\r
}\r
\r
static int EmuScanBegin8_rot(unsigned int num)\r
{\r
- DrawLineDest = rot_buff + (num & 3) * 320;\r
+ Pico.est.DrawLineDest = rot_buff + (num & 3) * 320;\r
return 0;\r
}\r
\r
return 0;\r
}\r
\r
+/* line doublers */\r
+static unsigned int ld_counter;\r
+static int ld_left, ld_lines;\r
+\r
+static int EmuScanBegin16_ld(unsigned int num)\r
+{\r
+ if ((signed int)(ld_counter - num) > 100)\r
+ ld_counter = 0;\r
+\r
+ if (emu_scan_begin)\r
+ return emu_scan_begin(ld_counter);\r
+ else\r
+ Pico.est.DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;\r
+\r
+ return 0;\r
+}\r
+\r
+static int EmuScanEnd16_ld(unsigned int num)\r
+{\r
+ void *oldline = Pico.est.DrawLineDest;\r
+\r
+ if (emu_scan_end)\r
+ emu_scan_end(ld_counter);\r
+\r
+ ld_counter++;\r
+ ld_left--;\r
+ if (ld_left <= 0) {\r
+ ld_left = ld_lines;\r
+\r
+ EmuScanBegin16_ld(num);\r
+ memcpy(Pico.est.DrawLineDest, oldline, 320 * gp2x_current_bpp / 8);\r
+ if (emu_scan_end)\r
+ emu_scan_end(ld_counter);\r
+\r
+ ld_counter++;\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
static int localPal[0x100];\r
static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border);\r
static int (*make_local_pal)(int fast_mode);\r
localPal[0xf0] = 0x00ffffff;\r
pallen = 0x100;\r
}\r
- else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
- bgr444_to_rgb32(localPal+0x40, HighPal);\r
- bgr444_to_rgb32(localPal+0x80, HighPal+0x40);\r
+ else if (Pico.est.rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
+ bgr444_to_rgb32(localPal+0x40, Pico.est.HighPal);\r
+ bgr444_to_rgb32(localPal+0x80, Pico.est.HighPal+0x40);\r
}\r
else\r
- memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
+ memcpy(localPal + 0x80, localPal, 0x40 * 4); // for spr prio mess\r
\r
return pallen;\r
}\r
int emu_opt = currentConfig.EmuOpt;\r
int ret;\r
\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
; // nothing to do\r
else if (get_renderer() == RT_8BIT_FAST)\r
{\r
gp2x_video_setpalette(localPal, ret);\r
}\r
// a hack for VR\r
- if (PicoAHW & PAHW_SVP)\r
- memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
+ if (PicoIn.AHW & PAHW_SVP)\r
+ memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
// do actual copy\r
- vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,\r
- !(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
+ vidcpyM2(g_screen_ptr, Pico.est.Draw2FB+328*8,\r
+ !(Pico.video.reg[12] & 1), !(PicoIn.opt & POPT_DIS_32C_BORDER));\r
}\r
else if (get_renderer() == RT_8BIT_ACC)\r
{\r
}\r
}\r
\r
- if (notice || (emu_opt & EOPT_SHOW_FPS)) {\r
- if (notice)\r
- osd_text(4, osd_y, notice);\r
- if (emu_opt & 2)\r
- osd_text(osd_fps_x, osd_y, fps);\r
- }\r
- if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
+ if (notice)\r
+ osd_text(4, osd_y, notice);\r
+ if (emu_opt & EOPT_SHOW_FPS)\r
+ osd_text(osd_fps_x, osd_y, fps);\r
+ if ((PicoIn.AHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
- if (PicoAHW & PAHW_PICO)\r
+ if (PicoIn.AHW & PAHW_PICO)\r
draw_pico_ptr();\r
}\r
\r
}\r
\r
/* XXX */\r
-#ifdef __GP2X__\r
unsigned int plat_get_ticks_ms(void)\r
{\r
return gp2x_get_ticks_ms();\r
{\r
return gp2x_get_ticks_us();\r
}\r
-#endif\r
\r
void plat_wait_till_us(unsigned int us_to)\r
{\r
plat_status_msg_busy_next(msg);\r
}\r
\r
-static void vidResetMode(void)\r
+static void vid_reset_mode(void)\r
{\r
int gp2x_mode = 16;\r
int renderer = get_renderer();\r
\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
+ PicoIn.opt &= ~POPT_ALT_RENDERER;\r
+ emu_scan_begin = NULL;\r
+ emu_scan_end = NULL;\r
\r
switch (renderer) {\r
case RT_16BIT:\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_RGB555, 0);\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- PicoScanBegin = EmuScanBegin16_rot;\r
- PicoScanEnd = EmuScanEnd16_rot;\r
- }\r
break;\r
case RT_8BIT_ACC:\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_8BIT, 0);\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width);\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- PicoScanBegin = EmuScanBegin8_rot;\r
- PicoScanEnd = EmuScanEnd8_rot;\r
- }\r
gp2x_mode = 8;\r
break;\r
case RT_8BIT_FAST:\r
- PicoOpt |= POPT_ALT_RENDERER;\r
+ PicoIn.opt |= POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_NONE, 0);\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
- vidcpyM2 = vidcpy_m2_rot;\r
- else\r
- vidcpyM2 = vidcpy_m2;\r
+ vidcpyM2 = vidcpy_m2;\r
gp2x_mode = 8;\r
break;\r
+ default:\r
+ printf("bad renderer\n");\r
+ break;\r
}\r
\r
- if (is_16bit_mode())\r
- osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
- else\r
- osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
-\r
- if (PicoAHW & PAHW_32X) {\r
- // rules change in 32X world\r
- if (renderer != RT_16BIT) {\r
- PicoDrawSetOutFormat(PDF_NONE, 0);\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
- }\r
- PicoScan32xBegin = NULL;\r
- PicoScan32xEnd = NULL;\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- PicoScan32xBegin = EmuScanBegin16_rot;\r
- PicoScan32xEnd = EmuScanEnd16_rot;\r
- }\r
+ if (PicoIn.AHW & PAHW_32X) {\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
- PicoDraw32xSetFrameMode(1, (renderer == RT_16BIT) ? 1 : 0);\r
+ PicoDrawSetOutFormat(PDF_NONE, 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
- gp2x_mode = -gp2x_mode;\r
- gp2x_video_changemode(gp2x_mode);\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ if ((PicoIn.AHW & PAHW_32X) || renderer == RT_16BIT) {\r
+ emu_scan_begin = EmuScanBegin16_rot;\r
+ emu_scan_end = EmuScanEnd16_rot;\r
+ }\r
+ else if (renderer == RT_8BIT_ACC) {\r
+ emu_scan_begin = EmuScanBegin8_rot;\r
+ emu_scan_end = EmuScanEnd8_rot;\r
+ }\r
+ else if (renderer == RT_8BIT_FAST)\r
+ vidcpyM2 = vidcpy_m2_rot;\r
+ }\r
+\r
+ PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);\r
+\r
+ if (is_16bit_mode())\r
+ osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : emu_osd_text16;\r
+ else\r
+ osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
\r
+ gp2x_video_wait_vsync();\r
if (!is_16bit_mode()) {\r
// setup pal for 8-bit modes\r
localPal[0xc0] = 0x0000c000; // MCD LEDs\r
localPal[0xf0] = 0x00ffffff;\r
gp2x_video_setpalette(localPal, 0x100);\r
gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
- gp2x_video_flip();\r
}\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, Pico.m.pal);\r
+\r
Pico.m.dirtyPal = 1;\r
\r
- // reset scaling\r
- if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(Pico.video.reg[1]&8))\r
- gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224);\r
- else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);\r
+ PicoIn.opt &= ~POPT_EN_SOFTSCALE;\r
+ if (currentConfig.scaling == EOPT_SCALE_SW)\r
+ PicoIn.opt |= POPT_EN_SOFTSCALE;\r
\r
// palette converters for 8bit modes\r
- make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
+ make_local_pal = (PicoIn.AHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
+}\r
+\r
+void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
+{\r
+ int scalex = 320, scaley = 240;\r
+ int ln_offs = 0;\r
+\r
+ if (doing_bg_frame)\r
+ return;\r
+\r
+ osd_fps_x = OSD_FPS_X;\r
+ osd_y = 232;\r
+\r
+ /* set up hwscaling here */\r
+ PicoIn.opt &= ~POPT_DIS_32C_BORDER;\r
+ if (is_32cols && currentConfig.scaling == EOPT_SCALE_HW) {\r
+ scalex = 256;\r
+ PicoIn.opt |= POPT_DIS_32C_BORDER;\r
+ osd_fps_x = OSD_FPS_X - 64;\r
+ }\r
+\r
+ if (currentConfig.vscaling == EOPT_SCALE_HW) {\r
+ ln_offs = start_line;\r
+ scaley = line_count;\r
+ osd_y = start_line + line_count - 8;\r
+ }\r
+\r
+ gp2x_video_RGB_setscaling(ln_offs, scalex, scaley);\r
+\r
+ /* line doubling */\r
+ if (currentConfig.vscaling == EOPT_SCALE_SW && line_count < 240) {\r
+ ld_lines = ld_left = line_count / (240 - line_count);\r
+ PicoDrawSetCallbacks(EmuScanBegin16_ld, EmuScanEnd16_ld);\r
+ }\r
+\r
+ // clear whole screen in all buffers\r
+ if (!is_16bit_mode())\r
+ gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+ else\r
+ gp2x_memset_all_buffers(0, 0, 320*240*2);\r
}\r
\r
void plat_video_toggle_renderer(int change, int is_menu_call)\r
if (is_menu_call)\r
return;\r
\r
- vidResetMode();\r
+ vid_reset_mode();\r
rendstatus_old = -1;\r
\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
emu_status_msg(renderer_names32x[get_renderer()]);\r
else\r
emu_status_msg(renderer_names[get_renderer()]);\r
if (ret > 35000)\r
{\r
if (pdown_frames++ > 5)\r
- PicoPad[0] |= 0x20;\r
+ PicoIn.pad[0] |= 0x20;\r
\r
pico_pen_x = px;\r
pico_pen_y = py;\r
void plat_update_volume(int has_changed, int is_up)\r
{\r
static int prev_frame = 0, wait_frames = 0;\r
- int vol = currentConfig.volume;\r
int need_low_volume = 0;\r
+ int vol = currentConfig.volume;\r
gp2x_soc_t soc;\r
\r
soc = soc_detect();\r
- if ((PicoOpt & POPT_EN_STEREO) && soc == SOCID_MMSP2)\r
+ if ((PicoIn.opt & POPT_EN_STEREO) && soc == SOCID_MMSP2)\r
need_low_volume = 1;\r
\r
if (has_changed)\r
if (need_low_volume && vol < 5 && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)\r
wait_frames++;\r
else {\r
- if (is_up) {\r
- if (vol < 99) vol++;\r
- } else {\r
- if (vol > 0) vol--;\r
- }\r
wait_frames = 0;\r
- sndout_oss_setvol(vol, vol);\r
- currentConfig.volume = vol;\r
+ plat_target_step_volume(¤tConfig.volume, is_up ? 1 : -1);\r
+ vol = currentConfig.volume;\r
}\r
emu_status_msg("VOL: %02i", vol);\r
prev_frame = Pico.m.frame_count;\r
}\r
}\r
\r
-static void updateSound(int len)\r
-{\r
- len <<= 1;\r
- if (PicoOpt & POPT_EN_STEREO)\r
- len <<= 1;\r
-\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
-}\r
-\r
void pemu_sound_start(void)\r
{\r
- static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;\r
+ gp2x_soc_t soc;\r
\r
- PsndOut = NULL;\r
+ emu_sound_start();\r
\r
- // prepare sound stuff\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
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
-\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
- ((PicoOpt ^ PicoOpt_old) & SOUND_RERATE_FLAGS)) {\r
+ PsndRate = pollux_get_real_snd_rate(PsndRate);\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
+ plat_target_step_volume(¤tConfig.volume, 0);\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
- }\r
-}\r
+ int i;\r
\r
-void pemu_sound_wait(void)\r
-{\r
- // don't need to do anything, writes will block by themselves\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 opts, int no_scale)\r
+void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
- int po_old = PicoOpt;\r
-\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
- PicoOpt |= opts|POPT_ACC_SPRITES;\r
-\r
- PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ doing_bg_frame = 1;\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- PicoDraw32xSetFrameMode(0, 0);\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
+ PicoDrawSetCallbacks(NULL, NULL);\r
Pico.m.dirtyPal = 1;\r
- PicoFrameDrawOnly();\r
\r
- PicoOpt = po_old;\r
-}\r
+ emu_cmn_forced_frame(no_scale, do_emu);\r
\r
-void plat_debug_cat(char *str)\r
-{\r
+ g_menubg_src_ptr = g_screen_ptr;\r
+ doing_bg_frame = 0;\r
}\r
\r
-void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
+void plat_debug_cat(char *str)\r
{\r
- int scalex = 320;\r
- osd_fps_x = OSD_FPS_X;\r
- osd_y = 232;\r
- if (is_32cols && (PicoOpt & POPT_DIS_32C_BORDER)) {\r
- scalex = 256;\r
- osd_fps_x = OSD_FPS_X - 64;\r
- }\r
-\r
- /* want vertical scaling and game is not in 240 line mode */\r
- if (currentConfig.scaling == EOPT_SCALE_HW_HV) {\r
- gp2x_video_RGB_setscaling(start_line, scalex, line_count);\r
- osd_y = start_line + line_count - 8;\r
- } else\r
- gp2x_video_RGB_setscaling(0, scalex, 240);\r
-\r
- // clear whole screen in all buffers\r
- if (!is_16bit_mode())\r
- gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
- else\r
- gp2x_memset_all_buffers(0, 0, 320*240*2);\r
}\r
\r
-#if 0\r
-static void tga_dump(void)\r
+void plat_video_loop_prepare(void) \r
{\r
-#define BYTE unsigned char\r
-#define WORD unsigned short\r
- struct\r
- {\r
- BYTE IDLength; /* 00h Size of Image ID field */\r
- BYTE ColorMapType; /* 01h Color map type */\r
- BYTE ImageType; /* 02h Image type code */\r
- WORD CMapStart; /* 03h Color map origin */\r
- WORD CMapLength; /* 05h Color map length */\r
- BYTE CMapDepth; /* 07h Depth of color map entries */\r
- WORD XOffset; /* 08h X origin of image */\r
- WORD YOffset; /* 0Ah Y origin of image */\r
- WORD Width; /* 0Ch Width of image */\r
- WORD Height; /* 0Eh Height of image */\r
- BYTE PixelDepth; /* 10h Image pixel size */\r
- BYTE ImageDescriptor; /* 11h Image descriptor byte */\r
- } __attribute__((packed)) TGAHEAD;\r
- static unsigned short oldscr[320*240];\r
- FILE *f; char name[128]; int i;\r
-\r
- memset(&TGAHEAD, 0, sizeof(TGAHEAD));\r
- TGAHEAD.ImageType = 2;\r
- TGAHEAD.Width = 320;\r
- TGAHEAD.Height = 240;\r
- TGAHEAD.PixelDepth = 16;\r
- TGAHEAD.ImageDescriptor = 2<<4; // image starts at top-left\r
-\r
-#define CONV(X) (((X>>1)&0x7fe0)|(X&0x1f)) // 555?\r
-\r
- for (i = 0; i < 320*240; i++)\r
- if(oldscr[i] != CONV(((unsigned short *)g_screen_ptr)[i])) break;\r
- if (i < 320*240)\r
- {\r
- for (i = 0; i < 320*240; i++)\r
- oldscr[i] = CONV(((unsigned short *)g_screen_ptr)[i]);\r
- sprintf(name, "%05i.tga", Pico.m.frame_count);\r
- f = fopen(name, "wb");\r
- if (!f) { printf("!f\n"); exit(1); }\r
- fwrite(&TGAHEAD, 1, sizeof(TGAHEAD), f);\r
- fwrite(oldscr, 1, 320*240*2, f);\r
- fclose(f);\r
- }\r
+ // make sure we are in correct mode\r
+ change_renderer(0);\r
+ vid_reset_mode();\r
}\r
-#endif\r
\r
void pemu_loop_prep(void)\r
{\r
- static int gp2x_old_clock = -1, EmuOpt_old = 0, pal_old = 0;\r
- static int gp2x_old_gamma = 100;\r
- gp2x_soc_t soc;\r
-\r
- soc = soc_detect();\r
-\r
- if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_RAM_TIMINGS) {\r
- if (currentConfig.EmuOpt & EOPT_RAM_TIMINGS)\r
- set_ram_timings();\r
- else\r
- unset_ram_timings();\r
- }\r
-\r
- if (gp2x_old_clock < 0)\r
- gp2x_old_clock = default_cpu_clock;\r
- if (gp2x_old_clock != currentConfig.CPUclock) {\r
- printf("changing clock to %i...", currentConfig.CPUclock); fflush(stdout);\r
- gp2x_set_cpuclk(currentConfig.CPUclock);\r
- gp2x_old_clock = currentConfig.CPUclock;\r
- printf(" done\n");\r
- }\r
-\r
- if (gp2x_old_gamma != currentConfig.gamma || ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_A_SN_GAMMA)) {\r
- set_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt & EOPT_A_SN_GAMMA));\r
- gp2x_old_gamma = currentConfig.gamma;\r
- printf("updated gamma to %i, A_SN's curve: %i\n", currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));\r
- }\r
-\r
- if (((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_VSYNC) || Pico.m.pal != pal_old) {\r
- if ((currentConfig.EmuOpt & EOPT_VSYNC) || soc == SOCID_POLLUX)\r
- set_lcd_custom_rate(Pico.m.pal);\r
- else if (EmuOpt_old & EOPT_VSYNC)\r
- unset_lcd_custom_rate();\r
- }\r
-\r
- if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_MMUHACK)\r
- gp2x_make_fb_bufferable(currentConfig.EmuOpt & EOPT_MMUHACK);\r
-\r
- EmuOpt_old = currentConfig.EmuOpt;\r
- pal_old = Pico.m.pal;\r
-\r
- // make sure we are in correct mode\r
- vidResetMode();\r
- scaling_update();\r
+ if (gp2x_dev_id == GP2X_DEV_CAANOO)\r
+ in_set_config_int(in_name_to_id("evdev:pollux-analog"),\r
+ IN_CFG_ABS_DEAD_ZONE,\r
+ currentConfig.analog_deadzone);\r
\r
// dirty buffers better go now than during gameplay\r
sync();\r
sleep(0);\r
-\r
- pemu_sound_start();\r
}\r
\r
void pemu_loop_end(void)\r
{\r
- int po_old = PicoOpt;\r
- int eo_old = currentConfig.EmuOpt;\r
-\r
pemu_sound_stop();\r
- memset32(g_screen_ptr, 0, 320*240*2/4);\r
\r
/* do one more frame for menu bg */\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
- PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
-\r
- PicoDrawSetOutFormat(PDF_RGB555, 1);\r
- PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- PicoDraw32xSetFrameMode(0, 0);\r
- PicoScanBegin = NULL;\r
- PicoScanEnd = NULL;\r
- Pico.m.dirtyPal = 1;\r
- PicoFrame();\r
-\r
- PicoOpt = po_old;\r
- currentConfig.EmuOpt = eo_old;\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
+ pemu_forced_frame(0, 1);\r
}\r
+\r
notaz.gp2x.de / picodrive.git / blobdiff