notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix Wiz timer drift and button name
[picodrive.git]
/
platform
/
psp
/
emu.c
diff --git
a/platform/psp/emu.c
b/platform/psp/emu.c
index
21abfca
..
e0e1ca1
100644
(file)
--- a/
platform/psp/emu.c
+++ b/
platform/psp/emu.c
@@
-36,8
+36,6
@@
int sceAudioOutput2GetRestSample();
unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
int engineStateSuspend;
unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
int engineStateSuspend;
-static unsigned int noticeMsgTime = 0;
-
#define PICO_PEN_ADJUST_X 4
#define PICO_PEN_ADJUST_Y 2
static int pico_pen_x = 320/2, pico_pen_y = 240/2;
#define PICO_PEN_ADJUST_X 4
#define PICO_PEN_ADJUST_Y 2
static int pico_pen_x = 320/2, pico_pen_y = 240/2;
@@
-47,17
+45,6
@@
static void sound_deinit(void);
static void blit2(const char *fps, const char *notice, int lagging_behind);
static void clearArea(int full);
static void blit2(const char *fps, const char *notice, int lagging_behind);
static void clearArea(int full);
-void plat_status_msg(const char *format, ...)
-{
- va_list vl;
-
- va_start(vl, format);
- vsnprintf(noticeMsg, sizeof(noticeMsg), fmt, vl);
- va_end(vl);
-
- noticeMsgTime = sceKernelGetSystemTimeLow();
-}
-
int plat_get_root_dir(char *dst, int len)
{
if (len > 0) *dst = 0;
int plat_get_root_dir(char *dst, int len)
{
if (len > 0) *dst = 0;
@@
-76,7
+63,7
@@
static void osd_text(int x, const char *text, int is_active, int clear_all)
memset32_uncached(p, 0, len);
}
if (is_active) { tmp = psp_screen; psp_screen = screen; } // nasty pointer tricks
memset32_uncached(p, 0, len);
}
if (is_active) { tmp = psp_screen; psp_screen = screen; } // nasty pointer tricks
- emu_text
O
ut16(x, 264, text);
+ emu_text
_o
ut16(x, 264, text);
if (is_active) psp_screen = tmp;
}
if (is_active) psp_screen = tmp;
}
@@
-409,7
+396,7
@@
static void dbg_text(void)
p = (int *) ((int)p & ~3); // align
memset32_uncached(p, 0, len);
}
p = (int *) ((int)p & ~3); // align
memset32_uncached(p, 0, len);
}
- emu_text
O
ut16(2, 256, text);
+ emu_text
_o
ut16(2, 256, text);
}
#endif
}
#endif
@@
-610,7
+597,7
@@
void pemu_sound_start(void)
ret = sceAudio_38553111(samples_block/2, PsndRate, 2); // seems to not need that stupid 64byte alignment
if (ret < 0) {
lprintf("sceAudio_38553111() failed: %i\n", ret);
ret = sceAudio_38553111(samples_block/2, PsndRate, 2); // seems to not need that stupid 64byte alignment
if (ret < 0) {
lprintf("sceAudio_38553111() failed: %i\n", ret);
-
plat
_status_msg("sound init failed (%i), snd disabled", ret);
+
emu
_status_msg("sound init failed (%i), snd disabled", ret);
currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
} else {
PicoWriteSound = writeSound;
currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
} else {
PicoWriteSound = writeSound;
@@
-782,9
+769,9
@@
static void RunEvents(unsigned int which)
vidResetMode();
if (PicoOpt & POPT_ALT_RENDERER)
vidResetMode();
if (PicoOpt & POPT_ALT_RENDERER)
-
plat
_status_msg("fast renderer");
+
emu
_status_msg("fast renderer");
else if (currentConfig.EmuOpt&0x80)
else if (currentConfig.EmuOpt&0x80)
-
plat
_status_msg("accurate renderer");
+
emu
_status_msg("accurate renderer");
}
if (which & 0x0300)
{
}
if (which & 0x0300)
{
@@
-795,7
+782,7
@@
static void RunEvents(unsigned int which)
state_slot += 1;
if(state_slot > 9) state_slot = 0;
}
state_slot += 1;
if(state_slot > 9) state_slot = 0;
}
-
plat
_status_msg("SAVE SLOT %i [%s]", state_slot,
+
emu
_status_msg("SAVE SLOT %i [%s]", state_slot,
emu_check_save_file(state_slot) ? "USED" : "FREE");
}
}
emu_check_save_file(state_slot) ? "USED" : "FREE");
}
}