rearrange globals

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

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 7db89c2..3b3a234 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -7,8 +7,8 @@
  * - 8bpp tile renderer\r
  * In 32x mode:\r
  * - 32x layer is overlayed on top of 16bpp one\r
- * - line internal one done on PicoDraw2FB, then mixed with 32x\r
- * - tile internal one done on PicoDraw2FB, then mixed with 32x\r
+ * - line internal one done on .Draw2FB, then mixed with 32x\r
+ * - tile internal one done on .Draw2FB, then mixed with 32x\r
  */\r
 \r
 #include <stdio.h>\r
@@ -30,7 +30,7 @@
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
 #include <pico/sound/mix.h>\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
 \r
 #ifdef BENCHMARK\r
 #define OSD_FPS_X 220\r
@@ -70,7 +70,7 @@ void pemu_prep_defconfig(void)
 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
@@ -83,7 +83,7 @@ void pemu_validate_config(void)
 \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
@@ -92,14 +92,14 @@ static int get_renderer(void)
 static void change_renderer(int diff)\r
 {\r
        int *r;\r
-       if (PicoAHW & PAHW_32X)\r
+       if (PicoIn.AHW & PAHW_32X)\r
                r = &currentConfig.renderer32x;\r
        else\r
                r = &currentConfig.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
@@ -109,7 +109,7 @@ static void change_renderer(int diff)
 }\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
@@ -128,21 +128,6 @@ static void osd_text8(int x, int y, const char *text)
        emu_text_out8(x, y, text);\r
 }\r
 \r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+1) >> 1;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~1;\r
-               p = (int *) ((short *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = (*p >> 2) & 0x39e7;\r
-       }\r
-       emu_text_out16(x, y, text);\r
-}\r
-\r
 static void osd_text8_rot(int x, int y, const char *text)\r
 {\r
        int len = strlen(text) * 8;\r
@@ -216,7 +201,7 @@ static void draw_pico_ptr(void)
 \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
@@ -237,7 +222,7 @@ static unsigned char __attribute__((aligned(4))) rot_buff[320*4*2];
 \r
 static int EmuScanBegin16_rot(unsigned int num)\r
 {\r
-       DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
+       Pico.est.DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
        return 0;\r
 }\r
 \r
@@ -246,13 +231,13 @@ static int EmuScanEnd16_rot(unsigned int num)
        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
 static int EmuScanBegin8_rot(unsigned int num)\r
 {\r
-       DrawLineDest = rot_buff + (num & 3) * 320;\r
+       Pico.est.DrawLineDest = rot_buff + (num & 3) * 320;\r
        return 0;\r
 }\r
 \r
@@ -277,14 +262,14 @@ static int EmuScanBegin16_ld(unsigned int num)
        if (emu_scan_begin)\r
                return emu_scan_begin(ld_counter);\r
        else\r
-               DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;\r
+               Pico.est.DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;\r
 \r
        return 0;\r
 }\r
 \r
 static int EmuScanEnd16_ld(unsigned int num)\r
 {\r
-       void *oldline = DrawLineDest;\r
+       void *oldline = Pico.est.DrawLineDest;\r
 \r
        if (emu_scan_end)\r
                emu_scan_end(ld_counter);\r
@@ -295,7 +280,7 @@ static int EmuScanEnd16_ld(unsigned int num)
                ld_left = ld_lines;\r
 \r
                EmuScanBegin16_ld(num);\r
-               memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);\r
+               memcpy(Pico.est.DrawLineDest, oldline, 320 * gp2x_current_bpp / 8);\r
                if (emu_scan_end)\r
                        emu_scan_end(ld_counter);\r
 \r
@@ -325,12 +310,12 @@ static int make_local_pal_md(int fast_mode)
                localPal[0xf0] = 0x00ffffff;\r
                pallen = 0x100;\r
        }\r
-       else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
-               bgr444_to_rgb32(localPal+0x40, HighPal);\r
-               bgr444_to_rgb32(localPal+0x80, HighPal+0x40);\r
+       else if (Pico.est.rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
+               bgr444_to_rgb32(localPal+0x40, Pico.est.HighPal);\r
+               bgr444_to_rgb32(localPal+0x80, Pico.est.HighPal+0x40);\r
        }\r
        else\r
-               memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
+               memcpy(localPal + 0x80, localPal, 0x40 * 4); // for spr prio mess\r
 \r
        return pallen;\r
 }\r
@@ -357,7 +342,7 @@ void pemu_finalize_frame(const char *fps, const char *notice)
        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
