X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=311a7ecf074cb2de221cca343051923c4f14e62b;hb=902972d1c7f353aebb17a5ab587b2526e1a45d60;hp=9e299eacf8ab3d4de61ba5de15a1f31d8695256f;hpb=93c18cb44bf9794c7c9bc93411c68880723320d1;p=libpicofe.git diff --git a/psp/emu.c b/psp/emu.c index 9e299ea..311a7ec 100644 --- a/psp/emu.c +++ b/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; -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; @@ -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); -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; @@ -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 - emu_textOut16(x, 264, text); + emu_text_out16(x, 264, text); if (is_active) psp_screen = tmp; } @@ -102,14 +89,8 @@ void emu_Deinit(void) void pemu_prep_defconfig(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_PicoRegion = 0; // auto - defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP defaultConfig.s_PicoCDBuffers = 64; - defaultConfig.Frameskip = -1; // auto defaultConfig.CPUclock = 333; defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU defaultConfig.KeyBinds[ 6] = 1<<1; @@ -130,7 +111,6 @@ void pemu_prep_defconfig(void) defaultConfig.scale = 1.20; // fullscreen defaultConfig.hscale40 = 1.25; defaultConfig.hscale32 = 1.56; - defaultConfig.turbo_rate = 15; } @@ -274,8 +254,6 @@ static void EmuScanPrepare(void) 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; @@ -284,8 +262,6 @@ static int EmuScanSlowBegin(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); @@ -409,7 +385,7 @@ static void dbg_text(void) p = (int *) ((int)p & ~3); // align memset32_uncached(p, 0, len); } - emu_textOut16(2, 256, text); + emu_text_out16(2, 256, text); } #endif @@ -489,9 +465,8 @@ static void vidResetMode(void) sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 16); // slow rend. - PicoDrawSetColorFormat(-1); - PicoScanBegin = EmuScanSlowBegin; - PicoScanEnd = EmuScanSlowEnd; + PicoDrawSetOutFormat(PDF_NONE, 0); + PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd); localPal[0xe0] = 0; localPal[0xf0] = 0x001f; @@ -610,7 +585,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); - 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; @@ -692,13 +667,15 @@ static void SkipFrame(void) PicoSkipFrame=0; } -void pemu_forced_frame(int opts) +void pemu_forced_frame(int no_scale, int do_emu) { int po_old = PicoOpt; int eo_old = currentConfig.EmuOpt; - PicoOpt &= ~0x10; - PicoOpt |= opts|POPT_ACC_SPRITES; + PicoOpt &= ~POPT_ALT_RENDERER; + PicoOpt |= POPT_ACC_SPRITES; + if (!no_scale) + PicoOpt |= POPT_EN_SOFTSCALE; currentConfig.EmuOpt |= 0x80; vidResetMode(); @@ -706,9 +683,8 @@ void pemu_forced_frame(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); - PicoDrawSetColorFormat(-1); - PicoScanBegin = EmuScanSlowBegin; - PicoScanEnd = EmuScanSlowEnd; + PicoDrawSetOutFormat(PDF_NONE, 0); + PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd); EmuScanPrepare(); PicoFrameDrawOnly(); blit1(); @@ -748,7 +724,7 @@ static void RunEvents(unsigned int which) { int do_it = 1; - if ( emu_checkSaveFile(state_slot) && + if ( emu_check_save_file(state_slot) && (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save { @@ -767,7 +743,7 @@ static void RunEvents(unsigned int which) { osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0); PicoStateProgressCB = emu_msg_cb; - emu_SaveLoadGame((which & 0x1000) >> 12, 0); + emu_save_load_game((which & 0x1000) >> 12, 0); PicoStateProgressCB = NULL; psp_msleep(0); } @@ -782,9 +758,9 @@ static void RunEvents(unsigned int which) vidResetMode(); if (PicoOpt & POPT_ALT_RENDERER) - plat_status_msg("fast renderer"); + emu_status_msg("fast renderer"); else if (currentConfig.EmuOpt&0x80) - plat_status_msg("accurate renderer"); + emu_status_msg("accurate renderer"); } if (which & 0x0300) { @@ -795,8 +771,8 @@ static void RunEvents(unsigned int which) state_slot += 1; if(state_slot > 9) state_slot = 0; } - plat_status_msg("SAVE SLOT %i [%s]", state_slot, - emu_checkSaveFile(state_slot) ? "USED" : "FREE"); + emu_status_msg("SAVE SLOT %i [%s]", state_slot, + emu_check_save_file(state_slot) ? "USED" : "FREE"); } } @@ -825,7 +801,7 @@ static void updateKeys(void) events = (allActions[0] | allActions[1]) >> 16; if ((events ^ prevEvents) & 0x40) { - emu_changeFastForward(events & 0x40); + emu_set_fastforward(events & 0x40); reset_timing = 1; } @@ -1039,7 +1015,7 @@ void pemu_loop(void) } - emu_changeFastForward(0); + emu_set_fastforward(0); if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); @@ -1051,7 +1027,7 @@ void pemu_loop(void) // save SRAM if ((currentConfig.EmuOpt & 1) && SRam.changed) { emu_msg_cb("Writing SRAM/BRAM.."); - emu_SaveLoadGame(0, 1); + emu_save_load_game(0, 1); SRam.changed = 0; }