notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drZ80 separation finished, related bugs fixed
[picodrive.git]
/
platform
/
pandora
/
emu.c
diff --git
a/platform/pandora/emu.c
b/platform/pandora/emu.c
index
bb4b30a
..
a9a2119
100644
(file)
--- a/
platform/pandora/emu.c
+++ b/
platform/pandora/emu.c
@@
-34,7
+34,6
@@
\r
\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
\r
\r
\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
\r
-static struct timeval noticeMsgTime = { 0, 0 }; // when started showing
\r
static int osd_fps_x;
\r
unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer
\r
\r
static int osd_fps_x;
\r
unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer
\r
\r
@@
-43,17
+42,6
@@
unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer
static int pico_pen_x = 0, pico_pen_y = 240/2;
\r
\r
\r
static int pico_pen_x = 0, pico_pen_y = 240/2;
\r
\r
\r
-void plat_status_msg(const char *format, ...)
\r
-{
\r
- va_list vl;
\r
-
\r
- va_start(vl, format);
\r
- vsnprintf(noticeMsg, sizeof(noticeMsg), fmt, vl);
\r
- va_end(vl);
\r
-
\r
- gettimeofday(¬iceMsgTime, 0);
\r
-}
\r
-
\r
int plat_get_root_dir(char *dst, int len)
\r
{
\r
extern char **g_argv;
\r
int plat_get_root_dir(char *dst, int len)
\r
{
\r
extern char **g_argv;
\r
@@
-134,7
+122,7
@@
static void osd_text(int x, int y, const char *text)
p = (int *) ((unsigned char *) g_screen_ptr+x+g_screen_width*(y+h));
\r
for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
\r
}
\r
p = (int *) ((unsigned char *) g_screen_ptr+x+g_screen_width*(y+h));
\r
for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
\r
}
\r
- emu_text
O
ut8(x, y, text);
\r
+ emu_text
_o
ut8(x, y, text);
\r
} else {
\r
int *p, i, h;
\r
x &= ~1; // align x
\r
} else {
\r
int *p, i, h;
\r
x &= ~1; // align x
\r
@@
-143,7
+131,7
@@
static void osd_text(int x, int y, const char *text)
p = (int *) ((unsigned short *) g_screen_ptr+x+g_screen_width*(y+h));
\r
for (i = len; i; i--, p++) *p = 0;//(*p>>2)&0x39e7;
\r
}
\r
p = (int *) ((unsigned short *) g_screen_ptr+x+g_screen_width*(y+h));
\r
for (i = len; i; i--, p++) *p = 0;//(*p>>2)&0x39e7;
\r
}
\r
- text
O
ut16(x, y, text);
\r
+ text
_o
ut16(x, y, text);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-727,15
+715,15
@@
void pemu_loop(void)
frames_done++; frames_shown++;
\r
}
\r
\r
frames_done++; frames_shown++;
\r
}
\r
\r
- emu_
changeFastF
orward(0);
\r
+ emu_
set_fastf
orward(0);
\r
\r
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
\r
\r
// save SRAM
\r
\r
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
\r
\r
// save SRAM
\r
- if
((currentConfig.EmuOpt & 1
) && SRam.changed) {
\r
+ if
((currentConfig.EmuOpt & EOPT_EN_SRAM
) && SRam.changed) {
\r
/* FIXME: plat_status_msg_busy_first */
\r
emu_state_cb("Writing SRAM/BRAM..");
\r
/* FIXME: plat_status_msg_busy_first */
\r
emu_state_cb("Writing SRAM/BRAM..");
\r
- emu_
SaveLoadG
ame(0, 1);
\r
+ emu_
save_load_g
ame(0, 1);
\r
SRam.changed = 0;
\r
}
\r
\r
SRam.changed = 0;
\r
}
\r
\r