rearrange globals

[picodrive.git] / platform / linux / emu.c

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index aee8d44..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
-       extern int PicoOpt;\r
-//     PicoOpt &= ~POPT_EXT_FM;\r
 #ifndef __arm__\r
-       PicoOpt &= ~POPT_EN_DRC;\r
+       PicoIn.opt &= ~POPT_EN_DRC;\r
 #endif\r
 }\r
 \r
@@ -68,7 +66,7 @@ static void draw_cd_leds(void)
 \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 && !(PicoIn.AHW & PAHW_32X)) {\r
                unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;\r
                unsigned char *ps = Pico.est.Draw2FB + 328*8 + 8;\r
                unsigned short *pal = Pico.est.HighPal;\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 ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
+       if ((PicoIn.AHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\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
-               PicoOpt &= ~POPT_ALT_RENDERER;\r
+               PicoIn.opt &= ~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
-               PicoOpt &= ~POPT_ALT_RENDERER;\r
+               PicoIn.opt &= ~POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_8BIT, 0);\r
                PicoDrawSetOutBuf(Pico.est.Draw2FB + 8, 328);\r
                break;\r
        case RT_8BIT_FAST:\r
-               PicoOpt |=  POPT_ALT_RENDERER;\r
+               PicoIn.opt |=  POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_NONE, 0);\r
                break;\r
        }\r
 \r
-       if (PicoAHW & PAHW_32X)\r
+       if (PicoIn.AHW & PAHW_32X)\r
                PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
 }\r
 \r