1.20 release

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

diff --git a/gp2x/emu.c b/gp2x/emu.c
index cdb69b7..d973805 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -424,8 +424,6 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
        dst[511-8] = 0;\r
        if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;\r
        if (ext) strcat(dst, ext);\r
-\r
-       printf("romfname_ext: %s\n", dst);\r
 }\r
 \r
 \r
@@ -973,9 +971,9 @@ void emu_forced_frame(void)
        PicoOpt = po_old;\r
 \r
        if (!(Pico.video.reg[12]&1)) {\r
-               vidCpyM2 = vidCpyM2_40col;\r
+               vidCpyM2 = vidCpyM2_32col;\r
                clearArea(1);\r
-       } else  vidCpyM2 = vidCpyM2_32col;\r
+       } else  vidCpyM2 = vidCpyM2_40col;\r
 \r
        vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
        vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
@@ -1369,8 +1367,10 @@ int emu_SaveLoadGame(int load, int sram)
        // make save filename\r
        saveFname = emu_GetSaveFName(load, sram, state_slot);\r
        if (saveFname == NULL) {\r
-               strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");\r
-               gettimeofday(&noticeMsgTime, 0);\r
+               if (!sram) {\r
+                       strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");\r
+                       gettimeofday(&noticeMsgTime, 0);\r
+               }\r
                return -1;\r
        }\r
 \r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 9a2914a..236b693 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -688,9 +688,10 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
        gp2x_text_out8(tl_x, y,       "USA BIOS:     %s", b_us); // 0\r
        gp2x_text_out8(tl_x, (y+=10), "EUR BIOS:     %s", b_eu); // 1\r
        gp2x_text_out8(tl_x, (y+=10), "JAP BIOS:     %s", b_jp); // 2\r
-       gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x400)?"ON":"OFF"); // 3\r
-       gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x800)?"ON":"OFF"); // 4\r
-       gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x400)?"ON":"OFF"); // 5\r
+       gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3\r
+       gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4\r
+       gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5\r
+       gp2x_text_out8(tl_x, (y+=10), "Better sync (very slow)    %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6\r
        gp2x_text_out8(tl_x, (y+=10), "Done");\r
 \r
        // draw cursor\r
@@ -706,7 +707,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 \r
 static void cd_menu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 6;\r
+       int menu_sel = 0, menu_sel_max = 7;\r
        unsigned long inp = 0;\r
        char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;\r
 \r
@@ -733,10 +734,11 @@ static void cd_menu_loop_options(void)
                if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
                        switch (menu_sel) {\r
-                               case  3: currentConfig.EmuOpt ^=0x400; break;\r
-                               case  4: currentConfig.PicoOpt^=0x800; break;\r
-                               case  5: currentConfig.PicoOpt^=0x400; break;\r
-                               case  6: return;\r
+                               case  3: currentConfig.EmuOpt ^=0x0400; break;\r
+                               case  4: currentConfig.PicoOpt^=0x0800; break;\r
+                               case  5: currentConfig.PicoOpt^=0x0400; break;\r
+                               case  6: currentConfig.PicoOpt^=0x2000; break;\r
+                               case  7: return;\r
                        }\r
                }\r
                if(inp & (GP2X_X|GP2X_A)) return;\r

diff --git a/gp2x/version.h b/gp2x/version.h
index 0645b77..eeb782c 100644 (file)
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.15"\r
+#define VERSION "1.20"\r
 \r

diff --git a/linux/gp2x.c b/linux/gp2x.c
index 38ab053..e4e3421 100644 (file)
--- a/linux/gp2x.c
+++ b/linux/gp2x.c
@@ -260,6 +260,11 @@ void gp2x_video_RGB_setscaling(int W, int H)
 {
 }
 
+void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
+{
+       memcpy((char *)gp2x_screen + offset, data, len);
+}
+
 void gp2x_memcpy_all_buffers(void *data, int offset, int len)
 {
        memcpy((char *)gp2x_screen + offset, data, len);