notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 1.80beta2
[picodrive.git]
/
platform
/
gizmondo
/
emu.c
diff --git
a/platform/gizmondo/emu.c
b/platform/gizmondo/emu.c
index
1ba4d76
..
86a5d8c
100644
(file)
--- a/
platform/gizmondo/emu.c
+++ b/
platform/gizmondo/emu.c
@@
-74,15
+74,8
@@
void emu_stateCb(const char *str)
void pemu_prep_defconfig(void)
{
void pemu_prep_defconfig(void)
{
- memset(&defaultConfig, 0, sizeof(defaultConfig));
- defaultConfig.EmuOpt = 0x1d | 0x680; // | confirm_save, cd_leds, 16bit rend
- defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|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 = 0;
defaultConfig.s_PicoCDBuffers = 0;
- defaultConfig.Frameskip = -1; // auto
- defaultConfig.volume = 50;
defaultConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU
defaultConfig.KeyBinds[ 3] = 1<<1;
defaultConfig.KeyBinds[ 0] = 1<<2;
defaultConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU
defaultConfig.KeyBinds[ 3] = 1<<1;
defaultConfig.KeyBinds[ 0] = 1<<2;
@@
-97,7
+90,6
@@
void pemu_prep_defconfig(void)
defaultConfig.KeyBinds[12] = 1<<29; // vol up
defaultConfig.KeyBinds[11] = 1<<30; // vol down
defaultConfig.scaling = 0;
defaultConfig.KeyBinds[12] = 1<<29; // vol up
defaultConfig.KeyBinds[11] = 1<<30; // vol down
defaultConfig.scaling = 0;
- defaultConfig.turbo_rate = 15;
}
}
@@
-238,10
+230,10
@@
static void vidResetMode(void)
if (PicoOpt&0x10) {
} else if (currentConfig.EmuOpt&0x80) {
if (PicoOpt&0x10) {
} else if (currentConfig.EmuOpt&0x80) {
- PicoDrawSet
ColorFormat(1
);
+ PicoDrawSet
OutFormat(PDF_RGB555, 0
);
PicoScanBegin = EmuScanBegin16;
} else {
PicoScanBegin = EmuScanBegin16;
} else {
- PicoDrawSet
ColorFormat(-1
);
+ PicoDrawSet
OutFormat(PDF_NONE, 0
);
PicoScanBegin = EmuScanBegin8;
}
if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
PicoScanBegin = EmuScanBegin8;
}
if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
@@
-302,7
+294,7
@@
static void SkipFrame(void)
}
/* forced frame to front buffer */
}
/* forced frame to front buffer */
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int opts
, int no_scale
)
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
@@
-314,7
+306,7
@@
void pemu_forced_frame(int opts)
if (giz_screen == NULL)
giz_screen = fb_lock(1);
if (giz_screen == NULL)
giz_screen = fb_lock(1);
- PicoDrawSet
ColorFormat(1
);
+ PicoDrawSet
OutFormat(PDF_RGB555, 0
);
PicoScanBegin = EmuScanBegin16;
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();
PicoScanBegin = EmuScanBegin16;
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();