// For commercial use, separate licencing terms must be obtained.\r
\r
#include <stdio.h>\r
+#include <unistd.h>\r
\r
#include "../common/emu.h"\r
#include "../common/menu.h"\r
#include "../common/plat.h"\r
#include "../common/arm_utils.h"\r
#include "../linux/sndout_oss.h"\r
+#include "../linux/fbdev.h"\r
#include "asm_utils.h"\r
#include "version.h"\r
\r
#include <pico/pico_int.h>\r
\r
-#define USE_320_SCREEN 1\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
-static int osd_fps_x;\r
char cpu_clk_name[] = "unused";\r
\r
\r
{\r
// XXX: move elsewhere\r
g_menubg_ptr = temp_frame;\r
+\r
+ defaultConfig.EmuOpt |= EOPT_VSYNC;\r
}\r
\r
void pemu_validate_config(void)\r
return 0;\r
}\r
\r
+static int EmuScanEnd16_32x(unsigned int num)\r
+{\r
+ unsigned int *ps;\r
+ unsigned int *pd;\r
+ int len;\r
+\r
+ ps = (unsigned int *)temp_frame;\r
+ pd = (unsigned int *)g_screen_ptr + (num*800*2 + 800/2 - 320*2/2) / 2;\r
+\r
+ for (len = 320/2; len > 0; len--, ps++) {\r
+ unsigned int p, p1;\r
+ p1 = *ps;\r
+ p = p1 << 16;\r
+ p |= p >> 16;\r
+ *pd = pd[800/2] = p;\r
+ pd++;\r
+\r
+ p = p1 >> 16;\r
+ p |= p << 16;\r
+ *pd = pd[800/2] = p;\r
+ pd++;\r
+ }\r
+\r
+ return 0;\r
+}\r
#endif // USE_320_SCREEN\r
\r
-void pemu_update_display(const char *fps, const char *notice)\r
+void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
if (notice)\r
- osd_text(4, 460, notice);\r
+ osd_text(4, 464, notice);\r
if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
- osd_text(osd_fps_x, 460, fps);\r
+ osd_text(640, 464, fps);\r
}\r
if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
\r
void plat_video_menu_end(void)\r
{\r
+ plat_video_flip();\r
}\r
\r
void plat_status_msg_clear(void)\r
{\r
- unsigned short *d = (unsigned short *)g_screen_ptr + g_screen_width * g_screen_height;\r
- int l = g_screen_width * 8;\r
- memset32((int *)(d - l), 0, l * 2 / 4);\r
+ int s = g_screen_width * g_screen_height * 2;\r
+ int l = g_screen_width * 16 * 2;\r
+ int i;\r
+\r
+ for (i = 0; i < fbdev_buffer_count; i++)\r
+ memset32((int *)((char *)fbdev_buffers[i] + s - l), 0, l / 4);\r
}\r
\r
void plat_status_msg_busy_next(const char *msg)\r
{\r
plat_status_msg_clear();\r
- pemu_update_display("", msg);\r
+ pemu_finalize_frame("", msg);\r
+ plat_video_flip();\r
emu_status_msg("");\r
reset_timing = 1;\r
}\r
PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
currentConfig.EmuOpt |= 0x80;\r
\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
\r
static void updateSound(int len)\r
{\r
+ unsigned int t;\r
+\r
len <<= 1;\r
if (PicoOpt & POPT_EN_STEREO)\r
len <<= 1;\r
\r
+ // sndout_oss_can_write() not reliable..\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
+ if (PicoSkipFrame == 2)\r
+ return;\r
+\r
+ t = plat_get_ticks_ms();\r
+ sndout_oss_write(PsndOut, len);\r
+ t = plat_get_ticks_ms() - t;\r
+ if (t > 1)\r
+ printf("audio lag %u\n", t);\r
}\r
\r
void pemu_sound_start(void)\r
{\r
- static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;\r
int target_fps = Pico.m.pal ? 50 : 60;\r
\r
PsndOut = NULL;\r
\r
- if (currentConfig.EmuOpt & 4)\r
+ if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
{\r
- int snd_excess_add;\r
- if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old)\r
- PsndRerate(Pico.m.frame_count ? 1 : 0);\r
+ int snd_excess_add, frame_samples;\r
+ int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
+\r
+ PsndRerate(Pico.m.frame_count ? 1 : 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
\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
- sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);\r
- sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
+ PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);\r
+ sndout_oss_start(PsndRate, frame_samples * 2, is_stereo);\r
+ //sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
PicoWriteSound = updateSound;\r
plat_update_volume(0, 0);\r
memset(sndBuffer, 0, sizeof(sndBuffer));\r
PsndOut = sndBuffer;\r
- PsndRate_old = PsndRate;\r
- PicoOpt_old = PicoOpt;\r
- pal_old = Pico.m.pal;\r
}\r
}\r
\r
void pemu_sound_stop(void)\r
{\r
+ sndout_oss_stop();\r
}\r
\r
void pemu_sound_wait(void)\r
\r
void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
{\r
- osd_fps_x = 260;\r
+ int i;\r
\r
// clear whole screen in all buffers\r
- memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
-}\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
-void pemu_loop_prep(void)\r
-{\r
#ifdef USE_320_SCREEN\r
PicoDrawSetColorFormat(1);\r
PicoScanBegin = EmuScanBegin16;\r
#else\r
- PicoDrawSetColorFormat(-1);\r
- PicoScanEnd = EmuScanEnd16;\r
+ if (PicoAHW & PAHW_32X) {\r
+ DrawLineDest = (unsigned short *)temp_frame;\r
+ PicoDrawSetColorFormat(1);\r
+ PicoScanBegin = NULL;\r
+ PicoScanEnd = EmuScanEnd16_32x;\r
+ } else {\r
+ PicoDrawSetColorFormat(-1);\r
+ PicoScanBegin = NULL;\r
+ PicoScanEnd = EmuScanEnd16;\r
+ }\r
#endif\r
+}\r
\r
+void pemu_loop_prep(void)\r
+{\r
+ emu_video_mode_change(0, 0, 0);\r
pemu_sound_start();\r
}\r
\r
currentConfig.EmuOpt = eo_old;\r
}\r
\r
-/* XXX: avoid busy wait somehow? */\r
void plat_wait_till_us(unsigned int us_to)\r
{\r
unsigned int now;\r
+ signed int diff;\r
\r
- spend_cycles(1024);\r
now = plat_get_ticks_us();\r
\r
- while ((signed int)(us_to - now) > 512)\r
- {\r
+ // XXX: need to check NOHZ and djw kernel\r
+ diff = (signed int)(us_to - now);\r
+ if (diff > 10000) {\r
+ //printf("sleep %d\n", us_to - now);\r
+ usleep(diff * 15 / 16);\r
+ now = plat_get_ticks_us();\r
+ //printf(" wake %d\n", (signed)(us_to - now));\r
+ }\r
+/*\r
+ while ((signed int)(us_to - now) > 512) {\r
spend_cycles(1024);\r
now = plat_get_ticks_us();\r
}\r
-}\r
-\r
-void plat_video_wait_vsync(void)\r
-{\r
+*/\r
}\r
\r
const char *plat_get_credits(void)\r
notaz.gp2x.de / libpicofe.git / blobdiff