notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move more globals to PicoInterface
[picodrive.git]
/
platform
/
psp
/
emu.c
diff --git
a/platform/psp/emu.c
b/platform/psp/emu.c
index
5eca789
..
0656f58
100644
(file)
--- a/
platform/psp/emu.c
+++ b/
platform/psp/emu.c
@@
-1,7
+1,10
@@
-// (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 <sys/stat.h>
#include <sys/types.h>
@@
-33,7
+36,7
@@
int sceAudio_E0727056(int volume, void *buffer); // blocking output
int sceAudioOutput2GetRestSample();
int sceAudioOutput2GetRestSample();
-
unsigned char *Pico
Draw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
+
//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
int engineStateSuspend;
#define PICO_PEN_ADJUST_X 4
@@
-89,14
+92,8
@@
void emu_Deinit(void)
void pemu_prep_defconfig(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_PsndRate = 22050;
- defaultConfig.s_PicoRegion = 0; // auto
- defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
defaultConfig.s_PicoCDBuffers = 64;
defaultConfig.s_PicoCDBuffers = 64;
- defaultConfig.Frameskip = -1; // auto
defaultConfig.CPUclock = 333;
defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
defaultConfig.KeyBinds[ 6] = 1<<1;
defaultConfig.CPUclock = 333;
defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
defaultConfig.KeyBinds[ 6] = 1<<1;
@@
-117,7
+114,6
@@
void pemu_prep_defconfig(void)
defaultConfig.scale = 1.20; // fullscreen
defaultConfig.hscale40 = 1.25;
defaultConfig.hscale32 = 1.56;
defaultConfig.scale = 1.20; // fullscreen
defaultConfig.hscale40 = 1.25;
defaultConfig.hscale32 = 1.56;
- defaultConfig.turbo_rate = 15;
}
}
@@
-227,9
+223,9
@@
static void do_pal_update(int allow_sh, int allow_as)
localPal[0xe0] = 0;
localPal[0xf0] = 0x001f;
}
localPal[0xe0] = 0;
localPal[0xf0] = 0x001f;
}
- else if (allow_as && (rendstatus & PDRAW_SPR_LO_ON_HI))
+ else if (allow_as && (
Pico.est.
rendstatus & PDRAW_SPR_LO_ON_HI))
{
{
- memcpy
32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4
);
+ memcpy
(dpal + 0x80/2, localPal, 0x40*2
);
}
}
}
}
@@
-246,15
+242,15
@@
static void do_slowmode_lines(int line_to)
static void EmuScanPrepare(void)
{
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--;
if (Pico.m.dirtyPal)
do_pal_update(1, 1);
if (dynamic_palette > 0)
dynamic_palette--;
if (Pico.m.dirtyPal)
do_pal_update(1, 1);
- if ((rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
+ if ((
Pico.est.
rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
amips_clut_f = amips_clut_6bit;
else amips_clut_f = amips_clut;
}
amips_clut_f = amips_clut_6bit;
else amips_clut_f = amips_clut;
}
@@
-262,7
+258,7
@@
static void EmuScanPrepare(void)
static int EmuScanSlowBegin(unsigned int num)
{
if (!dynamic_palette)
static int EmuScanSlowBegin(unsigned int num)
{
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;
}
return 0;
}
@@
-280,7
+276,7
@@
static int EmuScanSlowEnd(unsigned int num)
if (dynamic_palette) {
int line_len = (Pico.video.reg[12]&1) ? 320 : 256;
void *dst = (char *)VRAM_STUFF + 512*240 + 512*2*num;
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_f(dst, HighCol + 8, localPal, line_len);
+ amips_clut_f(dst,
Pico.est.
HighCol + 8, localPal, line_len);
}
return 0;
}
return 0;
@@
-313,7
+309,7
@@
static void blitscreen_clut(void)
blit_16bit_mode = 0;
}
blit_16bit_mode = 0;
}
- if ((Pico
O
pt&0x10) && Pico.m.dirtyPal)
+ if ((Pico
In.o
pt&0x10) && Pico.m.dirtyPal)
do_pal_update(0, 0);
sceKernelDcacheWritebackAll();
do_pal_update(0, 0);
sceKernelDcacheWritebackAll();
@@
-399,18
+395,18
@@
static void dbg_text(void)
/* called after rendering is done, but frame emulation is not finished */
void blit1(void)
{
/* called after rendering is done, but frame emulation is not finished */
void blit1(void)
{
- if (Pico
O
pt&0x10)
+ if (Pico
In.o
pt&0x10)
{
int i;
unsigned char *pd;
// clear top and bottom trash
{
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);
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);
}
memset32((int *)pd, 0xe0e0e0e0, 320/4);
}
- if (PicoAHW & PAHW_PICO)
+ if (Pico
In.
AHW & PAHW_PICO)
draw_pico_ptr();
blitscreen_clut();
draw_pico_ptr();
blitscreen_clut();
@@
-428,7
+424,7
@@
static void blit2(const char *fps, const char *notice, int lagging_behind)
//dbg_text();
//dbg_text();
- if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+ if ((emu_opt & 0x400) && (Pico
In.
AHW & PAHW_MCD))
cd_leds();
if (currentConfig.EmuOpt & 0x2000) { // want vsync
cd_leds();
if (currentConfig.EmuOpt & 0x2000) { // want vsync
@@
-472,9
+468,8
@@
static void vidResetMode(void)
sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 16);
// slow rend.
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;
localPal[0xe0] = 0;
localPal[0xf0] = 0x001f;
@@
-576,33
+571,33
@@
void pemu_sound_start(void)
samples_made = samples_done = 0;
samples_made = samples_done = 0;
- if (P
sndRate != PsndRate_old || (PicoO
pt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
+ if (P
icoIn.sndRate != PsndRate_old || (PicoIn.o
pt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
PsndRerate(Pico.m.frame_count ? 1 : 0);
}
PsndRerate(Pico.m.frame_count ? 1 : 0);
}
- stereo=(Pico
O
pt&8)>>3;
+ stereo=(Pico
In.o
pt&8)>>3;
samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
- if (PsndRate <= 22050) samples_block /= 2;
+ if (P
icoIn.
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",
sndBuffer_endptr = &sndBuffer[samples_block*SOUND_BLOCK_COUNT];
lprintf("starting audio: %i, len: %i, stereo: %i, pal: %i, block samples: %i\n",
- P
sndRate, PsndL
en, stereo, Pico.m.pal, samples_block);
+ P
icoIn.sndRate, Pico.snd.l
en, stereo, Pico.m.pal, samples_block);
// while (sceAudioOutput2GetRestSample() > 0) psp_msleep(100);
// sceAudio_5C37C0AE();
// 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, P
icoIn.
sndRate, 2); // seems to not need that stupid 64byte alignment
if (ret < 0) {
lprintf("sceAudio_38553111() failed: %i\n", ret);
emu_status_msg("sound init failed (%i), snd disabled", ret);
currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
} else {
if (ret < 0) {
lprintf("sceAudio_38553111() failed: %i\n", ret);
emu_status_msg("sound init failed (%i), snd disabled", ret);
currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
} else {
- Pico
W
riteSound = writeSound;
+ Pico
In.w
riteSound = writeSound;
memset32((int *)(void *)sndBuffer, 0, sizeof(sndBuffer)/4);
snd_playptr = sndBuffer_endptr - samples_block;
samples_made = samples_block; // send 1 empty block first..
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 = Pico
O
pt;
+ P
icoIn.
sndOut = sndBuffer;
+ PsndRate_old = P
icoIn.
sndRate;
+ PicoOpt_old = Pico
In.o
pt;
pal_old = Pico.m.pal;
}
}
pal_old = Pico.m.pal;
}
}
@@
-645,21
+640,20
@@
static void sound_deinit(void)
static void writeSound(int len)
{
int ret;
static void writeSound(int len)
{
int ret;
- if (PicoOpt&8) len<<=1;
- P
sndOut += len
;
- /*if (PsndOut > sndBuffer_endptr) {
- memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
- P
sndOut = &sndBuffer[P
sndOut - endptr];
+ P
icoIn.sndOut += len / 2
;
+ /*if (P
icoIn.
sndOut > sndBuffer_endptr) {
+ memcpy32((int *)(void *)sndBuffer, (int *)endptr, (P
icoIn.
sndOut - endptr + 1) / 2);
+ P
icoIn.sndOut = &sndBuffer[PicoIn.
sndOut - endptr];
lprintf("mov\n");
}
else*/
lprintf("mov\n");
}
else*/
- if (P
sndOut > sndBuffer_endptr) lprintf("snd oflow %i!\n", P
sndOut - sndBuffer_endptr);
- if (PsndOut >= sndBuffer_endptr)
- PsndOut = sndBuffer;
+ if (P
icoIn.sndOut > sndBuffer_endptr) lprintf("snd oflow %i!\n", PicoIn.
sndOut - sndBuffer_endptr);
+ if (P
icoIn.
sndOut >= sndBuffer_endptr)
+ P
icoIn.
sndOut = sndBuffer;
// signal the snd thread
// 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);
if (samples_made - samples_done > samples_block*2) {
// lprintf("signal, %i/%i\n", samples_done, samples_made);
ret = sceKernelSignalSema(sound_sem, 1);
@@
-670,18
+664,20
@@
static void writeSound(int len)
static void SkipFrame(void)
{
static void SkipFrame(void)
{
- Pico
S
kipFrame=1;
+ Pico
In.s
kipFrame=1;
PicoFrame();
PicoFrame();
- Pico
S
kipFrame=0;
+ Pico
In.s
kipFrame=0;
}
}
-void pemu_forced_frame(int
opts
)
+void pemu_forced_frame(int
no_scale, int do_emu
)
{
{
- int po_old = Pico
O
pt;
+ int po_old = Pico
In.o
pt;
int eo_old = currentConfig.EmuOpt;
int eo_old = currentConfig.EmuOpt;
- PicoOpt &= ~0x10;
- PicoOpt |= opts|POPT_ACC_SPRITES;
+ PicoIn.opt &= ~POPT_ALT_RENDERER;
+ PicoIn.opt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoIn.opt |= POPT_EN_SOFTSCALE;
currentConfig.EmuOpt |= 0x80;
vidResetMode();
currentConfig.EmuOpt |= 0x80;
vidResetMode();
@@
-689,15
+685,14
@@
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);
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);
EmuScanPrepare();
PicoFrameDrawOnly();
blit1();
sceGuSync(0,0);
- Pico
O
pt = po_old;
+ Pico
In.o
pt = po_old;
currentConfig.EmuOpt = eo_old;
}
currentConfig.EmuOpt = eo_old;
}
@@
-708,7
+703,7
@@
static void RunEventsPico(unsigned int events, unsigned int keys)
if (pico_inp_mode != 0)
{
if (pico_inp_mode != 0)
{
- Pico
P
ad[0] &= ~0x0f; // release UDLR
+ Pico
In.p
ad[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_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; }
@@
-759,12
+754,12
@@
static void RunEvents(unsigned int which)
}
if (which & 0x0400) // switch renderer
{
}
if (which & 0x0400) // switch renderer
{
- if (Pico
Opt&0x10) { PicoO
pt&=~0x10; currentConfig.EmuOpt |= 0x80; }
- else { Pico
O
pt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
+ if (Pico
In.opt&0x10) { PicoIn.o
pt&=~0x10; currentConfig.EmuOpt |= 0x80; }
+ else { Pico
In.o
pt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
vidResetMode();
vidResetMode();
- if (Pico
O
pt & POPT_ALT_RENDERER)
+ if (Pico
In.o
pt & POPT_ALT_RENDERER)
emu_status_msg("fast renderer");
else if (currentConfig.EmuOpt&0x80)
emu_status_msg("accurate renderer");
emu_status_msg("fast renderer");
else if (currentConfig.EmuOpt&0x80)
emu_status_msg("accurate renderer");
@@
-799,11
+794,11
@@
static void updateKeys(void)
keys &= CONFIGURABLE_KEYS;
keys &= CONFIGURABLE_KEYS;
- Pico
P
ad[0] = allActions[0] & 0xfff;
- Pico
P
ad[1] = allActions[1] & 0xfff;
+ Pico
In.p
ad[0] = allActions[0] & 0xfff;
+ Pico
In.p
ad[1] = allActions[1] & 0xfff;
- if (allActions[0] & 0x7000) emu_DoTurbo(&Pico
P
ad[0], allActions[0]);
- if (allActions[1] & 0x7000) emu_DoTurbo(&Pico
P
ad[1], allActions[1]);
+ if (allActions[0] & 0x7000) emu_DoTurbo(&Pico
In.p
ad[0], allActions[0]);
+ if (allActions[1] & 0x7000) emu_DoTurbo(&Pico
In.p
ad[1], allActions[1]);
events = (allActions[0] | allActions[1]) >> 16;
events = (allActions[0] | allActions[1]) >> 16;
@@
-814,7
+809,7
@@
static void updateKeys(void)
events &= ~prevEvents;
events &= ~prevEvents;
- if (PicoAHW == PAHW_PICO)
+ if (Pico
In.
AHW == PAHW_PICO)
RunEventsPico(events, keys);
if (events) RunEvents(events);
if (movie_data) emu_updateMovie();
RunEventsPico(events, keys);
if (events) RunEvents(events);
if (movie_data) emu_updateMovie();
@@
-866,7
+861,7
@@
void pemu_loop(void)
target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1;
reset_timing = 1;
target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1;
reset_timing = 1;
- if (PicoAHW & PAHW_MCD) {
+ if (Pico
In.
AHW & PAHW_MCD) {
// prepare CD buffer
PicoCDBufferInit();
// mp3...
// prepare CD buffer
PicoCDBufferInit();
// mp3...
@@
-878,7
+873,7
@@
void pemu_loop(void)
}
// prepare sound stuff
}
// prepare sound stuff
- PsndOut = NULL;
+ P
icoIn.
sndOut = NULL;
if (currentConfig.EmuOpt & EOPT_EN_SOUND)
{
pemu_sound_start();
if (currentConfig.EmuOpt & EOPT_EN_SOUND)
{
pemu_sound_start();
@@
-991,7
+986,7
@@
void pemu_loop(void)
updateKeys();
updateKeys();
- if (!(Pico
O
pt&0x10))
+ if (!(Pico
In.o
pt&0x10))
EmuScanPrepare();
PicoFrame();
EmuScanPrepare();
PicoFrame();
@@
-1024,11
+1019,11
@@
void pemu_loop(void)
emu_set_fastforward(0);
emu_set_fastforward(0);
- if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+ if (Pico
In.
AHW & PAHW_MCD) PicoCDBufferFree();
- if (PsndOut != NULL) {
+ if (P
icoIn.
sndOut != NULL) {
pemu_sound_stop();
pemu_sound_stop();
- PsndOut = NULL;
+ P
icoIn.
sndOut = NULL;
}
// save SRAM
}
// save SRAM
@@
-1044,7
+1039,7
@@
void pemu_loop(void)
void emu_HandleResume(void)
{
void emu_HandleResume(void)
{
- if (!(PicoAHW & PAHW_MCD)) return;
+ if (!(Pico
In.
AHW & PAHW_MCD)) return;
// reopen first CD track
if (Pico_mcd->TOC.Tracks[0].F != NULL)
// reopen first CD track
if (Pico_mcd->TOC.Tracks[0].F != NULL)