// main 300K gfx-related buffer. Used by menu and renderers.
unsigned char gfx_buffer[321*240*2*2];
-unsigned char *PicoDraw2FB = gfx_buffer; // temporary buffer for alt renderer ( (8+320)*(8+240+8) )
static short *snd_cbuff = NULL;
static int snd_cbuf_samples = 0, snd_all_samples = 0;
void pemu_prep_defconfig(void)
{
- memset(&defaultConfig, 0, sizeof(defaultConfig));
- defaultConfig.EmuOpt = 0x1d | 0x680; // | confirm_save, cd_leds, 16bit rend
- defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;
defaultConfig.s_PsndRate = 22050;
- defaultConfig.s_PicoRegion = 0; // auto
- defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
defaultConfig.s_PicoCDBuffers = 0;
- defaultConfig.Frameskip = -1; // auto
- defaultConfig.volume = 50;
defaultConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU
defaultConfig.KeyBinds[ 3] = 1<<1;
defaultConfig.KeyBinds[ 0] = 1<<2;
defaultConfig.KeyBinds[12] = 1<<29; // vol up
defaultConfig.KeyBinds[11] = 1<<30; // vol down
defaultConfig.scaling = 0;
- defaultConfig.turbo_rate = 15;
}
static int EmuScanBegin16(unsigned int num)
{
- DrawLineDest = (unsigned short *) giz_screen + 321 * num;
+ Pico.est.DrawLineDest = (unsigned short *) giz_screen + 321 * num;
if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
return 1; // skip next line
static int EmuScanBegin8(unsigned int num)
{
// draw like the fast renderer
- HighCol = gfx_buffer + 328 * num;
+ Pico.est.HighCol = gfx_buffer + 328 * num;
return 0;
}
emu_text_out16(x, y, text);
}
-/*
-void log1(void *p1, void *p2)
-{
- lprintf("%p %p %p\n", p1, p2, DrawLineDest);
-}
-*/
-
static void cd_leds(void)
{
static int old_reg = 0;
{
int emu_opt = currentConfig.EmuOpt;
- if (PicoOpt&0x10)
+ if (PicoIn.opt&0x10)
{
int lines_flags = 224;
// 8bit fast renderer
vidConvCpyRGB565(localPal, Pico.cram, 0x40);
}
// a hack for VR
- if (PicoAHW & PAHW_SVP)
- memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
+ if (PicoIn.AHW & PAHW_SVP)
+ memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
- vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
+ vidCpy8to16((unsigned short *)giz_screen+321*8, Pico.est.Draw2FB+328*8, localPal, lines_flags);
}
else if (!(emu_opt&0x80))
{
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
- vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
+ vidCpy8to16((unsigned short *)giz_screen+321*8, Pico.est.Draw2FB+328*8, localPal, lines_flags);
}
if (notice || (emu_opt & 2)) {
if (emu_opt & 2) osd_text(OSD_FPS_X, h, fps);
}
- if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+ if ((emu_opt & 0x400) && (PicoIn.AHW & PAHW_MCD))
cd_leds();
}
{
giz_screen = fb_lock(1);
- if (PicoOpt&0x10) {
+ if (PicoIn.opt&0x10) {
} else if (currentConfig.EmuOpt&0x80) {
- PicoDrawSetColorFormat(1);
- PicoScanBegin = EmuScanBegin16;
+ PicoDrawSetOutFormat(PDF_RGB555, 0);
+ PicoDrawSetCallbacks(EmuScanBegin16, NULL);
} else {
- PicoDrawSetColorFormat(-1);
- PicoScanBegin = EmuScanBegin8;
+ PicoDrawSetOutFormat(PDF_NONE, 0);
+ PicoDrawSetCallbacks(EmuScanBegin8, NULL);
}
- if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
+ if ((PicoIn.opt&0x10) || !(currentConfig.EmuOpt&0x80)) {
// setup pal for 8-bit modes
localPal[0xc0] = 0x0600;
localPal[0xd0] = 0xc000;
static void updateSound(int len)
{
- if (PicoOpt&8) len<<=1;
-
- snd_all_samples += len;
- PsndOut += len;
- if (PsndOut - snd_cbuff >= snd_cbuf_samples)
+ snd_all_samples += len / 2;
+ PicoIn.sndOut += len / 2;
+ if (PicoIn.sndOut - snd_cbuff >= snd_cbuf_samples)
{
- //if (PsndOut - snd_cbuff != snd_cbuf_samples)
- // stdbg("snd diff is %i, not %i", PsndOut - snd_cbuff, snd_cbuf_samples);
- PsndOut = snd_cbuff;
+ //if (PicoIn.sndOut - snd_cbuff != snd_cbuf_samples)
+ // stdbg("snd diff is %i, not %i", PicoIn.sndOut - snd_cbuff, snd_cbuf_samples);
+ PicoIn.sndOut = snd_cbuff;
}
}
static void SkipFrame(void)
{
- PicoSkipFrame=1;
+ PicoIn.skipFrame=1;
PicoFrame();
- PicoSkipFrame=0;
+ PicoIn.skipFrame=0;
}
/* forced frame to front buffer */
-void pemu_forced_frame(int opts)
+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 &= ~0x10;
- PicoOpt |= opts|POPT_ACC_SPRITES;
+ PicoIn.opt &= ~0x10;
+ PicoIn.opt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoIn.opt |= POPT_EN_SOFTSCALE;
currentConfig.EmuOpt |= 0x80;
if (giz_screen == NULL)
giz_screen = fb_lock(1);
- PicoDrawSetColorFormat(1);
- PicoScanBegin = EmuScanBegin16;
+ PicoDrawSetOutFormat(PDF_RGB555, 0);
+ PicoDrawSetCallbacks(EmuScanBegin16, NULL);
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();
fb_unlock();
giz_screen = NULL;
- PicoOpt = po_old;
+ PicoIn.opt = po_old;
currentConfig.EmuOpt = eo_old;
}
{
int do_it = 1;
- if (PsndOut != NULL)
+ if (PicoIn.sndOut != NULL)
FrameworkAudio_SetPause(1);
if (giz_screen == NULL)
giz_screen = fb_lock(1);
Sleep(0);
}
- if (PsndOut != NULL)
+ if (PicoIn.sndOut != NULL)
FrameworkAudio_SetPause(0);
reset_timing = 1;
}
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) {
+ if (PicoIn.opt&0x10) {
strcpy(noticeMsg, " 8bit fast renderer");
} else if (currentConfig.EmuOpt&0x80) {
strcpy(noticeMsg, "16bit accurate renderer");
keys &= CONFIGURABLE_KEYS;
- PicoPad[0] = allActions[0] & 0xfff;
- PicoPad[1] = allActions[1] & 0xfff;
+ PicoIn.pad[0] = allActions[0] & 0xfff;
+ PicoIn.pad[1] = allActions[1] & 0xfff;
- if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
- if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], 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;
// volume is treated in special way and triggered every frame
- if ((events & 0x6000) && PsndOut != NULL)
+ if ((events & 0x6000) && PicoIn.sndOut != NULL)
{
int vol = currentConfig.volume;
if (events & 0x2000) {
// make sure we are in correct mode
vidResetMode();
- if (currentConfig.scaling) PicoOpt|=0x4000;
- else PicoOpt&=~0x4000;
+ if (currentConfig.scaling) PicoIn.opt|=0x4000;
+ else PicoIn.opt&=~0x4000;
Pico.m.dirtyPal = 1;
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
reset_timing = 1;
// prepare CD buffer
- if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
+ if (PicoIn.AHW & PAHW_MCD) PicoCDBufferInit();
// prepare sound stuff
- PsndOut = NULL;
+ PicoIn.sndOut = NULL;
if (currentConfig.EmuOpt & 4)
{
int ret, snd_excess_add, stereo;
- 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;
- snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
- snd_cbuf_samples = (PsndRate<<stereo) * 16 / target_fps;
+ stereo=(PicoIn.opt&8)>>3;
+ snd_excess_add = ((PicoIn.sndRate - Pico.snd.len*target_fps)<<16) / target_fps;
+ snd_cbuf_samples = (PicoIn.sndRate<<stereo) * 16 / target_fps;
lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
- PsndRate, PsndLen, snd_excess_add, stereo, Pico.m.pal);
- ret = FrameworkAudio_Init(PsndRate, snd_cbuf_samples, stereo);
+ PicoIn.sndRate, Pico.snd.len, snd_excess_add, stereo, Pico.m.pal);
+ ret = FrameworkAudio_Init(PicoIn.sndRate, snd_cbuf_samples, stereo);
if (ret != 0) {
lprintf("FrameworkAudio_Init() failed: %i\n", ret);
sprintf(noticeMsg, "sound init failed (%i), snd disabled", ret);
currentConfig.EmuOpt &= ~4;
} else {
FrameworkAudio_SetVolume(currentConfig.volume, currentConfig.volume);
- PicoWriteSound = updateSound;
+ PicoIn.writeSound = updateSound;
snd_cbuff = FrameworkAudio_56448Buffer();
- PsndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle
+ PicoIn.sndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle
snd_all_samples = 0;
- PsndRate_old = PsndRate;
- PicoOpt_old = PicoOpt;
+ PsndRate_old = PicoIn.sndRate;
+ PicoOpt_old = PicoIn.opt;
pal_old = Pico.m.pal;
}
}
//tval_thissec += 1000;
tval_thissec += sec_ms;
- if (PsndOut != NULL)
+ if (PicoIn.sndOut != NULL)
{
/* some code which tries to sync things to audio clock, the dirty way */
static int audio_skew_prev = 0;
int audio_skew, adj, co = 9, shift = 7;
audio_skew = snd_all_samples*2 - FrameworkAudio_BufferPos();
- if (PsndRate == 22050) co = 10;
- if (PsndRate > 22050) co = 11;
- if (PicoOpt&8) shift++;
+ if (PicoIn.sndRate == 22050) co = 10;
+ if (PicoIn.sndRate > 22050) co = 11;
+ if (PicoIn.opt&8) shift++;
if (audio_skew < 0) {
adj = -((-audio_skew) >> shift);
if (audio_skew > -(6<<co)) adj>>=1;
for (i = 0; i < currentConfig.Frameskip; i++) {
updateKeys();
SkipFrame(); frames_done++;
- if (PsndOut) { // do framelimitting if sound is enabled
+ if (PicoIn.sndOut) { // do framelimitting if sound is enabled
int tval_diff;
tval = GetTickCount();
tval_diff = (int)(tval - tval_thissec) << 8;
if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300<<8)) // slowdown detection
reset_timing = 1;
- else if (PsndOut != NULL || currentConfig.Frameskip < 0)
+ else if (PicoIn.sndOut != NULL || currentConfig.Frameskip < 0)
{
// sleep if we are still too fast
if (tval_diff < lim_time)
}
- if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+ if (PicoIn.AHW & PAHW_MCD) PicoCDBufferFree();
- if (PsndOut != NULL) {
- PsndOut = snd_cbuff = NULL;
+ if (PicoIn.sndOut != NULL) {
+ PicoIn.sndOut = snd_cbuff = NULL;
FrameworkAudio_Close();
}
notaz.gp2x.de / picodrive.git / blobdiff