notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FAMEC idle loops, PSP port sync, minor adjustments
[picodrive.git]
/
Pico
/
cd
/
Pico.c
diff --git
a/Pico/cd/Pico.c
b/Pico/cd/Pico.c
index
02cad9b
..
0577d3e
100644
(file)
--- a/
Pico/cd/Pico.c
+++ b/
Pico/cd/Pico.c
@@
-2,7
+2,7
@@
#include "../PicoInt.h"
#include "../PicoInt.h"
-
+#include "../sound/ym2612.h"
extern unsigned char formatted_bram[4*0x10];
extern unsigned int s68k_poll_adclk;
extern unsigned char formatted_bram[4*0x10];
extern unsigned int s68k_poll_adclk;
@@
-31,12
+31,10
@@
int (*PicoMCDcloseTray)(void) = NULL;
}
}
-PICO_INTERNAL
int
PicoInitMCD(void)
+PICO_INTERNAL
void
PicoInitMCD(void)
{
SekInitS68k();
Init_CD_Driver();
{
SekInitS68k();
Init_CD_Driver();
-
- return 0;
}
}
@@
-77,7
+75,7
@@
PICO_INTERNAL int PicoResetMCD(void)
#endif
// use SRam.data for RAM cart
#endif
// use SRam.data for RAM cart
- if (PicoOpt&
0x8000
) {
+ if (PicoOpt&
POPT_EN_MCD_RAMCART
) {
if (SRam.data == NULL)
SRam.data = calloc(1, 0x12000);
}
if (SRam.data == NULL)
SRam.data = calloc(1, 0x12000);
}
@@
-106,7
+104,7
@@
static __inline void SekRunM68k(int cyc)
SekCycleCnt+=m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext=&PicoCpuFM68k;
SekCycleCnt+=m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext=&PicoCpuFM68k;
- SekCycleCnt+=fm68k_emulate(cyc_do, 0);
+ SekCycleCnt+=fm68k_emulate(cyc_do, 0
, 0
);
#endif
}
#endif
}
@@
-126,7
+124,7
@@
static __inline void SekRunS68k(int cyc)
SekCycleCntS68k+=m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext=&PicoCpuFS68k;
SekCycleCntS68k+=m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext=&PicoCpuFS68k;
- SekCycleCntS68k+=fm68k_emulate(cyc_do, 0);
+ SekCycleCntS68k+=fm68k_emulate(cyc_do, 0
, 0
);
#endif
}
#endif
}
@@
-140,7
+138,7
@@
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
{
SekCycleAim+=cyc_m68k;
SekCycleAimS68k+=cyc_s68k;
{
SekCycleAim+=cyc_m68k;
SekCycleAimS68k+=cyc_s68k;
- fm68k_emulate(0, 1);
+ fm68k_emulate(0, 1
, 0
);
}
#else
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
}
#else
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
@@
-166,7
+164,7
@@
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
SekCycleCnt += m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext = &PicoCpuFM68k;
SekCycleCnt += m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext = &PicoCpuFM68k;
- SekCycleCnt += fm68k_emulate(cyc_do, 0);
+ SekCycleCnt += fm68k_emulate(cyc_do, 0
, 0
);
#endif
}
if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
#endif
}
if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
@@
-179,7
+177,7
@@
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
SekCycleCntS68k += m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext = &PicoCpuFS68k;
SekCycleCntS68k += m68k_execute(cyc_do);
#elif defined(EMU_F68K)
g_m68kcontext = &PicoCpuFS68k;
- SekCycleCntS68k += fm68k_emulate(cyc_do, 0);
+ SekCycleCntS68k += fm68k_emulate(cyc_do, 0
, 0
);
#endif
}
}
#endif
}
}
@@
-264,14
+262,12
@@
static __inline void getSamples(int y)
#include "../PicoFrameHints.c"
#include "../PicoFrameHints.c"
-PICO_INTERNAL
int
PicoFrameMCD(void)
+PICO_INTERNAL
void
PicoFrameMCD(void)
{
{
- if
(!(PicoOpt&0x10
))
+ if
(!(PicoOpt&POPT_ALT_RENDERER
))
PicoFrameStart();
PicoFrameHints();
PicoFrameStart();
PicoFrameHints();
-
- return 0;
}
}