notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 68k overclocking support
[picodrive.git]
/
platform
/
linux
/
emu.c
diff --git
a/platform/linux/emu.c
b/platform/linux/emu.c
index
91115ad
..
ddde8da
100644
(file)
--- a/
platform/linux/emu.c
+++ b/
platform/linux/emu.c
@@
-29,10
+29,8
@@
void pemu_prep_defconfig(void)
\r
void pemu_validate_config(void)
\r
{
\r
\r
void pemu_validate_config(void)
\r
{
\r
- extern int PicoOpt;
\r
-// PicoOpt &= ~POPT_EXT_FM;
\r
#ifndef __arm__
\r
#ifndef __arm__
\r
- Pico
O
pt &= ~POPT_EN_DRC;
\r
+ Pico
In.o
pt &= ~POPT_EN_DRC;
\r
#endif
\r
}
\r
\r
#endif
\r
}
\r
\r
@@
-68,10
+66,10
@@
static void draw_cd_leds(void)
\r
void pemu_finalize_frame(const char *fps, const char *notice)
\r
{
\r
\r
void pemu_finalize_frame(const char *fps, const char *notice)
\r
{
\r
- if (currentConfig.renderer != RT_16BIT && !(PicoAHW & PAHW_32X)) {
\r
+ if (currentConfig.renderer != RT_16BIT && !(Pico
In.
AHW & PAHW_32X)) {
\r
unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;
\r
unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;
\r
- unsigned char *ps = PicoDraw2FB + 328*8 + 8;
\r
- unsigned short *pal = HighPal;
\r
+ unsigned char *ps = Pico
.est.
Draw2FB + 328*8 + 8;
\r
+ unsigned short *pal =
Pico.est.
HighPal;
\r
int i, x;
\r
if (Pico.m.dirtyPal)
\r
PicoDrawUpdateHighPal();
\r
int i, x;
\r
if (Pico.m.dirtyPal)
\r
PicoDrawUpdateHighPal();
\r
@@
-86,7
+84,7
@@
void pemu_finalize_frame(const char *fps, const char *notice)
if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
\r
emu_osd_text16(g_screen_width - 60, g_screen_height - 8, fps);
\r
}
\r
if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
\r
emu_osd_text16(g_screen_width - 60, g_screen_height - 8, fps);
\r
}
\r
- if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
\r
+ if ((Pico
In.
AHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
\r
draw_cd_leds();
\r
}
\r
\r
draw_cd_leds();
\r
}
\r
\r
@@
-94,22
+92,22
@@
static void apply_renderer(void)
{
\r
switch (currentConfig.renderer) {
\r
case RT_16BIT:
\r
{
\r
switch (currentConfig.renderer) {
\r
case RT_16BIT:
\r
- Pico
O
pt &= ~POPT_ALT_RENDERER;
\r
+ Pico
In.o
pt &= ~POPT_ALT_RENDERER;
\r
PicoDrawSetOutFormat(PDF_RGB555, 0);
\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
\r
break;
\r
case RT_8BIT_ACC:
\r
PicoDrawSetOutFormat(PDF_RGB555, 0);
\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
\r
break;
\r
case RT_8BIT_ACC:
\r
- Pico
O
pt &= ~POPT_ALT_RENDERER;
\r
+ Pico
In.o
pt &= ~POPT_ALT_RENDERER;
\r
PicoDrawSetOutFormat(PDF_8BIT, 0);
\r
PicoDrawSetOutFormat(PDF_8BIT, 0);
\r
- PicoDrawSetOutBuf(PicoDraw2FB + 8, 328);
\r
+ PicoDrawSetOutBuf(Pico
.est.
Draw2FB + 8, 328);
\r
break;
\r
case RT_8BIT_FAST:
\r
break;
\r
case RT_8BIT_FAST:
\r
- Pico
O
pt |= POPT_ALT_RENDERER;
\r
+ Pico
In.o
pt |= POPT_ALT_RENDERER;
\r
PicoDrawSetOutFormat(PDF_NONE, 0);
\r
break;
\r
}
\r
\r
PicoDrawSetOutFormat(PDF_NONE, 0);
\r
break;
\r
}
\r
\r
- if (PicoAHW & PAHW_32X)
\r
+ if (Pico
In.
AHW & PAHW_32X)
\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
\r
}
\r
\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
\r
}
\r
\r
@@
-203,3
+201,7
@@
void plat_wait_till_us(unsigned int us_to)
}
\r
}
\r
\r
}
\r
}
\r
\r
+void *plat_mem_get_for_drc(size_t size)
\r
+{
\r
+ return NULL;
\r
+}
\r