#include "../common/lprintf.h"
#include "../../Pico/PicoInt.h"
-#define OSD_FPS_X 420
+#define OSD_FPS_X 424
// additional pspaudio imports, credits to crazyc
int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown); // play with conversion?
static void sound_init(void);
static void sound_deinit(void);
-static void blit2(const char *fps, const char *notice);
+static void blit2(const char *fps, const char *notice, int lagging_behind);
static void clearArea(int full);
void emu_noticeMsgUpdated(void)
currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
currentConfig.Frameskip = -1; // auto
currentConfig.volume = 50;
- currentConfig.CPUclock = 222;
+ currentConfig.CPUclock = 333;
currentConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
currentConfig.KeyBinds[ 6] = 1<<1;
currentConfig.KeyBinds[ 7] = 1<<2;
currentConfig.KeyBinds[12] = 1<<26; // switch rnd
currentConfig.KeyBinds[ 8] = 1<<27; // save state
currentConfig.KeyBinds[ 9] = 1<<28; // load state
+ currentConfig.KeyBinds[28] = 1<<0; // num "buttons"
+ currentConfig.KeyBinds[30] = 1<<1;
+ currentConfig.KeyBinds[31] = 1<<2;
+ currentConfig.KeyBinds[29] = 1<<3;
currentConfig.PicoCDBuffers = 0;
- currentConfig.scaling = 1; // bilinear filtering for psp
- currentConfig.scale = currentConfig.hscale32 = currentConfig.hscale40 = 1.0;
+ currentConfig.scaling = 1; // bilinear filtering for psp
+ currentConfig.scale = 1.20; // fullscreen
+ currentConfig.hscale40 = 1.25;
+ currentConfig.hscale32 = 1.56;
}
static void cd_leds(void)
{
- static int old_reg = 0;
- unsigned int col_g, col_r, *p;
+ unsigned int reg, col_g, col_r, *p;
- if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change
- old_reg = Pico_mcd->s68k_regs[0];
+ reg = Pico_mcd->s68k_regs[0];
p = (unsigned int *)((short *)psp_screen + 512*2+4+2);
- col_g = (old_reg & 2) ? 0x06000600 : 0;
- col_r = (old_reg & 1) ? 0xc000c000 : 0;
+ col_g = (reg & 2) ? 0x06000600 : 0;
+ col_r = (reg & 1) ? 0x00180018 : 0;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
}
-static void blit2(const char *fps, const char *notice)
+static void blit2(const char *fps, const char *notice, int lagging_behind)
{
- int emu_opt = currentConfig.EmuOpt;
-
- sceGuSync(0,0);
+ int vsync = 0, emu_opt = currentConfig.EmuOpt;
if (notice || (emu_opt & 2)) {
if (notice) osd_text(4, notice, 0);
if ((emu_opt & 0x400) && (PicoMCD & 1))
cd_leds();
- psp_video_flip(0);
+ if (currentConfig.EmuOpt & 0x2000) { // want vsync
+ if (!(currentConfig.EmuOpt & 0x10000) || !lagging_behind) vsync = 1;
+ }
+
+ psp_video_flip(vsync);
}
// clears whole screen or just the notice area (in all buffers)
/* sound stuff */
#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
#define SOUND_BLOCK_SIZE_PAL (1764*2)
-#define SOUND_BLOCK_COUNT 4
+#define SOUND_BLOCK_COUNT 8
static short __attribute__((aligned(4))) sndBuffer[SOUND_BLOCK_SIZE_PAL*SOUND_BLOCK_COUNT + 44100/50*2];
static short *snd_playptr = NULL, *sndBuffer_endptr = NULL;
static int sound_thread(SceSize args, void *argp)
{
- int ret;
+ int ret = 0;
lprintf("sthr: started, priority %i\n", sceKernelGetThreadCurrentPriority());
{
if (samples_made - samples_done < samples_block) {
// wait for data (use at least 2 blocks)
- //lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
+ lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
while (samples_made - samples_done <= samples_block*2 && !sound_thread_exit)
ret = sceKernelWaitSema(sound_sem, 1, 0);
- //lprintf("sthr: sceKernelWaitSema: %i\n", ret);
+ if (ret < 0) lprintf("sthr: sceKernelWaitSema: %i\n", ret);
continue;
}
- //lprintf("sthr: got data: %i\n", samples_made - samples_done);
+ // lprintf("sthr: got data: %i\n", samples_made - samples_done);
ret = sceAudio_E0727056(PSP_AUDIO_VOLUME_MAX, snd_playptr);
// shouln't happen, but just in case
if (samples_made - samples_done >= samples_block*3) {
- //lprintf("block skip (%i)\n", samples_made - samples_done);
+ lprintf("sthr: block skip (%i)\n", samples_made - samples_done);
samples_done += samples_block; // skip
snd_playptr += samples_block;
}
lprintf("mov\n");
}
else*/
+ if (PsndOut > sndBuffer_endptr) lprintf("snd oflow %i!\n", PsndOut - sndBuffer_endptr);
if (PsndOut >= sndBuffer_endptr)
PsndOut = sndBuffer;
if (samples_made - samples_done > samples_block*2) {
// lprintf("signal, %i/%i\n", samples_done, samples_made);
ret = sceKernelSignalSema(sound_sem, 1);
- // lprintf("signal ret %i\n", ret);
+ //if (ret < 0) lprintf("snd signal ret %08x\n", ret);
}
}
(!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
{
int keys;
- blit2("", (which & 0x1000) ? "LOAD STATE? (X=yes, O=no)" : "OVERWRITE SAVE? (X=yes, O=no)");
+ sceGuSync(0,0);
+ blit2("", (which & 0x1000) ? "LOAD STATE? (X=yes, O=no)" : "OVERWRITE SAVE? (X=yes, O=no)", 0);
while( !((keys = psp_pad_read(1)) & (BTN_X|BTN_CIRCLE)) )
psp_msleep(50);
if (keys & BTN_CIRCLE) do_it = 0;
combo_keys = combo_acts = 0;
for (act = 0; act < 32; act++)
{
- int keyc = 0;
+ int keyc = 0, keyc2 = 0;
if (act == 16 || act == 17) continue; // player2 flag
- for (u = 0; u < 32; u++)
+ if (act > 17)
{
- if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+ for (u = 0; u < 28; u++) // 28 because nub can't produce combos
+ if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
}
- if (keyc > 1)
+ else
+ {
+ for (u = 0; u < 28; u++)
+ if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
+ (currentConfig.KeyBinds[u] & (1 << act))) keyc++;
+ for (u = 0; u < 28; u++)
+ if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
+ (currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
+ }
+ if (keyc > 1 || keyc2 > 1)
{
// loop again and mark those keys and actions as combo
- for (u = 0; u < 32; u++)
+ for (u = 0; u < 28; u++)
{
if (currentConfig.KeyBinds[u] & (1 << act)) {
combo_keys |= 1 << u;
sound_prepare();
}
+ sceDisplayWaitVblankStart();
+
// loop?
while (engineState == PGS_Running)
{
PicoFrame();
- blit2(fpsbuff, notice);
+ sceGuSync(0,0);
// check time
tval = sceKernelGetSystemTimeLow();
tval_diff = (int)(tval - tval_thissec) << 8;
+ blit2(fpsbuff, notice, tval_diff > lim_time);
+
if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection
reset_timing = 1;
else if (PsndOut != NULL || currentConfig.Frameskip < 0)