notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix yet another sync issue..
[picodrive.git]
/
platform
/
gizmondo
/
emu.c
diff --git
a/platform/gizmondo/emu.c
b/platform/gizmondo/emu.c
index
df2092a
..
3115ebd
100644
(file)
--- a/
platform/gizmondo/emu.c
+++ b/
platform/gizmondo/emu.c
@@
-26,9
+26,7
@@
// main 300K gfx-related buffer. Used by menu and renderers.
unsigned char gfx_buffer[321*240*2*2];
// main 300K gfx-related buffer. Used by menu and renderers.
unsigned char gfx_buffer[321*240*2*2];
-unsigned char *PicoDraw2FB = gfx_buffer; // temporary buffer for alt renderer ( (8+320)*(8+240+8) )
-static DWORD noticeMsgTime = 0;
static short *snd_cbuff = NULL;
static int snd_cbuf_samples = 0, snd_all_samples = 0;
static short *snd_cbuff = NULL;
static int snd_cbuf_samples = 0, snd_all_samples = 0;
@@
-36,12
+34,6
@@
static int snd_cbuf_samples = 0, snd_all_samples = 0;
static void blit(const char *fps, const char *notice);
static void clearArea(int full);
static void blit(const char *fps, const char *notice);
static void clearArea(int full);
-void plat_status_msg(const char *format, ...)
-{
- /* TODO */
- noticeMsgTime = GetTickCount();
-}
-
int plat_get_root_dir(char *dst, int len)
{
if (len > 0) *dst = 0;
int plat_get_root_dir(char *dst, int len)
{
if (len > 0) *dst = 0;
@@
-55,7
+47,7
@@
static void emu_msg_cb(const char *msg)
giz_screen = fb_lock(1);
memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
giz_screen = fb_lock(1);
memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
- emu_text
O
ut16(4, 232, msg);
+ emu_text
_o
ut16(4, 232, msg);
noticeMsgTime = GetTickCount() - 2000;
/* assumption: emu_msg_cb gets called only when something slow is about to happen */
noticeMsgTime = GetTickCount() - 2000;
/* assumption: emu_msg_cb gets called only when something slow is about to happen */
@@
-81,15
+73,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;
@@
-104,13
+89,11
@@
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;
}
static int EmuScanBegin16(unsigned int num)
{
}
static int EmuScanBegin16(unsigned int num)
{
- if (!(Pico.video.reg[1]&8)) num += 8;
DrawLineDest = (unsigned short *) giz_screen + 321 * num;
if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
DrawLineDest = (unsigned short *) giz_screen + 321 * num;
if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
@@
-122,7
+105,6
@@
static int EmuScanBegin16(unsigned int num)
static int EmuScanBegin8(unsigned int num)
{
// draw like the fast renderer
static int EmuScanBegin8(unsigned int num)
{
// draw like the fast renderer
- if (!(Pico.video.reg[1]&8)) num += 8;
HighCol = gfx_buffer + 328 * num;
return 0;
HighCol = gfx_buffer + 328 * num;
return 0;
@@
-137,7
+119,7
@@
static void osd_text(int x, int y, const char *text)
p = (int *) ((int)p & ~3); // align
memset32(p, 0, len);
}
p = (int *) ((int)p & ~3); // align
memset32(p, 0, len);
}
- emu_text
O
ut16(x, y, text);
+ emu_text
_o
ut16(x, y, text);
}
/*
}
/*
@@
-179,7
+161,7
@@
static void blit(const char *fps, const char *notice)
vidConvCpyRGB565(localPal, Pico.cram, 0x40);
}
// a hack for VR
vidConvCpyRGB565(localPal, Pico.cram, 0x40);
}
// a hack for VR
- if (Pico
Read16Hook == PicoSVPRead16
)
+ if (Pico
AHW & PAHW_SVP
)
memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
@@
-247,11
+229,11
@@
static void vidResetMode(void)
if (PicoOpt&0x10) {
} else if (currentConfig.EmuOpt&0x80) {
if (PicoOpt&0x10) {
} else if (currentConfig.EmuOpt&0x80) {
- PicoDrawSet
ColorFormat(1
);
- Pico
ScanBegin = EmuScanBegin16
;
+ PicoDrawSet
OutFormat(PDF_RGB555, 0
);
+ Pico
DrawSetCallbacks(EmuScanBegin16, NULL)
;
} else {
} else {
- PicoDrawSet
ColorFormat(-1
);
- Pico
ScanBegin = EmuScanBegin8
;
+ PicoDrawSet
OutFormat(PDF_NONE, 0
);
+ Pico
DrawSetCallbacks(EmuScanBegin8, NULL)
;
}
if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
// setup pal for 8-bit modes
}
if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
// setup pal for 8-bit modes
@@
-290,10
+272,8
@@
static void stdbg(const char *fmt, ...)
static void updateSound(int len)
{
static void updateSound(int len)
{
- if (PicoOpt&8) len<<=1;
-
- snd_all_samples += len;
- PsndOut += len;
+ snd_all_samples += len / 2;
+ PsndOut += len / 2;
if (PsndOut - snd_cbuff >= snd_cbuf_samples)
{
//if (PsndOut - snd_cbuff != snd_cbuf_samples)
if (PsndOut - snd_cbuff >= snd_cbuf_samples)
{
//if (PsndOut - snd_cbuff != snd_cbuf_samples)
@@
-311,20
+291,22
@@
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
no_scale, int do_emu
)
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
PicoOpt &= ~0x10;
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
PicoOpt &= ~0x10;
- PicoOpt |= opts|POPT_ACC_SPRITES;
+ PicoOpt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoOpt |= POPT_EN_SOFTSCALE;
currentConfig.EmuOpt |= 0x80;
if (giz_screen == NULL)
giz_screen = fb_lock(1);
currentConfig.EmuOpt |= 0x80;
if (giz_screen == NULL)
giz_screen = fb_lock(1);
- PicoDrawSet
ColorFormat(1
);
- Pico
ScanBegin = EmuScanBegin16
;
+ PicoDrawSet
OutFormat(PDF_RGB555, 0
);
+ Pico
DrawSetCallbacks(EmuScanBegin16, NULL)
;
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();