notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drz80: drop fast_sp for compatibility
[picodrive.git]
/
platform
/
psp
/
emu.c
diff --git
a/platform/psp/emu.c
b/platform/psp/emu.c
index
5eca789
..
dd4381b
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,7
+223,7
@@
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))
{
memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
}
{
memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
}
@@
-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;
@@
-404,9
+400,9
@@
void blit1(void)
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);
}
@@
-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;
@@
-645,9
+640,8
@@
static void sound_deinit(void)
static void writeSound(int len)
{
int ret;
static void writeSound(int len)
{
int ret;
- if (PicoOpt&8) len<<=1;
- PsndOut += len;
+ PsndOut += len
/ 2
;
/*if (PsndOut > sndBuffer_endptr) {
memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
PsndOut = &sndBuffer[PsndOut - endptr];
/*if (PsndOut > sndBuffer_endptr) {
memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
PsndOut = &sndBuffer[PsndOut - endptr];
@@
-659,7
+653,7
@@
static void writeSound(int len)
PsndOut = sndBuffer;
// signal the snd thread
PsndOut = 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);
if (samples_made - samples_done > samples_block*2) {
// lprintf("signal, %i/%i\n", samples_done, samples_made);
ret = sceKernelSignalSema(sound_sem, 1);
@@
-675,13
+669,15
@@
static void SkipFrame(void)
PicoSkipFrame=0;
}
PicoSkipFrame=0;
}
-void pemu_forced_frame(int
opts
)
+void pemu_forced_frame(int
no_scale, int do_emu
)
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
- PicoOpt &= ~0x10;
- PicoOpt |= opts|POPT_ACC_SPRITES;
+ PicoOpt &= ~POPT_ALT_RENDERER;
+ PicoOpt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoOpt |= POPT_EN_SOFTSCALE;
currentConfig.EmuOpt |= 0x80;
vidResetMode();
currentConfig.EmuOpt |= 0x80;
vidResetMode();
@@
-689,9
+685,8
@@
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();
EmuScanPrepare();
PicoFrameDrawOnly();
blit1();