notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libretro: add a few options for the analog combo
[pcsx_rearmed.git]
/
libpcsxcore
/
mdec.c
diff --git
a/libpcsxcore/mdec.c
b/libpcsxcore/mdec.c
index
bed4e53
..
c0f2cfd
100644
(file)
--- a/
libpcsxcore/mdec.c
+++ b/
libpcsxcore/mdec.c
@@
-32,7
+32,12
@@
* 320x240x16@60Hz => 9.216 MB/s
* so 2.0 to 4.0 should be fine.
*/
* 320x240x16@60Hz => 9.216 MB/s
* so 2.0 to 4.0 should be fine.
*/
-#define MDEC_BIAS 2.0f
+
+/*
+ * >= 10 for Galerians
+ * <= 18 for "Disney's Treasure Planet"
+ */
+#define MDEC_BIAS 10
#define DSIZE 8
#define DSIZE2 (DSIZE * DSIZE)
#define DSIZE 8
#define DSIZE2 (DSIZE * DSIZE)
@@
-471,6
+476,7
@@
void psxDma0(u32 adr, u32 bcr, u32 chcr) {
int size;
if (chcr != 0x01000201) {
int size;
if (chcr != 0x01000201) {
+ log_unhandled("mdec0: invalid dma %08x\n", chcr);
return;
}
return;
}
@@
-480,7
+486,7
@@
void psxDma0(u32 adr, u32 bcr, u32 chcr) {
size = (bcr >> 16) * (bcr & 0xffff);
switch (cmd >> 28) {
size = (bcr >> 16) * (bcr & 0xffff);
switch (cmd >> 28) {
- case 0x3: // decode
+ case 0x3: // decode
15/24bpp
mdec.rl = (u16 *) PSXM(adr);
/* now the mdec is busy till all data are decoded */
mdec.reg1 |= MDEC1_BUSY;
mdec.rl = (u16 *) PSXM(adr);
/* now the mdec is busy till all data are decoded */
mdec.reg1 |= MDEC1_BUSY;
@@
-488,10
+494,8
@@
void psxDma0(u32 adr, u32 bcr, u32 chcr) {
mdec.rl_end = mdec.rl + (size * 2);
/* sanity check */
mdec.rl_end = mdec.rl + (size * 2);
/* sanity check */
- if(mdec.rl_end <= mdec.rl) {
- MDECINDMA_INT( size / 4 );
- return;
- }
+ if(mdec.rl_end <= mdec.rl)
+ break;
/* process the pending dma1 */
if(mdec.pending_dma1.adr){
/* process the pending dma1 */
if(mdec.pending_dma1.adr){
@@
-510,23
+514,18
@@
void psxDma0(u32 adr, u32 bcr, u32 chcr) {
iqtab_init(iq_y, p);
iqtab_init(iq_uv, p + 64);
}
iqtab_init(iq_y, p);
iqtab_init(iq_uv, p + 64);
}
-
- MDECINDMA_INT( size / 4 );
- return;
+ break;
case 0x6: // cosine table
// printf("mdec cosine table\n");
case 0x6: // cosine table
// printf("mdec cosine table\n");
-
- MDECINDMA_INT( size / 4 );
- return;
+ break;
default:
default:
-
// printf("mdec unknown command\n"
);
+
log_unhandled("mdec: unknown command %08x\n", cmd
);
break;
}
break;
}
- HW_DMA0_CHCR &= SWAP32(~0x01000000);
- DMA_INTERRUPT(0);
+ set_event(PSXINT_MDECINDMA, size);
}
void mdec0Interrupt()
}
void mdec0Interrupt()
@@
-545,15
+544,16
@@
void psxDma1(u32 adr, u32 bcr, u32 chcr) {
int blk[DSIZE2 * 6];
u8 * image;
int size;
int blk[DSIZE2 * 6];
u8 * image;
int size;
-
int dmacnt
;
+
u32 words
;
- if (chcr != 0x01000200) return;
+ if (chcr != 0x01000200) {
+ log_unhandled("mdec1: invalid dma %08x\n", chcr);
+ return;
+ }
-
size
= (bcr >> 16) * (bcr & 0xffff);
+
words
= (bcr >> 16) * (bcr & 0xffff);
/* size in byte */
/* size in byte */
- size *= 4;
- /* I guess the memory speed is limitating */
- dmacnt = size;
+ size = words * 4;
if (!(mdec.reg1 & MDEC1_BUSY)) {
/* add to pending */
if (!(mdec.reg1 & MDEC1_BUSY)) {
/* add to pending */
@@
-624,8
+624,10
@@
void psxDma1(u32 adr, u32 bcr, u32 chcr) {
}
}
}
}
- /* define the power of mdec */
- MDECOUTDMA_INT((int) ((dmacnt* MDEC_BIAS)));
+ /* define the power of mdec */
+ set_event(PSXINT_MDECOUTDMA, words * MDEC_BIAS);
+ /* some CPU stalling */
+ psxRegs.cycle += words;
}
}
}
}
@@
-672,27
+674,26
@@
void mdec1Interrupt() {
}
int mdecFreeze(void *f, int Mode) {
}
int mdecFreeze(void *f, int Mode) {
- u8 *base = (u8 *)
&psxM[0x100000]
;
+ u8 *base = (u8 *)
psxM
;
u32 v;
gzfreeze(&mdec.reg0, sizeof(mdec.reg0));
gzfreeze(&mdec.reg1, sizeof(mdec.reg1));
u32 v;
gzfreeze(&mdec.reg0, sizeof(mdec.reg0));
gzfreeze(&mdec.reg1, sizeof(mdec.reg1));
- // old code used to save raw pointers..
v = (u8 *)mdec.rl - base;
gzfreeze(&v, sizeof(v));
v = (u8 *)mdec.rl - base;
gzfreeze(&v, sizeof(v));
- mdec.rl = (u16 *)(base + (v & 0xffffe));
+ mdec.rl = (u16 *)(base + (v & 0x
1
ffffe));
v = (u8 *)mdec.rl_end - base;
gzfreeze(&v, sizeof(v));
v = (u8 *)mdec.rl_end - base;
gzfreeze(&v, sizeof(v));
- mdec.rl_end = (u16 *)(base + (v & 0xffffe));
+ mdec.rl_end = (u16 *)(base + (v & 0x
1
ffffe));
v = 0;
if (mdec.block_buffer_pos)
v = 0;
if (mdec.block_buffer_pos)
- v = mdec.block_buffer_pos -
base
;
+ v = mdec.block_buffer_pos -
mdec.block_buffer
;
gzfreeze(&v, sizeof(v));
mdec.block_buffer_pos = 0;
gzfreeze(&v, sizeof(v));
mdec.block_buffer_pos = 0;
- if (v)
- mdec.block_buffer_pos =
base + (v & 0xfffff)
;
+ if (v
&& v < sizeof(mdec.block_buffer)
)
+ mdec.block_buffer_pos =
mdec.block_buffer
;
gzfreeze(&mdec.block_buffer, sizeof(mdec.block_buffer));
gzfreeze(&mdec.pending_dma1, sizeof(mdec.pending_dma1));
gzfreeze(&mdec.block_buffer, sizeof(mdec.block_buffer));
gzfreeze(&mdec.pending_dma1, sizeof(mdec.pending_dma1));