-// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2007,2008
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
#include <sys/stat.h>
#include <sys/types.h>
#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
int sceAudioOutput2GetRestSample();
-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;
-
-static unsigned int noticeMsgTime = 0;
-int reset_timing = 0; // do we need this?
+//unsigned char *Draw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
+int engineStateSuspend;
+#define PICO_PEN_ADJUST_X 4
+#define PICO_PEN_ADJUST_Y 2
+static int pico_pen_x = 320/2, pico_pen_y = 240/2;
static void sound_init(void);
static void sound_deinit(void);
static void blit2(const char *fps, const char *notice, int lagging_behind);
static void clearArea(int full);
-void emu_noticeMsgUpdated(void)
-{
- noticeMsgTime = sceKernelGetSystemTimeLow();
-}
-
-void emu_getMainDir(char *dst, int len)
+int plat_get_root_dir(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)
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;
}
reset_timing = 1;
}
-static void emu_msg_tray_open(void)
-{
- strcpy(noticeMsg, "CD tray opened");
- noticeMsgTime = sceKernelGetSystemTimeLow();
-}
-
-
+/* FIXME: move to plat */
void emu_Init(void)
{
- // make dirs for saves, cfgs, etc.
- mkdir("mds", 0777);
- mkdir("srm", 0777);
- mkdir("brm", 0777);
- mkdir("cfg", 0777);
-
sound_init();
-
- PicoInit();
- PicoMessage = emu_msg_cb;
- PicoMCDopenTray = emu_msg_tray_open;
- PicoMCDcloseTray = menu_loop_tray;
}
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();
}
-void emu_prepareDefaultConfig(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;
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;
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;
-}
-
extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
+extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
+
+static void (*amips_clut_f)(unsigned short *dst, unsigned char *src, unsigned short *pal, int count) = NULL;
struct Vertex
{
*/
}
-static void do_pal_update(int allow_sh)
+static void do_pal_update(int allow_sh, int allow_as)
{
unsigned int *dpal=(void *)localPal;
int i;
// dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
do_pal_convert(localPal, Pico.cram, currentConfig.gamma, currentConfig.gamma2);
+ Pico.m.dirtyPal = 0;
+ need_pal_upload = 1;
+
if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?
{
// shadowed pixels
localPal[0x80|i]=(unsigned short)t;
}
localPal[0xe0] = 0;
+ localPal[0xf0] = 0x001f;
}
- Pico.m.dirtyPal = 0;
- need_pal_upload = 1;
}
static void do_slowmode_lines(int line_to)
if (!(Pico.video.reg[1]&8)) { line = 8; dst += 512*8; src += 512*8; }
for (; line < line_to; line++, dst+=512, src+=512)
- amips_clut(dst, src, localPal, line_len);
+ amips_clut_f(dst, src, localPal, line_len);
}
static void EmuScanPrepare(void)
{
- HighCol = (unsigned char *)VRAM_CACHED_STUFF + 8;
- if (!(Pico.video.reg[1]&8)) HighCol += 8*512;
+ Pico.est.HighCol = (unsigned char *)VRAM_CACHED_STUFF + 8;
+ if (!(Pico.video.reg[1]&8)) Pico.est.HighCol += 8*512;
+
+ if (dynamic_palette > 0)
+ dynamic_palette--;
- dynamic_palette = 0;
if (Pico.m.dirtyPal)
- do_pal_update(1);
+ do_pal_update(1, 1);
+ if (!(Pico.video.reg[0xC] & 8))
+ amips_clut_f = amips_clut_6bit;
+ else amips_clut_f = amips_clut;
}
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;
+ Pico.est.HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
return 0;
}
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);
- dynamic_palette = 1;
+ dynamic_palette = 3; // last for 2 more frames
}
- do_pal_update(1);
+ do_pal_update(1, 1);
}
if (dynamic_palette) {
int line_len = (Pico.video.reg[12]&1) ? 320 : 256;
void *dst = (char *)VRAM_STUFF + 512*240 + 512*2*num;
- amips_clut(dst, HighCol + 8, localPal, line_len);
+ amips_clut_f(dst, Pico.est.HighCol + 8, localPal, line_len);
}
return 0;
if (dynamic_palette)
{
- if (!blit_16bit_mode) {
+ if (!blit_16bit_mode) { // the current mode is not 16bit
sceGuTexMode(GU_PSM_5650, 0, 0, 0);
sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 512*240);
blit_16bit_mode = 0;
}
- if ((PicoOpt&0x10) && Pico.m.dirtyPal)
- do_pal_update(0);
+ if ((PicoIn.opt&0x10) && Pico.m.dirtyPal)
+ do_pal_update(0, 0);
sceKernelDcacheWritebackAll();
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
}
+static void draw_pico_ptr(void)
+{
+ unsigned char *p = (unsigned char *)VRAM_STUFF + 16;
+
+ // only if pen enabled and for 8bit mode
+ if (pico_inp_mode == 0 || blit_16bit_mode) return;
+
+ p += 512 * (pico_pen_y + PICO_PEN_ADJUST_Y);
+ p += pico_pen_x + PICO_PEN_ADJUST_X;
+ p[ -1] = 0xe0; p[ 0] = 0xf0; p[ 1] = 0xe0;
+ p[ 511] = 0xf0; p[ 512] = 0xf0; p[ 513] = 0xf0;
+ p[1023] = 0xe0; p[1024] = 0xf0; p[1025] = 0xe0;
+}
+
+
#if 0
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
/* called after rendering is done, but frame emulation is not finished */
void blit1(void)
{
- if (PicoOpt&0x10)
+ if (PicoIn.opt&0x10)
{
int i;
unsigned char *pd;
// clear top and bottom trash
- for (pd = PicoDraw2FB+8, i = 8; i > 0; i--, pd += 512)
+ for (pd = Pico.est.Draw2FB+8, i = 8; i > 0; i--, pd += 512)
memset32((int *)pd, 0xe0e0e0e0, 320/4);
- for (pd = PicoDraw2FB+512*232+8, i = 8; i > 0; i--, pd += 512)
+ for (pd = Pico.est.Draw2FB+512*232+8, i = 8; i > 0; i--, pd += 512)
memset32((int *)pd, 0xe0e0e0e0, 320/4);
}
+ if (PicoIn.AHW & PAHW_PICO)
+ draw_pico_ptr();
+
blitscreen_clut();
}
//dbg_text();
- if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+ if ((emu_opt & 0x400) && (PicoIn.AHW & PAHW_MCD))
cd_leds();
if (currentConfig.EmuOpt & 0x2000) { // want vsync
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;
Pico.m.dirtyPal = 1;
blit_16bit_mode = dynamic_palette = 0;
sceGuSync(0,0);
}
+void plat_debug_cat(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 pemu_sound_start(void)
{
static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
int ret, stereo;
samples_made = samples_done = 0;
- if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
+ if (PicoIn.sndRate != PsndRate_old || (PicoIn.opt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
PsndRerate(Pico.m.frame_count ? 1 : 0);
}
- stereo=(PicoOpt&8)>>3;
+ stereo=(PicoIn.opt&8)>>3;
samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
- if (PsndRate <= 22050) samples_block /= 2;
+ if (PicoIn.sndRate <= 22050) samples_block /= 2;
sndBuffer_endptr = &sndBuffer[samples_block*SOUND_BLOCK_COUNT];
lprintf("starting audio: %i, len: %i, stereo: %i, pal: %i, block samples: %i\n",
- PsndRate, PsndLen, stereo, Pico.m.pal, samples_block);
+ PicoIn.sndRate, Pico.snd.len, stereo, Pico.m.pal, samples_block);
// while (sceAudioOutput2GetRestSample() > 0) psp_msleep(100);
// sceAudio_5C37C0AE();
- ret = sceAudio_38553111(samples_block/2, PsndRate, 2); // seems to not need that stupid 64byte alignment
+ ret = sceAudio_38553111(samples_block/2, PicoIn.sndRate, 2); // seems to not need that stupid 64byte alignment
if (ret < 0) {
lprintf("sceAudio_38553111() failed: %i\n", ret);
- sprintf(noticeMsg, "sound init failed (%i), snd disabled", ret);
- noticeMsgTime = sceKernelGetSystemTimeLow();
- currentConfig.EmuOpt &= ~4;
+ emu_status_msg("sound init failed (%i), snd disabled", ret);
+ currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
} else {
- PicoWriteSound = writeSound;
+ PicoIn.writeSound = writeSound;
memset32((int *)(void *)sndBuffer, 0, sizeof(sndBuffer)/4);
snd_playptr = sndBuffer_endptr - samples_block;
samples_made = samples_block; // send 1 empty block first..
- PsndOut = sndBuffer;
- PsndRate_old = PsndRate;
- PicoOpt_old = PicoOpt;
+ PicoIn.sndOut = sndBuffer;
+ PsndRate_old = PicoIn.sndRate;
+ PicoOpt_old = PicoIn.opt;
pal_old = Pico.m.pal;
}
}
-static void sound_end(void)
+void pemu_sound_stop(void)
{
int i;
if (samples_done == 0)
sceAudio_5C37C0AE();
}
+/* wait until we can write more sound */
+void pemu_sound_wait(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;
static void writeSound(int len)
{
int ret;
- if (PicoOpt&8) len<<=1;
- PsndOut += len;
- /*if (PsndOut > sndBuffer_endptr) {
- memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
- PsndOut = &sndBuffer[PsndOut - endptr];
+ PicoIn.sndOut += len / 2;
+ /*if (PicoIn.sndOut > sndBuffer_endptr) {
+ memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PicoIn.sndOut - endptr + 1) / 2);
+ PicoIn.sndOut = &sndBuffer[PicoIn.sndOut - endptr];
lprintf("mov\n");
}
else*/
- if (PsndOut > sndBuffer_endptr) lprintf("snd oflow %i!\n", PsndOut - sndBuffer_endptr);
- if (PsndOut >= sndBuffer_endptr)
- PsndOut = sndBuffer;
+ if (PicoIn.sndOut > sndBuffer_endptr) lprintf("snd oflow %i!\n", PicoIn.sndOut - sndBuffer_endptr);
+ if (PicoIn.sndOut >= sndBuffer_endptr)
+ PicoIn.sndOut = sndBuffer;
// signal the snd thread
- samples_made += len;
+ samples_made += len / 2;
if (samples_made - samples_done > samples_block*2) {
// lprintf("signal, %i/%i\n", samples_done, samples_made);
ret = sceKernelSignalSema(sound_sem, 1);
static void SkipFrame(void)
{
- PicoSkipFrame=1;
+ PicoIn.skipFrame=1;
PicoFrame();
- PicoSkipFrame=0;
+ PicoIn.skipFrame=0;
}
-void emu_forcedFrame(void)
+void pemu_forced_frame(int no_scale, int do_emu)
{
- int po_old = PicoOpt;
+ int po_old = PicoIn.opt;
int eo_old = currentConfig.EmuOpt;
- PicoOpt &= ~0x0010;
- PicoOpt |= 0x4080; // soft_scale | acc_sprites
+ PicoIn.opt &= ~POPT_ALT_RENDERER;
+ PicoIn.opt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoIn.opt |= POPT_EN_SOFTSCALE;
currentConfig.EmuOpt |= 0x80;
vidResetMode();
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();
sceGuSync(0,0);
- PicoOpt = po_old;
+ PicoIn.opt = po_old;
currentConfig.EmuOpt = eo_old;
}
+static void RunEventsPico(unsigned int events, unsigned int keys)
+{
+ emu_RunEventsPico(events);
+
+ if (pico_inp_mode != 0)
+ {
+ PicoIn.pad[0] &= ~0x0f; // release UDLR
+ 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)
+ pico_pen_x = lim-PICO_PEN_ADJUST_X;
+ }
+ PicoPicohw.pen_pos[0] = pico_pen_x;
+ if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;
+ PicoPicohw.pen_pos[0] += 0x3c;
+ PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
+ }
+}
+
static void RunEvents(unsigned int which)
{
if (which & 0x1800) // save or load (but not both)
{
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
{
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);
}
{
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);
}
}
if (which & 0x0400) // switch renderer
{
- if (PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; }
- else { PicoOpt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
+ if (PicoIn.opt&0x10) { PicoIn.opt&=~0x10; currentConfig.EmuOpt |= 0x80; }
+ else { PicoIn.opt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
vidResetMode();
- if (PicoOpt&0x10)
- strcpy(noticeMsg, "fast renderer");
+ if (PicoIn.opt & POPT_ALT_RENDERER)
+ emu_status_msg("fast renderer");
else if (currentConfig.EmuOpt&0x80)
- strcpy(noticeMsg, "accurate renderer");
-
- noticeMsgTime = sceKernelGetSystemTimeLow();
+ emu_status_msg("accurate renderer");
}
if (which & 0x0300)
{
state_slot += 1;
if(state_slot > 9) state_slot = 0;
}
- sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
- noticeMsgTime = sceKernelGetSystemTimeLow();
+ emu_status_msg("SAVE SLOT %i [%s]", state_slot,
+ emu_check_save_file(state_slot) ? "USED" : "FREE");
}
}
static unsigned int prevEvents = 0;
int i;
+ /* FIXME: port to input fw, merge with emu.c:emu_update_input() */
keys = psp_pad_read(0);
if (keys & PSP_CTRL_HOME)
sceDisplayWaitVblankStart();
- if (keys & BTN_SELECT)
+ if (keys & PBTN_SELECT)
engineState = PGS_Menu;
keys &= CONFIGURABLE_KEYS;
- for (i = 0; i < 32; i++)
- {
- if (keys & (1 << i))
- {
- int pl, acts = currentConfig.KeyBinds[i];
- if (!acts) continue;
- pl = (acts >> 16) & 1;
- if (kb_combo_keys & (1 << i))
- {
- int u = i+1, acts_c = acts & kb_combo_acts;
- // let's try to find the other one
- if (acts_c) {
- for (; u < 32; u++)
- if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
- allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
- keys &= ~((1 << i) | (1 << u));
- break;
- }
- }
- // add non-combo actions if combo ones were not found
- if (!acts_c || u == 32)
- allActions[pl] |= acts & ~kb_combo_acts;
- } else {
- allActions[pl] |= acts;
- }
- }
- }
+ PicoIn.pad[0] = allActions[0] & 0xfff;
+ PicoIn.pad[1] = allActions[1] & 0xfff;
- PicoPad[0] = (unsigned short) allActions[0];
- PicoPad[1] = (unsigned short) allActions[1];
+ if (allActions[0] & 0x7000) emu_DoTurbo(&PicoIn.pad[0], allActions[0]);
+ if (allActions[1] & 0x7000) emu_DoTurbo(&PicoIn.pad[1], allActions[1]);
events = (allActions[0] | allActions[1]) >> 16;
+ if ((events ^ prevEvents) & 0x40) {
+ emu_set_fastforward(events & 0x40);
+ reset_timing = 1;
+ }
+
events &= ~prevEvents;
+
+ if (PicoIn.AHW == PAHW_PICO)
+ RunEventsPico(events, keys);
if (events) RunEvents(events);
if (movie_data) emu_updateMovie();
sceKernelDelayThread(diff);
}
-void emu_Loop(void)
+void pemu_loop(void)
{
static int mp3_init_done = 0;
char fpsbuff[24]; // fps count c string
clearArea(1);
Pico.m.dirtyPal = 1;
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
- emu_findKeyBindCombos();
// pal/ntsc might have changed, reset related stuff
target_fps = Pico.m.pal ? 50 : 60;
target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1;
reset_timing = 1;
- if (PicoAHW & PAHW_MCD) {
+ if (PicoIn.AHW & PAHW_MCD) {
// prepare CD buffer
PicoCDBufferInit();
// mp3...
}
// prepare sound stuff
- PsndOut = NULL;
- if (currentConfig.EmuOpt & 4)
+ PicoIn.sndOut = NULL;
+ if (currentConfig.EmuOpt & EOPT_EN_SOUND)
{
- sound_prepare();
+ pemu_sound_start();
}
sceDisplayWaitVblankStart();
updateKeys();
- if (!(PicoOpt&0x10))
+ if (!(PicoIn.opt&0x10))
EmuScanPrepare();
PicoFrame();
}
- if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+ emu_set_fastforward(0);
+
+ if (PicoIn.AHW & PAHW_MCD) PicoCDBufferFree();
- if (PsndOut != NULL) {
- PsndOut = NULL;
- sound_end();
+ if (PicoIn.sndOut != NULL) {
+ pemu_sound_stop();
+ PicoIn.sndOut = NULL;
}
// 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;
}
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;
+ if (!(PicoIn.AHW & 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 = rom_fname_reload;
+ int len = strlen(rom_fname_reload);
+ cue_data_t *cue_data = NULL;
+
+ if (len > 4 && strcasecmp(fname + len - 4, ".cue") == 0)
+ {
+ cue_data = cue_parse(rom_fname_reload);
+ 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();
}
notaz.gp2x.de / picodrive.git / blobdiff