notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added zram clearing on reset for Psycho Pinball (does it happen on hw?)
[picodrive.git]
/
Pico
/
carthw
/
svp
/
svp.c
diff --git
a/Pico/carthw/svp/svp.c
b/Pico/carthw/svp/svp.c
index
4a91539
..
0c7585a
100644
(file)
--- a/
Pico/carthw/svp/svp.c
+++ b/
Pico/carthw/svp/svp.c
@@
-13,7
+13,8
@@
#endif
svp_t *svp = NULL;
#endif
svp_t *svp = NULL;
-int PicoSVPCycles = 1000; // cycles/line
+int PicoSVPCycles = 850; // cycles/line, just a guess
+static int svp_dyn_ready = 0;
/* save state stuff */
typedef enum {
/* save state stuff */
typedef enum {
@@
-26,7
+27,7
@@
static carthw_state_chunk svp_states[] =
{
{ CHUNK_IRAM, 0x800, NULL },
{ CHUNK_DRAM, sizeof(svp->dram), NULL },
{
{ CHUNK_IRAM, 0x800, NULL },
{ CHUNK_DRAM, sizeof(svp->dram), NULL },
- { CHUNK_SSP, sizeof(svp->ssp1601), NULL },
+ { CHUNK_SSP, sizeof(svp->ssp1601)
- sizeof(svp->ssp1601.drc)
, NULL },
{ 0, 0, NULL }
};
{ 0, 0, NULL }
};
@@
-37,17
+38,24
@@
static void PicoSVPReset(void)
memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
ssp1601_reset(&svp->ssp1601);
memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
ssp1601_reset(&svp->ssp1601);
- if (!(PicoOpt&0x20000))
+#ifndef PSP
+ if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
ssp1601_dyn_reset(&svp->ssp1601);
ssp1601_dyn_reset(&svp->ssp1601);
+#endif
}
static void PicoSVPLine(int count)
{
}
static void PicoSVPLine(int count)
{
- if (PicoOpt&0x20000)
- ssp1601_run(PicoSVPCycles * count);
- else
+#ifndef PSP
+ if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
ssp1601_dyn_run(PicoSVPCycles * count);
ssp1601_dyn_run(PicoSVPCycles * count);
+ else
+#endif
+ {
+ ssp1601_run(PicoSVPCycles * count);
+ svp_dyn_ready = 0; // just in case
+ }
// test mode
//if (Pico.m.frame_count == 13) PicoPad[0] |= 0xff;
// test mode
//if (Pico.m.frame_count == 13) PicoPad[0] |= 0xff;
@@
-83,7
+91,7
@@
void PicoSVPInit(void)
{
#ifdef __GP2X__
int ret;
{
#ifdef __GP2X__
int ret;
- ret = munmap(tcache,
TCACHE
_SIZE);
+ ret = munmap(tcache,
SSP_DRC
_SIZE);
printf("munmap tcache: %i\n", ret);
#endif
}
printf("munmap tcache: %i\n", ret);
#endif
}
@@
-111,20
+119,24
@@
void PicoSVPStartup(void)
return;
}
return;
}
- //PicoOpt
|=
0x20000;
+ //PicoOpt
&= ~
0x20000;
Pico.rom = tmp;
svp = (void *) ((char *)tmp + 0x200000);
memset(svp, 0, sizeof(*svp));
#ifdef __GP2X__
Pico.rom = tmp;
svp = (void *) ((char *)tmp + 0x200000);
memset(svp, 0, sizeof(*svp));
#ifdef __GP2X__
- tmp = mmap(tcache,
TCACHE
_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
+ tmp = mmap(tcache,
SSP_DRC
_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
printf("mmap tcache: %p, asked %p\n", tmp, tcache);
#endif
// init SVP compiler
printf("mmap tcache: %p, asked %p\n", tmp, tcache);
#endif
// init SVP compiler
- if (!(PicoOpt&0x20000)) {
+ svp_dyn_ready = 0;
+#ifndef PSP
+ if (PicoOpt&POPT_EN_SVP_DRC) {
if (ssp1601_dyn_startup()) return;
if (ssp1601_dyn_startup()) return;
+ svp_dyn_ready = 1;
}
}
+#endif
// init ok, setup hooks..
PicoRead16Hook = PicoSVPRead16;
// init ok, setup hooks..
PicoRead16Hook = PicoSVPRead16;
@@
-140,6
+152,7
@@
void PicoSVPStartup(void)
svp_states[1].ptr = svp->dram;
svp_states[2].ptr = &svp->ssp1601;
carthw_chunks = svp_states;
svp_states[1].ptr = svp->dram;
svp_states[2].ptr = &svp->ssp1601;
carthw_chunks = svp_states;
+ PicoAHW |= PAHW_SVP;
}
}