From: notaz <notasas@gmail.com>
Date: Sun, 2 Dec 2007 21:52:47 +0000 (+0000)
Subject: renamed pico940 to pico940_v2 due to abi change
X-Git-Tag: v1.85~610
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=8f8fe01e049d9963523928a910eb4f83aac1da54;p=picodrive.git

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 b919ee88..c883a768 100644
--- 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
       if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
@@ -161,7 +161,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
@@ -172,7 +172,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((a&0xfe) == (s68k_poll_adclk&0xfe) && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
@@ -197,7 +197,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
       //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt);
       if (s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(1);
-        elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a);
+        elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x", SekPcS68k, a);
       }
       s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;
       return d;
@@ -808,7 +808,7 @@ static void PicoWriteM68k16(u32 a,u16 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
       }
 #endif
       return;
diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index 917ed29c..d2f4a32d 100644
--- 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;
 
 #define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M
-#define CODE940_FILE "pico940.bin"
+#define CODE940_FILE "pico940_v2.bin"
 
 int crashed_940 = 0;
 
diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 7c083c19..8e8ff2ed 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -224,7 +224,7 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/pico940.bin readme.txt PicoDrive.man.txt PicoDrive.png
+rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png
 	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
 
diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index d8da1631..6b3f5f8c 100644
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -18,7 +18,7 @@ AS = $(CROSS)as
 LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
-BIN = pico940.bin
+BIN = pico940_v2.bin
 
 all: $(BIN)