#include "../common/emu.h"
#include "../common/config.h"
#include "../common/lprintf.h"
-#include "../../Pico/PicoInt.h"
+#include <pico/pico_int.h>
+#include <pico/cd/cue.h>
#define OSD_FPS_X 432
char romFileName[PATH_MAX];
unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
-int engineState = PGS_Menu;
+int engineState = PGS_Menu, engineStateSuspend;
static unsigned int noticeMsgTime = 0;
int reset_timing = 0; // do we need this?
noticeMsgTime = sceKernelGetSystemTimeLow();
}
-void emu_getMainDir(char *dst, int len)
+int emu_getMainDir(char *dst, int len)
{
if (len > 0) *dst = 0;
+ return 0;
}
static void osd_text(int x, const char *text, int is_active, int clear_all)
defaultConfig.scale = 1.20; // fullscreen
defaultConfig.hscale40 = 1.25;
defaultConfig.hscale32 = 1.56;
-}
-
-void emu_setDefaultConfig(void)
-{
- memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));
- PicoOpt = currentConfig.s_PicoOpt;
- PsndRate = currentConfig.s_PsndRate;
- PicoRegionOverride = currentConfig.s_PicoRegion;
- PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
- PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+ defaultConfig.turbo_rate = 15;
}
localPal[0xe0] = 0;
localPal[0xf0] = 0x001f;
}
- else if (allow_as && (rendstatus & PDRAW_ACC_SPRITES))
+ else if (allow_as && (rendstatus & PDRAW_SPR_LO_ON_HI))
{
- memcpy32((int *)(void *)(localPal+0x80), (void *)localPal, 0x40/2);
+ memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
}
}
HighCol = (unsigned char *)VRAM_CACHED_STUFF + 8;
if (!(Pico.video.reg[1]&8)) HighCol += 8*512;
- dynamic_palette = 0;
+ if (dynamic_palette > 0)
+ dynamic_palette--;
+
if (Pico.m.dirtyPal)
do_pal_update(1, 1);
- if ((rendstatus & PDRAW_ACC_SPRITES) && !(Pico.video.reg[0xC]&8))
+ if ((rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
amips_clut_f = amips_clut_6bit;
else amips_clut_f = amips_clut;
}
if (Pico.m.dirtyPal) {
if (!dynamic_palette) {
do_slowmode_lines(num);
- dynamic_palette = 1;
+ dynamic_palette = 3; // last for 2 more frames
}
- do_pal_update(1, 0);
+ do_pal_update(1, 1);
}
if (dynamic_palette) {
sceGuSync(0,0);
}
+void emu_platformDebugCat(char *str)
+{
+ strcat(str, blit_16bit_mode ? "soft clut\n" : "hard clut\n");
+}
+
/* sound stuff */
#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
lprintf("sceKernelCreateThread failed: %i\n", thid);
}
-static void sound_prepare(void)
+void emu_startSound(void)
{
static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
int ret, stereo;
}
}
-static void sound_end(void)
+void emu_endSound(void)
{
int i;
if (samples_done == 0)
sceAudio_5C37C0AE();
}
+/* wait until we can write more sound */
+void emu_waitSound(void)
+{
+ // TODO: test this
+ while (!sound_thread_exit && samples_made - samples_done > samples_block * 4)
+ psp_msleep(10);
+}
+
static void sound_deinit(void)
{
sound_thread_exit = 1;
if (pico_inp_mode != 0)
{
PicoPad[0] &= ~0x0f; // release UDLR
- if (keys & BTN_UP) { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
- if (keys & BTN_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; }
- if (keys & BTN_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }
- if (keys & BTN_RIGHT) {
+ if (keys & PBTN_UP) { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
+ if (keys & PBTN_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; }
+ if (keys & PBTN_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }
+ if (keys & PBTN_RIGHT) {
int lim = (Pico.video.reg[12]&1) ? 319 : 255;
pico_pen_x++;
if (pico_pen_x > lim-PICO_PEN_ADJUST_X)
int keys;
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)) )
+ while( !((keys = psp_pad_read(1)) & (PBTN_X|PBTN_CIRCLE)) )
psp_msleep(50);
- if (keys & BTN_CIRCLE) do_it = 0;
- while( ((keys = psp_pad_read(1)) & (BTN_X|BTN_CIRCLE)) ) // wait for release
+ if (keys & PBTN_CIRCLE) do_it = 0;
+ while( ((keys = psp_pad_read(1)) & (PBTN_X|PBTN_CIRCLE)) ) // wait for release
psp_msleep(50);
clearArea(0);
}
if (keys & PSP_CTRL_HOME)
sceDisplayWaitVblankStart();
- if (keys & BTN_SELECT)
+ if (keys & PBTN_SELECT)
engineState = PGS_Menu;
keys &= CONFIGURABLE_KEYS;
}
}
- PicoPad[0] = (unsigned short) allActions[0];
- PicoPad[1] = (unsigned short) allActions[1];
+ PicoPad[0] = allActions[0] & 0xfff;
+ PicoPad[1] = allActions[1] & 0xfff;
+
+ if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
+ if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]);
events = (allActions[0] | allActions[1]) >> 16;
PsndOut = NULL;
if (currentConfig.EmuOpt & 4)
{
- sound_prepare();
+ emu_startSound();
}
sceDisplayWaitVblankStart();
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
if (PsndOut != NULL) {
+ emu_endSound();
PsndOut = NULL;
- sound_end();
}
// save SRAM
{
if (!(PicoAHW & PAHW_MCD)) return;
- // reopen files..
+ // reopen first CD track
if (Pico_mcd->TOC.Tracks[0].F != NULL)
{
- lprintf("emu_HandleResume: reopen %s\n", romFileName);
+ char *fname = romFileName;
+ int len = strlen(romFileName);
+ cue_data_t *cue_data = NULL;
+
+ if (len > 4 && strcasecmp(fname + len - 4, ".cue") == 0)
+ {
+ cue_data = cue_parse(romFileName);
+ if (cue_data != NULL)
+ fname = cue_data->tracks[1].fname;
+ }
+
+ lprintf("emu_HandleResume: reopen %s\n", fname);
pm_close(Pico_mcd->TOC.Tracks[0].F);
- Pico_mcd->TOC.Tracks[0].F = pm_open(romFileName);
+ Pico_mcd->TOC.Tracks[0].F = pm_open(fname);
lprintf("reopen %s\n", Pico_mcd->TOC.Tracks[0].F != NULL ? "ok" : "failed");
+
+ if (cue_data != NULL) cue_destroy(cue_data);
}
mp3_reopen_file();
+
+ if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
+ cdda_start_play();
}