notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rearrange globals
[picodrive.git]
/
platform
/
gizmondo
/
emu.c
diff --git
a/platform/gizmondo/emu.c
b/platform/gizmondo/emu.c
index
f602db7
..
96a49cf
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;
@@
-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,14
+89,12
@@
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;
+ Pico.est.DrawLineDest = (unsigned short *) giz_screen + 321 * num;
if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
return 1; // skip next line
if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
return 1; // skip next line
@@
-122,8
+105,7
@@
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;
+ Pico.est.HighCol = gfx_buffer + 328 * num;
return 0;
}
return 0;
}
@@
-140,13
+122,6
@@
static void osd_text(int x, int y, const char *text)
emu_text_out16(x, y, text);
}
emu_text_out16(x, y, text);
}
-/*
-void log1(void *p1, void *p2)
-{
- lprintf("%p %p %p\n", p1, p2, DrawLineDest);
-}
-*/
-
static void cd_leds(void)
{
static int old_reg = 0;
static void cd_leds(void)
{
static int old_reg = 0;
@@
-170,7
+145,7
@@
static void blit(const char *fps, const char *notice)
{
int emu_opt = currentConfig.EmuOpt;
{
int emu_opt = currentConfig.EmuOpt;
- if (Pico
O
pt&0x10)
+ if (Pico
In.o
pt&0x10)
{
int lines_flags = 224;
// 8bit fast renderer
{
int lines_flags = 224;
// 8bit fast renderer
@@
-179,12
+154,12
@@
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
)
- memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
+ if (Pico
In.AHW & PAHW_SVP
)
+ memset32((int *)(Pico
.est.
Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
- vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
+ vidCpy8to16((unsigned short *)giz_screen+321*8, Pico
.est.
Draw2FB+328*8, localPal, lines_flags);
}
else if (!(emu_opt&0x80))
{
}
else if (!(emu_opt&0x80))
{
@@
-212,7
+187,7
@@
static void blit(const char *fps, const char *notice)
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
if (currentConfig.EmuOpt&0x4000)
lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
- vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
+ vidCpy8to16((unsigned short *)giz_screen+321*8, Pico
.est.
Draw2FB+328*8, localPal, lines_flags);
}
if (notice || (emu_opt & 2)) {
}
if (notice || (emu_opt & 2)) {
@@
-221,7
+196,7
@@
static void blit(const char *fps, const char *notice)
if (emu_opt & 2) osd_text(OSD_FPS_X, h, fps);
}
if (emu_opt & 2) osd_text(OSD_FPS_X, h, fps);
}
- if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+ if ((emu_opt & 0x400) && (Pico
In.
AHW & PAHW_MCD))
cd_leds();
}
cd_leds();
}
@@
-245,15
+220,15
@@
static void vidResetMode(void)
{
giz_screen = fb_lock(1);
{
giz_screen = fb_lock(1);
- if (Pico
O
pt&0x10) {
+ if (Pico
In.o
pt&0x10) {
} else if (currentConfig.EmuOpt&0x80) {
} 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 ((Pico
O
pt&0x10) || !(currentConfig.EmuOpt&0x80)) {
+ if ((Pico
In.o
pt&0x10) || !(currentConfig.EmuOpt&0x80)) {
// setup pal for 8-bit modes
localPal[0xc0] = 0x0600;
localPal[0xd0] = 0xc000;
// setup pal for 8-bit modes
localPal[0xc0] = 0x0600;
localPal[0xd0] = 0xc000;
@@
-290,10
+265,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)
@@
-305,33
+278,35
@@
static void updateSound(int len)
static void SkipFrame(void)
{
static void SkipFrame(void)
{
- Pico
S
kipFrame=1;
+ Pico
In.s
kipFrame=1;
PicoFrame();
PicoFrame();
- Pico
S
kipFrame=0;
+ Pico
In.s
kipFrame=0;
}
/* 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 = Pico
O
pt;
+ int po_old = Pico
In.o
pt;
int eo_old = currentConfig.EmuOpt;
int eo_old = currentConfig.EmuOpt;
- PicoOpt &= ~0x10;
- PicoOpt |= opts|POPT_ACC_SPRITES;
+ PicoIn.opt &= ~0x10;
+ PicoIn.opt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoIn.opt |= 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();
fb_unlock();
giz_screen = NULL;
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();
fb_unlock();
giz_screen = NULL;
- Pico
O
pt = po_old;
+ Pico
In.o
pt = po_old;
currentConfig.EmuOpt = eo_old;
}
currentConfig.EmuOpt = eo_old;
}
@@
-375,12
+350,12
@@
static void RunEvents(unsigned int which)
}
if (which & 0x0400) // switch renderer
{
}
if (which & 0x0400) // switch renderer
{
- if (Pico
Opt&0x10) { PicoO
pt&=~0x10; currentConfig.EmuOpt |= 0x80; }
- else { Pico
O
pt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
+ if (Pico
In.opt&0x10) { PicoIn.o
pt&=~0x10; currentConfig.EmuOpt |= 0x80; }
+ else { Pico
In.o
pt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
vidResetMode();
vidResetMode();
- if (Pico
O
pt&0x10) {
+ if (Pico
In.o
pt&0x10) {
strcpy(noticeMsg, " 8bit fast renderer");
} else if (currentConfig.EmuOpt&0x80) {
strcpy(noticeMsg, "16bit accurate renderer");
strcpy(noticeMsg, " 8bit fast renderer");
} else if (currentConfig.EmuOpt&0x80) {
strcpy(noticeMsg, "16bit accurate renderer");
@@
-417,11
+392,11
@@
static void updateKeys(void)
keys &= CONFIGURABLE_KEYS;
keys &= CONFIGURABLE_KEYS;
- Pico
P
ad[0] = allActions[0] & 0xfff;
- Pico
P
ad[1] = allActions[1] & 0xfff;
+ Pico
In.p
ad[0] = allActions[0] & 0xfff;
+ Pico
In.p
ad[1] = allActions[1] & 0xfff;
- if (allActions[0] & 0x7000) emu_DoTurbo(&Pico
P
ad[0], allActions[0]);
- if (allActions[1] & 0x7000) emu_DoTurbo(&Pico
P
ad[1], allActions[1]);
+ if (allActions[0] & 0x7000) emu_DoTurbo(&Pico
In.p
ad[0], allActions[0]);
+ if (allActions[1] & 0x7000) emu_DoTurbo(&Pico
In.p
ad[1], allActions[1]);
events = (allActions[0] | allActions[1]) >> 16;
events = (allActions[0] | allActions[1]) >> 16;
@@
-480,8
+455,8
@@
void pemu_loop(void)
// make sure we are in correct mode
vidResetMode();
// make sure we are in correct mode
vidResetMode();
- if (currentConfig.scaling) Pico
O
pt|=0x4000;
- else Pico
O
pt&=~0x4000;
+ if (currentConfig.scaling) Pico
In.o
pt|=0x4000;
+ else Pico
In.o
pt&=~0x4000;
Pico.m.dirtyPal = 1;
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
Pico.m.dirtyPal = 1;
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
@@
-491,17
+466,17
@@
void pemu_loop(void)
reset_timing = 1;
// prepare CD buffer
reset_timing = 1;
// prepare CD buffer
- if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
+ if (Pico
In.
AHW & PAHW_MCD) PicoCDBufferInit();
// prepare sound stuff
PsndOut = NULL;
if (currentConfig.EmuOpt & 4)
{
int ret, snd_excess_add, stereo;
// prepare sound stuff
PsndOut = NULL;
if (currentConfig.EmuOpt & 4)
{
int ret, snd_excess_add, stereo;
- if (PsndRate != PsndRate_old || (Pico
O
pt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
+ if (PsndRate != PsndRate_old || (Pico
In.o
pt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
PsndRerate(Pico.m.frame_count ? 1 : 0);
}
PsndRerate(Pico.m.frame_count ? 1 : 0);
}
- stereo=(Pico
O
pt&8)>>3;
+ stereo=(Pico
In.o
pt&8)>>3;
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
snd_cbuf_samples = (PsndRate<<stereo) * 16 / target_fps;
lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
snd_cbuf_samples = (PsndRate<<stereo) * 16 / target_fps;
lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
@@
-519,7
+494,7
@@
void pemu_loop(void)
PsndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle
snd_all_samples = 0;
PsndRate_old = PsndRate;
PsndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle
snd_all_samples = 0;
PsndRate_old = PsndRate;
- PicoOpt_old = Pico
O
pt;
+ PicoOpt_old = Pico
In.o
pt;
pal_old = Pico.m.pal;
}
}
pal_old = Pico.m.pal;
}
}
@@
-586,7
+561,7
@@
void pemu_loop(void)
audio_skew = snd_all_samples*2 - FrameworkAudio_BufferPos();
if (PsndRate == 22050) co = 10;
if (PsndRate > 22050) co = 11;
audio_skew = snd_all_samples*2 - FrameworkAudio_BufferPos();
if (PsndRate == 22050) co = 10;
if (PsndRate > 22050) co = 11;
- if (Pico
O
pt&8) shift++;
+ if (Pico
In.o
pt&8) shift++;
if (audio_skew < 0) {
adj = -((-audio_skew) >> shift);
if (audio_skew > -(6<<co)) adj>>=1;
if (audio_skew < 0) {
adj = -((-audio_skew) >> shift);
if (audio_skew > -(6<<co)) adj>>=1;
@@
-699,7
+674,7
@@
void pemu_loop(void)
}
}
- if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+ if (Pico
In.
AHW & PAHW_MCD) PicoCDBufferFree();
if (PsndOut != NULL) {
PsndOut = snd_cbuff = NULL;
if (PsndOut != NULL) {
PsndOut = snd_cbuff = NULL;