32x: more wip

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@774 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/common/emu.c b/common/emu.c
index 627c3be..cc450d8 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -514,6 +514,9 @@ int emu_reload_rom(char *rom_fname)
 \r
        shutdown_MCD();\r
        PicoPatchUnload();\r
+       PicoCartUnload();\r
+       rom_loaded = 0;\r
+\r
        PicoAHW = 0;\r
 \r
        if (media_type == PM_CD)\r
@@ -558,9 +561,6 @@ int emu_reload_rom(char *rom_fname)
 \r
        menu_romload_prepare(used_rom_name); // also CD load\r
 \r
-       PicoCartUnload();\r
-       rom_loaded = 0;\r
-\r
        ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);\r
        pm_close(rom);\r
        if (ret != 0) {\r

diff --git a/common/menu.c b/common/menu.c
index adfacef..1788033 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -1752,11 +1752,12 @@ static void draw_text_debug(const char *str, int skip, int from)
 \r
 static void draw_frame_debug(void)\r
 {\r
-       char layer_str[48] = "layers:             ";\r
+       char layer_str[48] = "layers:                   ";\r
        if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);\r
        if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);\r
        if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);\r
        if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);\r
+       if (PicoDrawMask & PDRAW_32X_ON)         memcpy(layer_str + 26, "32x", 4);\r
 \r
        memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
        pemu_forced_frame(0);\r
@@ -1826,6 +1827,7 @@ static void debug_menu_loop(void)
                                if (inp & PBTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
                                if (inp & PBTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
                                if (inp & PBTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
+                               if (inp & PBTN_MA2)   PicoDrawMask ^= PDRAW_32X_ON;\r
                                if (inp & PBTN_MOK) {\r
                                        PsndOut = NULL; // just in case\r
                                        PicoSkipFrame = 1;\r

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 8ccea30..8a061cb 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -116,8 +116,9 @@ vpath %.c = ../..
 vpath %.s = ../..\r
 vpath %.S = ../..\r
 \r
-DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound \\r
-       pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \\r
+       pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \\r
+       cpu/mz80 cpu/DrZ80\r
 \r
 \r
 all: mkdirs PicoDrive\r