renamed pico940 to pico940_v2 due to abi change

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

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index b919ee8..c883a76 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -141,7 +141,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT\r
       if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
       }\r
 #endif\r
       return;\r
@@ -161,7 +161,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT\r
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
       }\r
 #endif\r
       return;\r
@@ -172,7 +172,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT\r
       if ((a&0xfe) == (s68k_poll_adclk&0xfe) && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
       }\r
 #endif\r
       return;\r
@@ -197,7 +197,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
       //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt);\r
       if (s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(1);\r
-        elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a);\r
+        elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x", SekPcS68k, a);\r
       }\r
       s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;\r
       return d;\r
@@ -808,7 +808,7 @@ static void PicoWriteM68k16(u32 a,u16 d)
 #ifdef USE_POLL_DETECT\r
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
       }\r
 #endif\r
       return;\r

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index 917ed29..d2f4a32 100644 (file)
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -33,7 +33,7 @@ _940_ctl_t *shared_ctl = 0;
 unsigned char *mp3_mem = 0;\r
 \r
 #define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M\r
-#define CODE940_FILE "pico940.bin"\r
+#define CODE940_FILE "pico940_v2.bin"\r
 \r
 int crashed_940 = 0;\r
 \r

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 7c083c1..8e8ff2e 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -224,7 +224,7 @@ $(error need VER)
 endif\r
 endif\r
 \r
-rel: PicoDrive.gpe code940/pico940.bin readme.txt PicoDrive.man.txt PicoDrive.png\r
+rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png\r
        zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o\r
        zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
 \r

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index d8da163..6b3f5f8 100644 (file)
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -18,7 +18,7 @@ AS = $(CROSS)as
 LD = $(CROSS)ld\r
 OBJCOPY = $(CROSS)objcopy\r
 \r
-BIN = pico940.bin\r
+BIN = pico940_v2.bin\r
 \r
 all: $(BIN)\r
 \r