From 8f1b51efbc8b3047ee6959d1f69add033341bf67 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Thu, 22 Mar 2007 23:14:43 +0000
Subject: [PATCH] gfx_cd finished, bugfixes
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@76 be3aeb3a-fb24-0410-a615-afba39da0efa
---
gp2x/940ctl.c | 2 ++
gp2x/emu.c | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index b035591..bcbb09b 100644
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -20,6 +20,7 @@
extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
extern volatile unsigned long *gp2x_memregl;
+extern int reset_timing;
static unsigned char *shared_mem = 0;
static _940_data_t *shared_data = 0;
_940_ctl_t *shared_ctl = 0;
@@ -589,6 +590,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE);
add_job_940(JOB940_INVALIDATE_DCACHE);
}
+ reset_timing = 1;
}
// seek..
diff --git a/gp2x/emu.c b/gp2x/emu.c
index 7c63cdb..60907ff 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -54,13 +54,14 @@ extern int crashed_940;
static short sndBuffer[2*44100/50];
static char noticeMsg[64]; // notice msg to draw
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing
-static int reset_timing, osd_fps_x;
+static int osd_fps_x;
static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos
static int gp2x_old_gamma = 100;
static unsigned char *movie_data = NULL;
static int movie_size = 0;
unsigned char *framebuff = 0; // temporary buffer for alt renderer
int state_slot = 0;
+int reset_timing = 0;
/*
// tmp
@@ -1191,7 +1192,7 @@ void emu_Loop(void)
continue;
}
updateKeys();
- SkipFrame(tval.tv_usec < lim_time+target_frametime); frames_done++;
+ SkipFrame(tval.tv_usec < lim_time+target_frametime*2); frames_done++;
continue;
}
--
2.39.5