@@ -369,11 +354,11 @@ void pemu_finalize_frame(const char *fps, const char *notice)
                        gp2x_video_setpalette(localPal, ret);\r
                }\r
                // a hack for VR\r
-               if (PicoAHW & PAHW_SVP)\r
-                       memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\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, PicoDraw2FB+328*8,\r
-                       !(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
+               vidcpyM2(g_screen_ptr, Pico.est.Draw2FB+328*8,\r
+                       !(Pico.video.reg[12] & 1), !(PicoIn.opt & POPT_DIS_32C_BORDER));\r
        }\r
        else if (get_renderer() == RT_8BIT_ACC)\r
        {\r
@@ -390,9 +375,9 @@ void pemu_finalize_frame(const char *fps, const char *notice)
                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
@@ -407,7 +392,6 @@ void plat_video_flip(void)
 }\r
 \r
 /* XXX */\r
-#ifdef __GP2X__\r
 unsigned int plat_get_ticks_ms(void)\r
 {\r
        return gp2x_get_ticks_ms();\r
@@ -417,7 +401,6 @@ unsigned int plat_get_ticks_us(void)
 {\r
        return gp2x_get_ticks_us();\r
 }\r
-#endif\r
 \r
 void plat_wait_till_us(unsigned int us_to)\r
 {\r
@@ -489,7 +472,7 @@ static void vid_reset_mode(void)
        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
@@ -504,7 +487,7 @@ static void vid_reset_mode(void)
                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
@@ -514,7 +497,7 @@ static void vid_reset_mode(void)
                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
@@ -527,7 +510,7 @@ static void vid_reset_mode(void)
        }\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
@@ -542,7 +525,7 @@ static void vid_reset_mode(void)
        PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);\r
 \r
        if (is_16bit_mode())\r
-               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
+               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : emu_osd_text16;\r
        else\r
                osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
 \r
@@ -562,16 +545,16 @@ static void vid_reset_mode(void)
        if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
                gp2x_mode = -gp2x_mode;\r
 \r
-       gp2x_video_changemode(gp2x_mode);\r
+       gp2x_video_changemode(gp2x_mode, Pico.m.pal);\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
@@ -586,10 +569,10 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
        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
@@ -624,7 +607,7 @@ void plat_video_toggle_renderer(int change, int is_menu_call)
        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
@@ -643,7 +626,7 @@ static void RunEventsPico(unsigned int events)
                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
@@ -671,7 +654,7 @@ void plat_update_volume(int has_changed, int is_up)
        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
@@ -701,47 +684,20 @@ void plat_update_volume(int has_changed, int is_up)
 \r
 void pemu_sound_start(void)\r
 {\r
-       emu_sound_start();\r
-\r
-       plat_target_step_volume(&currentConfig.volume, 0);\r
-\r
-#if 0\r
-       static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;\r
+       gp2x_soc_t soc;\r
 \r
-       PsndOut = NULL;\r
+       emu_sound_start();\r
 \r
-       // prepare sound stuff\r
        if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
        {\r
-               int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
-               int snd_rate_oss = PsndRate;\r
-               gp2x_soc_t soc;\r
-\r
-               memset(sndBuffer, 0, sizeof(sndBuffer));\r
-               PsndOut = sndBuffer;\r
-               PicoWriteSound = oss_write_nonblocking;\r
-               plat_update_volume(0, 0);\r
-\r
-               printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\r
-                       PsndRate, PsndLen, is_stereo, Pico.m.pal);\r
-               sndout_oss_start(snd_rate_oss, is_stereo, 1);\r
-               sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
-\r
                soc = soc_detect();\r
-               if (soc == SOCID_POLLUX)\r
+               if (soc == SOCID_POLLUX) {\r
                        PsndRate = pollux_get_real_snd_rate(PsndRate);\r
-\r
-               #define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)\r
-               if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||\r
-                               ((PicoOpt ^ PicoOpt_old) & SOUND_RERATE_FLAGS)) {\r
                        PsndRerate(Pico.m.frame_count ? 1 : 0);\r
                }\r
 \r
-               PsndRate_old = PsndRate;\r
-               PicoOpt_old  = PicoOpt;\r
-               pal_old = Pico.m.pal;\r
+               plat_target_step_volume(&currentConfig.volume, 0);\r
        }\r
-#endif\r
 }\r
 \r
 static const int sound_rates[] = { 44100, 32000, 22050, 16000, 11025, 8000 };\r