void pemu_validate_config(void)\r
{\r
if (gp2x_dev_id != GP2X_DEV_GP2X)\r
- PicoOpt &= ~POPT_EXT_FM;\r
+ PicoIn.opt &= ~POPT_EXT_FM;\r
if (gp2x_dev_id != GP2X_DEV_WIZ)\r
currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;\r
\r
\r
static int get_renderer(void)\r
{\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
return currentConfig.renderer32x;\r
else\r
return currentConfig.renderer;\r
static void change_renderer(int diff)\r
{\r
int *r;\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
r = ¤tConfig.renderer32x;\r
else\r
r = ¤tConfig.renderer;\r
*r += diff;\r
\r
// 8bpp fast is not there (yet?)\r
- if ((PicoAHW & PAHW_SMS) && *r == RT_8BIT_FAST)\r
+ if ((PicoIn.AHW & PAHW_SMS) && *r == RT_8BIT_FAST)\r
(*r)++;\r
\r
if (*r >= RT_COUNT)\r
}\r
\r
#define is_16bit_mode() \\r
- (get_renderer() == RT_16BIT || (PicoAHW & PAHW_32X))\r
+ (get_renderer() == RT_16BIT || (PicoIn.AHW & PAHW_32X))\r
\r
static void (*osd_text)(int x, int y, const char *text);\r
\r
\r
x = pico_pen_x + PICO_PEN_ADJUST_X;\r
y = pico_pen_y + PICO_PEN_ADJUST_Y;\r
- if (!(Pico.video.reg[12]&1) && !(PicoOpt & POPT_DIS_32C_BORDER))\r
+ if (!(Pico.video.reg[12]&1) && !(PicoIn.opt & POPT_DIS_32C_BORDER))\r
x += 32;\r
\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
if ((num & 3) != 3)\r
return 0;\r
rotated_blit16(g_screen_ptr, rot_buff, num + 1,\r
- !(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));\r
+ !(Pico.video.reg[12] & 1) && !(PicoIn.opt & POPT_EN_SOFTSCALE));\r
return 0;\r
}\r
\r
int emu_opt = currentConfig.EmuOpt;\r
int ret;\r
\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
; // nothing to do\r
else if (get_renderer() == RT_8BIT_FAST)\r
{\r
gp2x_video_setpalette(localPal, ret);\r
}\r
// a hack for VR\r
- if (PicoAHW & PAHW_SVP)\r
+ if (PicoIn.AHW & PAHW_SVP)\r
memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
// do actual copy\r
vidcpyM2(g_screen_ptr, Pico.est.Draw2FB+328*8,\r
- !(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
+ !(Pico.video.reg[12] & 1), !(PicoIn.opt & POPT_DIS_32C_BORDER));\r
}\r
else if (get_renderer() == RT_8BIT_ACC)\r
{\r
osd_text(4, osd_y, notice);\r
if (emu_opt & EOPT_SHOW_FPS)\r
osd_text(osd_fps_x, osd_y, fps);\r
- if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
+ if ((PicoIn.AHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
- if (PicoAHW & PAHW_PICO)\r
+ if (PicoIn.AHW & PAHW_PICO)\r
draw_pico_ptr();\r
}\r
\r
int gp2x_mode = 16;\r
int renderer = get_renderer();\r
\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
+ PicoIn.opt &= ~POPT_ALT_RENDERER;\r
emu_scan_begin = NULL;\r
emu_scan_end = NULL;\r
\r
gp2x_mode = 8;\r
break;\r
case RT_8BIT_FAST:\r
- PicoOpt |= POPT_ALT_RENDERER;\r
+ PicoIn.opt |= POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_NONE, 0);\r
vidcpyM2 = vidcpy_m2;\r
gp2x_mode = 8;\r
break;\r
}\r
\r
- if (PicoAHW & PAHW_32X) {\r
+ if (PicoIn.AHW & PAHW_32X) {\r
// Wiz 16bit is an exception, uses line rendering due to rotation mess\r
if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {\r
PicoDrawSetOutFormat(PDF_RGB555, 1);\r
}\r
\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- if ((PicoAHW & PAHW_32X) || renderer == RT_16BIT) {\r
+ if ((PicoIn.AHW & PAHW_32X) || renderer == RT_16BIT) {\r
emu_scan_begin = EmuScanBegin16_rot;\r
emu_scan_end = EmuScanEnd16_rot;\r
}\r
\r
Pico.m.dirtyPal = 1;\r
\r
- PicoOpt &= ~POPT_EN_SOFTSCALE;\r
+ PicoIn.opt &= ~POPT_EN_SOFTSCALE;\r
if (currentConfig.scaling == EOPT_SCALE_SW)\r
- PicoOpt |= POPT_EN_SOFTSCALE;\r
+ PicoIn.opt |= POPT_EN_SOFTSCALE;\r
\r
// palette converters for 8bit modes\r
- make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
+ make_local_pal = (PicoIn.AHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
}\r
\r
void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
osd_y = 232;\r
\r
/* set up hwscaling here */\r
- PicoOpt &= ~POPT_DIS_32C_BORDER;\r
+ PicoIn.opt &= ~POPT_DIS_32C_BORDER;\r
if (is_32cols && currentConfig.scaling == EOPT_SCALE_HW) {\r
scalex = 256;\r
- PicoOpt |= POPT_DIS_32C_BORDER;\r
+ PicoIn.opt |= POPT_DIS_32C_BORDER;\r
osd_fps_x = OSD_FPS_X - 64;\r
}\r
\r
vid_reset_mode();\r
rendstatus_old = -1;\r
\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
emu_status_msg(renderer_names32x[get_renderer()]);\r
else\r
emu_status_msg(renderer_names[get_renderer()]);\r
if (ret > 35000)\r
{\r
if (pdown_frames++ > 5)\r
- PicoPad[0] |= 0x20;\r
+ PicoIn.pad[0] |= 0x20;\r
\r
pico_pen_x = px;\r
pico_pen_y = py;\r
gp2x_soc_t soc;\r
\r
soc = soc_detect();\r
- if ((PicoOpt & POPT_EN_STEREO) && soc == SOCID_MMSP2)\r
+ if ((PicoIn.opt & POPT_EN_STEREO) && soc == SOCID_MMSP2)\r
need_low_volume = 1;\r
\r
if (has_changed)\r