rename cd/pico.c -> cd/mcd.c

diff --git a/Makefile b/Makefile
index 439a66f..d094104 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ pico/cd/gfx_cd.o: CFLAGS += -fno-strict-aliasing
 pico/carthw/svp/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/mame/sh2pico.o : cpu/sh2/mame/sh2.c
-pico/pico.o pico/cd/pico.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
+pico/pico.o pico/cd/mcd.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
 pico/memory.o pico/cd/memory.o : pico/pico_int.h pico/memory.h
 cpu/fame/famec.o: cpu/fame/famec.c cpu/fame/famec_opcodes.h
 

diff --git a/pico/cd/pico.c b/pico/cd/mcd.c
similarity index 100%
rename from pico/cd/pico.c
rename to pico/cd/mcd.c

diff --git a/pico/cd/pico_arm.s b/pico/cd/mcd_arm.s
similarity index 100%
rename from pico/cd/pico_arm.s
rename to pico/cd/mcd_arm.s

diff --git a/pico/pico.h b/pico/pico.h
index e1bcf03..43217dc 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -99,7 +99,7 @@ typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;
 typedef union { int vint; void *vptr; } pint_ret_t;\r
 void PicoGetInternal(pint_t which, pint_ret_t *ret);\r
 \r
-// cd/Pico.c\r
+// cd/mcd.c\r
 extern void (*PicoMCDopenTray)(void);\r
 extern void (*PicoMCDcloseTray)(void);\r
 extern int PicoCDBuffers;\r

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index bdf48cf..af696e5 100644 (file)
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -1,6 +1,6 @@
 /*
- * common code for pico.c and cd/pico.c
- * (C) notaz, 2007-2009
+ * common code for base/cd/32x
+ * (C) notaz, 2007-2009,2013
  *
  * This work is licensed under the terms of MAME license.
  * See COPYING file in the top-level directory.

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 9b597d8..be56abd 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -607,7 +607,7 @@ PICO_INTERNAL int  CheckDMA(void);
 PICO_INTERNAL void PicoDetectRegion(void);\r
 PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done);\r
 \r
-// cd/pico.c\r
+// cd/mcd.c\r
 #define PCDS_IEN1     (1<<1)\r
 #define PCDS_IEN2     (1<<2)\r
 #define PCDS_IEN3     (1<<3)\r

diff --git a/platform/common/common.mak b/platform/common/common.mak
index a365abc..da5a52e 100644 (file)
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -63,7 +63,7 @@ SRCS_COMMON += $(R)pico/cd/misc_arm.s
 endif
 ifeq "$(asm_cdpico)" "1"
 DEFINES += _ASM_CD_PICO_C
-SRCS_COMMON += $(R)pico/cd/pico_arm.s
+SRCS_COMMON += $(R)pico/cd/mcd_arm.s
 endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINES += _ASM_CD_MEMORY_C
@@ -92,7 +92,7 @@ else
 DEFINES += NO_SMS
 endif
 # CD
-SRCS_COMMON += $(R)pico/cd/pico.c $(R)pico/cd/memory.c $(R)pico/cd/sek.c \
+SRCS_COMMON += $(R)pico/cd/mcd.c $(R)pico/cd/memory.c $(R)pico/cd/sek.c \
        $(R)pico/cd/LC89510.c $(R)pico/cd/cd_sys.c $(R)pico/cd/cd_file.c \
        $(R)pico/cd/cue.c $(R)pico/cd/gfx_cd.c $(R)pico/cd/misc.c \
        $(R)pico/cd/pcm.c $(R)pico/cd/buffering.c
@@ -184,10 +184,12 @@ $(FR)cpu/cyclone/Cyclone.h:
        @echo "Cyclone submodule is missing, please run 'git submodule update --init'"
        @false
 
-$(FR)cpu/cyclone/Cyclone.s:
+$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone_config.h
        @echo building Cyclone...
        @make -C $(R)cpu/cyclone/ CONFIG_FILE=../cyclone_config.h
 
+$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h
+
 $(FR)cpu/musashi/m68kops.c:
        @make -C $(R)cpu/musashi