summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Wilbert Pol <wilbert@jdg.info>2013-12-27 12:50:54 +0000
committer Wilbert Pol <wilbert@jdg.info>2013-12-27 12:50:54 +0000
commit87948b0c578ff35cd0340a2ad027c4c4a7260c99 (patch)
tree3f90dc685a331ece81309fb72c5957bfed3a97c5
parent33705d99d44273234ab89a2e3f10959678021230 (diff)
small cleanup (nw)
-rw-r--r--.gitattributes1
-rw-r--r--src/emu/cpu/cpu.mak1
-rw-r--r--src/emu/cpu/sc61860/sc.h32
-rw-r--r--src/emu/cpu/sc61860/sc61860.c20
-rw-r--r--src/emu/cpu/sc61860/sc61860.h17
-rw-r--r--src/emu/cpu/sc61860/scdasm.c1
6 files changed, 36 insertions, 36 deletions
diff --git a/.gitattributes b/.gitattributes
index e827f153184..746d36ab4c4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1352,7 +1352,6 @@ src/emu/cpu/saturn/saturn.c svneol=native#text/plain
src/emu/cpu/saturn/saturn.h svneol=native#text/plain
src/emu/cpu/saturn/saturnds.c svneol=native#text/plain
src/emu/cpu/sc61860/readpc.c svneol=native#text/plain
-src/emu/cpu/sc61860/sc.h svneol=native#text/plain
src/emu/cpu/sc61860/sc61860.c svneol=native#text/plain
src/emu/cpu/sc61860/sc61860.h svneol=native#text/plain
src/emu/cpu/sc61860/scdasm.c svneol=native#text/plain
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index 97bcf617ec8..5296a8e90e9 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -1750,7 +1750,6 @@ DASMOBJS += $(CPUOBJ)/sc61860/scdasm.o
endif
$(CPUOBJ)/sc61860/sc61860.o: $(CPUSRC)/sc61860/sc61860.h \
- $(CPUSRC)/sc61860/sc.h \
$(CPUSRC)/sc61860/scops.c \
$(CPUSRC)/sc61860/sctable.c
diff --git a/src/emu/cpu/sc61860/sc.h b/src/emu/cpu/sc61860/sc.h
deleted file mode 100644
index 526e78f1f29..00000000000
--- a/src/emu/cpu/sc61860/sc.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#define I 0
-#define J 1
-#define A 2
-#define B 3
-#define XL 4
-#define XH 5
-#define YL 6
-#define YH 7
-#define K 8
-#define L 9
-#define V 10 // some docus m
-#define W 11 // some docus n
-#define IA 92
-#define IB 93
-#define F0 94
-#define C 95
-
-enum
-{
- SC61860_PC=1, SC61860_DP,
- SC61860_P, SC61860_Q, SC61860_R,
- SC61860_CARRY,
- SC61860_ZERO,
- // the following are in the internal ram!
- SC61860_BA,
- SC61860_X, SC61860_Y,
- SC61860_I, SC61860_J, SC61860_K, SC61860_L, SC61860_V, SC61860_W,
- SC61860_H
-
-// SC61860_NMI_STATE,
-// SC61860_IRQ_STATE
-};
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c
index d1313bf648f..a06a21d6b52 100644
--- a/src/emu/cpu/sc61860/sc61860.c
+++ b/src/emu/cpu/sc61860/sc61860.c
@@ -31,7 +31,25 @@
#include "debugger.h"
#include "sc61860.h"
-#include "sc.h"
+
+
+#define I 0
+#define J 1
+#define A 2
+#define B 3
+#define XL 4
+#define XH 5
+#define YL 6
+#define YH 7
+#define K 8
+#define L 9
+#define V 10 // some docus m
+#define W 11 // some docus n
+#define IA 92
+#define IB 93
+#define F0 94
+#define C 95
+
#define VERBOSE 0
diff --git a/src/emu/cpu/sc61860/sc61860.h b/src/emu/cpu/sc61860/sc61860.h
index 079f9fd9153..8e546162050 100644
--- a/src/emu/cpu/sc61860/sc61860.h
+++ b/src/emu/cpu/sc61860/sc61860.h
@@ -37,6 +37,23 @@
64 kb external ram (first 8kbyte not seen for program execution?) */
+enum
+{
+ SC61860_PC=1, SC61860_DP,
+ SC61860_P, SC61860_Q, SC61860_R,
+ SC61860_CARRY,
+ SC61860_ZERO,
+ // the following are in the internal ram!
+ SC61860_BA,
+ SC61860_X, SC61860_Y,
+ SC61860_I, SC61860_J, SC61860_K, SC61860_L, SC61860_V, SC61860_W,
+ SC61860_H
+
+// SC61860_NMI_STATE,
+// SC61860_IRQ_STATE
+};
+
+
struct sc61860_cpu_core
{
devcb_read_line reset;
diff --git a/src/emu/cpu/sc61860/scdasm.c b/src/emu/cpu/sc61860/scdasm.c
index dc5d116edd8..4b113079967 100644
--- a/src/emu/cpu/sc61860/scdasm.c
+++ b/src/emu/cpu/sc61860/scdasm.c
@@ -24,7 +24,6 @@
#include "debugger.h"
#include "sc61860.h"
-#include "sc.h"
/*
new: