mcd: text shows up

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

diff --git a/gp2x/Makefile b/gp2x/Makefile
index a524cc0..fc729b0 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -92,10 +92,15 @@ ifeq "$(up)" "1"
        @cmd //C copy $@ \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 endif\r
 \r
-up: up940\r
-       @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
+up: # up940\r
+       @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/games/PicoDrive/\r
+\r
+#      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
+\r
 up940:\r
-       @cmd //C copy code940.bin \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
+       @cp -v code940.bin /mnt/gp2x/mnt/sd/games/PicoDrive/\r
+\r
+#      @cmd //C copy code940.bin \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
 testrefr.gpe : test.o gp2x.o asmutils.o\r
        @echo $@\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 6e0021b..a90d850 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -79,14 +79,15 @@ static void strlwr(char* string)
        while ( (*string++ = (char)tolower(*string)) );\r
 }\r
 \r
-static int try_rfn_ext(char *ext)\r
+static int try_rfn_cut(void)\r
 {\r
        FILE *tmp;\r
        char *p;\r
 \r
-       p = romFileName + strlen(romFileName) - 4;\r
-       if (p < romFileName) p = romFileName;\r
-       strcpy(p, ext);\r
+       p = romFileName + strlen(romFileName) - 1;\r
+       for (; p > romFileName; p--)\r
+               if (*p == '.') break;\r
+       *p = 0;\r
 \r
        if((tmp = fopen(romFileName, "rb"))) {\r
                fclose(tmp);\r
@@ -156,8 +157,7 @@ int emu_ReloadRom(void)
                        sprintf(menuErrorMsg, "Invalid GMV file.");\r
                        return 0;\r
                }\r
-               dummy = try_rfn_ext(".zip") || try_rfn_ext(".bin") ||\r
-                       try_rfn_ext(".smd") || try_rfn_ext(".gen");\r
+               dummy = try_rfn_cut() || try_rfn_cut();\r
                if (!dummy) {\r
                        sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
                        return 0;\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 588e0c9..7b18517 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -352,11 +352,11 @@ static char *romsel_loop(char *curr_path)
        for (;;)\r
        {\r
                draw_dirlist(curr_path, namelist, n, sel);\r
-               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_B|GP2X_X);\r
+               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);\r
                if(inp & GP2X_UP  )  { sel--;   if (sel < 0)   sel = n-2; }\r
                if(inp & GP2X_DOWN)  { sel++;   if (sel > n-2) sel = 0; }\r
-               if(inp & GP2X_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }\r
-               if(inp & GP2X_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
+               if(inp &(GP2X_LEFT|GP2X_L))  { sel-=10; if (sel < 0)   sel = 0; }\r
+               if(inp &(GP2X_RIGHT|GP2X_R)) { sel+=10; if (sel > n-2) sel = n-2; }\r
                if(inp & GP2X_B)     { // enter dir/select\r
                        again:\r
                        if (namelist[sel+1]->d_type == DT_REG) {\r
@@ -827,7 +827,7 @@ static void draw_menu_credits(void)
        int tl_x = 15, tl_y = 70, y;\r
        memset(gp2x_screen, 0, 320*240);\r
 \r
-       gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006");\r
+       gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
        y = tl_y;\r
        gp2x_text_out8(tl_x, y, "Credits:");\r
        gp2x_text_out8(tl_x, (y+=10), "Dave: Cyclone 68000 core,");\r

diff --git a/gp2x/version.h b/gp2x/version.h
index 1331a8a..8d13814 100644 (file)
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "0.964"\r
+#define VERSION "0.965"\r
 \r

diff --git a/linux/port_config.h b/linux/port_config.h
index be76af4..e5c88bb 100644 (file)
--- a/linux/port_config.h
+++ b/linux/port_config.h
@@ -12,7 +12,7 @@
 // pico.c
 #define CAN_HANDLE_240_LINES   1
 
-#define dprintf(f,...) printf("%05i: " f "\n",Pico.m.frame_count,##__VA_ARGS__)
+#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
 //#define dprintf(x...)
 
 #endif //PORT_CONFIG_H