notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new 32x renderers, auto fskip change, massive refactoring
[libpicofe.git]
/
psp
/
emu.c
diff --git
a/psp/emu.c
b/psp/emu.c
index
4063a04
..
6169940
100644
(file)
--- a/
psp/emu.c
+++ b/
psp/emu.c
@@
-36,9
+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;
-int reset_timing = 0; // do we need this?
-
#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;
@@
-48,18
+45,7
@@
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 emu_getMainDir(char *dst, int len)
+int plat_get_root_dir(char *dst, int len)
{
if (len > 0) *dst = 0;
return 0;
{
if (len > 0) *dst = 0;
return 0;
@@
-77,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;
}
@@
-90,53
+76,21
@@
void emu_msg_cb(const char *msg)
reset_timing = 1;
}
reset_timing = 1;
}
-static void emu_msg_tray_open(void)
-{
- plat_status_msg("CD tray opened");
-}
-
-
+/* FIXME: move to plat */
void emu_Init(void)
{
void emu_Init(void)
{
- // make dirs for saves, cfgs, etc.
- mkdir("mds", 0777);
- mkdir("srm", 0777);
- mkdir("brm", 0777);
- mkdir("cfg", 0777);
-
sound_init();
sound_init();
-
- PicoInit();
- PicoMessage = emu_msg_cb;
- PicoMCDopenTray = emu_msg_tray_open;
- PicoMCDcloseTray = menu_loop_tray;
}
void emu_Deinit(void)
{
}
void emu_Deinit(void)
{
- // save SRAM
- if ((currentConfig.EmuOpt & 1) && SRam.changed) {
- emu_SaveLoadGame(0, 1);
- SRam.changed = 0;
- }
-
- if (!(currentConfig.EmuOpt & 0x20))
- config_writelrom(PicoConfigFile);
-
- PicoExit();
sound_deinit();
}
sound_deinit();
}
-void
emu_prepareDefaultC
onfig(void)
+void
pemu_prep_defc
onfig(void)
{
{
- memset(&defaultConfig, 0, sizeof(defaultConfig));
- defaultConfig.EmuOpt = 0x1d | 0x680; // | <- confirm_save, cd_leds, acc rend
- defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX|POPT_ACC_SPRITES;
defaultConfig.s_PsndRate = 22050;
defaultConfig.s_PsndRate = 22050;
- defaultConfig.s_PicoRegion = 0; // auto
- defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
defaultConfig.s_PicoCDBuffers = 64;
defaultConfig.s_PicoCDBuffers = 64;
- defaultConfig.Frameskip = -1; // auto
defaultConfig.CPUclock = 333;
defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
defaultConfig.KeyBinds[ 6] = 1<<1;
defaultConfig.CPUclock = 333;
defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
defaultConfig.KeyBinds[ 6] = 1<<1;
@@
-157,7
+111,6
@@
void emu_prepareDefaultConfig(void)
defaultConfig.scale = 1.20; // fullscreen
defaultConfig.hscale40 = 1.25;
defaultConfig.hscale32 = 1.56;
defaultConfig.scale = 1.20; // fullscreen
defaultConfig.hscale40 = 1.25;
defaultConfig.hscale32 = 1.56;
- defaultConfig.turbo_rate = 15;
}
}
@@
-301,8
+254,6
@@
static void EmuScanPrepare(void)
static int EmuScanSlowBegin(unsigned int num)
{
static int EmuScanSlowBegin(unsigned int num)
{
- if (!(Pico.video.reg[1]&8)) num += 8;
-
if (!dynamic_palette)
HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
if (!dynamic_palette)
HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
@@
-311,8
+262,6
@@
static int EmuScanSlowBegin(unsigned int num)
static int EmuScanSlowEnd(unsigned int num)
{
static int EmuScanSlowEnd(unsigned int num)
{
- if (!(Pico.video.reg[1]&8)) num += 8;
-
if (Pico.m.dirtyPal) {
if (!dynamic_palette) {
do_slowmode_lines(num);
if (Pico.m.dirtyPal) {
if (!dynamic_palette) {
do_slowmode_lines(num);
@@
-436,7
+385,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
@@
-516,7
+465,7
@@
static void vidResetMode(void)
sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 16);
// slow rend.
sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 16);
// slow rend.
- PicoDrawSet
ColorFormat(-1
);
+ PicoDrawSet
OutFormat(PDF_NONE, 0
);
PicoScanBegin = EmuScanSlowBegin;
PicoScanEnd = EmuScanSlowEnd;
PicoScanBegin = EmuScanSlowBegin;
PicoScanEnd = EmuScanSlowEnd;
@@
-530,7
+479,7
@@
static void vidResetMode(void)
sceGuSync(0,0);
}
sceGuSync(0,0);
}
-void
emu_platformDebugC
at(char *str)
+void
plat_debug_c
at(char *str)
{
strcat(str, blit_16bit_mode ? "soft clut\n" : "hard clut\n");
}
{
strcat(str, blit_16bit_mode ? "soft clut\n" : "hard clut\n");
}
@@
-613,7
+562,7
@@
static void sound_init(void)
lprintf("sceKernelCreateThread failed: %i\n", thid);
}
lprintf("sceKernelCreateThread failed: %i\n", thid);
}
-void
emu_startSound
(void)
+void
pemu_sound_start
(void)
{
static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
int ret, stereo;
{
static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
int ret, stereo;
@@
-637,7
+586,7
@@
void emu_startSound(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;
@@
-651,7
+600,7
@@
void emu_startSound(void)
}
}
}
}
-void
emu_endSound
(void)
+void
pemu_sound_stop
(void)
{
int i;
if (samples_done == 0)
{
int i;
if (samples_done == 0)
@@
-671,7
+620,7
@@
void emu_endSound(void)
}
/* wait until we can write more sound */
}
/* wait until we can write more sound */
-void
emu_waitSound
(void)
+void
pemu_sound_wait
(void)
{
// TODO: test this
while (!sound_thread_exit && samples_made - samples_done > samples_block * 4)
{
// TODO: test this
while (!sound_thread_exit && samples_made - samples_done > samples_block * 4)
@@
-719,7
+668,7
@@
static void SkipFrame(void)
PicoSkipFrame=0;
}
PicoSkipFrame=0;
}
-void
emu_forcedF
rame(int opts)
+void
pemu_forced_f
rame(int opts)
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
@@
-733,7
+682,7
@@
void emu_forcedFrame(int opts)
memset32((int *)VRAM_CACHED_STUFF + 512*232/4, 0xe0e0e0e0, 512*8/4);
memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
memset32((int *)VRAM_CACHED_STUFF + 512*232/4, 0xe0e0e0e0, 512*8/4);
memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
- PicoDrawSet
ColorFormat(-1
);
+ PicoDrawSet
OutFormat(PDF_NONE, 0
);
PicoScanBegin = EmuScanSlowBegin;
PicoScanEnd = EmuScanSlowEnd;
EmuScanPrepare();
PicoScanBegin = EmuScanSlowBegin;
PicoScanEnd = EmuScanSlowEnd;
EmuScanPrepare();
@@
-775,7
+724,7
@@
static void RunEvents(unsigned int which)
{
int do_it = 1;
{
int do_it = 1;
- if ( emu_check
SaveF
ile(state_slot) &&
+ if ( emu_check
_save_f
ile(state_slot) &&
(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
(!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
{
(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
(!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
{
@@
-794,7
+743,7
@@
static void RunEvents(unsigned int which)
{
osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0);
PicoStateProgressCB = emu_msg_cb;
{
osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0);
PicoStateProgressCB = emu_msg_cb;
- emu_
SaveLoadG
ame((which & 0x1000) >> 12, 0);
+ emu_
save_load_g
ame((which & 0x1000) >> 12, 0);
PicoStateProgressCB = NULL;
psp_msleep(0);
}
PicoStateProgressCB = NULL;
psp_msleep(0);
}
@@
-809,9
+758,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)
{
@@
-822,8
+771,8
@@
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_check
SaveF
ile(state_slot) ? "USED" : "FREE");
+
emu
_status_msg("SAVE SLOT %i [%s]", state_slot,
+ emu_check
_save_f
ile(state_slot) ? "USED" : "FREE");
}
}
}
}
@@
-852,7
+801,7
@@
static void updateKeys(void)
events = (allActions[0] | allActions[1]) >> 16;
if ((events ^ prevEvents) & 0x40) {
events = (allActions[0] | allActions[1]) >> 16;
if ((events ^ prevEvents) & 0x40) {
- emu_
changeFastF
orward(events & 0x40);
+ emu_
set_fastf
orward(events & 0x40);
reset_timing = 1;
}
reset_timing = 1;
}
@@
-878,7
+827,7
@@
static void simpleWait(unsigned int until)
sceKernelDelayThread(diff);
}
sceKernelDelayThread(diff);
}
-void
emu_L
oop(void)
+void
pemu_l
oop(void)
{
static int mp3_init_done = 0;
char fpsbuff[24]; // fps count c string
{
static int mp3_init_done = 0;
char fpsbuff[24]; // fps count c string
@@
-923,9
+872,9
@@
void emu_Loop(void)
// prepare sound stuff
PsndOut = NULL;
// prepare sound stuff
PsndOut = NULL;
- if (currentConfig.EmuOpt &
4
)
+ if (currentConfig.EmuOpt &
EOPT_EN_SOUND
)
{
{
-
emu_startSound
();
+
pemu_sound_start
();
}
sceDisplayWaitVblankStart();
}
sceDisplayWaitVblankStart();
@@
-1066,19
+1015,19
@@
void emu_Loop(void)
}
}
- emu_
changeFastF
orward(0);
+ emu_
set_fastf
orward(0);
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
if (PsndOut != NULL) {
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
if (PsndOut != NULL) {
-
emu_endSound
();
+
pemu_sound_stop
();
PsndOut = NULL;
}
// save SRAM
if ((currentConfig.EmuOpt & 1) && SRam.changed) {
emu_msg_cb("Writing SRAM/BRAM..");
PsndOut = NULL;
}
// save SRAM
if ((currentConfig.EmuOpt & 1) && SRam.changed) {
emu_msg_cb("Writing SRAM/BRAM..");
- emu_
SaveLoadG
ame(0, 1);
+ emu_
save_load_g
ame(0, 1);
SRam.changed = 0;
}
SRam.changed = 0;
}
@@
-1086,13
+1035,6
@@
void emu_Loop(void)
memset32_uncached((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4);
}
memset32_uncached((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4);
}
-
-void emu_ResetGame(void)
-{
- PicoReset();
- reset_timing = 1;
-}
-
void emu_HandleResume(void)
{
if (!(PicoAHW & PAHW_MCD)) return;
void emu_HandleResume(void)
{
if (!(PicoAHW & PAHW_MCD)) return;