summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/src/cpu.lua6
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.h2
-rw-r--r--src/devices/bus/c64/fcc.h2
-rw-r--r--src/devices/bus/isa/finalchs.h2
-rw-r--r--src/devices/cpu/m6502/g65sc02.cpp (renamed from src/devices/cpu/m6502/m65sc02.cpp)4
-rw-r--r--src/devices/cpu/m6502/g65sc02.h (renamed from src/devices/cpu/m6502/m65sc02.h)8
-rw-r--r--src/devices/cpu/m6502/m6502.txt4
-rw-r--r--src/mame/acorn/bbc.h2
-rw-r--r--src/mame/atari/lynx.cpp2
-rw-r--r--src/mame/atari/lynx_m.cpp2
-rw-r--r--src/mame/commodore/clcd.cpp2
-rw-r--r--src/mame/fidelity/desdis.cpp2
-rw-r--r--src/mame/fidelity/excel.cpp2
-rw-r--r--src/mame/funworld/funworld.cpp2
-rw-r--r--src/mame/funworld/snookr10.cpp2
-rw-r--r--src/mame/hegenerglaser/mondial.cpp2
-rw-r--r--src/mame/hegenerglaser/mondial2.cpp2
-rw-r--r--src/mame/hegenerglaser/risc.cpp2
-rw-r--r--src/mame/hegenerglaser/smondial.cpp2
-rw-r--r--src/mame/novag/const.cpp2
-rw-r--r--src/mame/skeleton/textelcomp.cpp2
21 files changed, 28 insertions, 28 deletions
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index f94f56dc077..1f14e6e6bff 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1738,6 +1738,7 @@ end
--------------------------------------------------
-- MOS Technology 6502 and its many derivatives
--@src/devices/cpu/m6502/deco16.h,CPUS["M6502"] = true
+--@src/devices/cpu/m6502/g65sc02.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/gew7.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/gew12.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m3745x.h,CPUS["M6502"] = true
@@ -1755,7 +1756,6 @@ end
--@src/devices/cpu/m6502/m6510t.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m65ce02.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m65c02.h,CPUS["M6502"] = true
---@src/devices/cpu/m6502/m65sc02.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m740.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m7501.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m8502.h,CPUS["M6502"] = true
@@ -1775,6 +1775,8 @@ if CPUS["M6502"] then
files {
MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp",
MAME_DIR .. "src/devices/cpu/m6502/deco16.h",
+ MAME_DIR .. "src/devices/cpu/m6502/g65sc02.cpp",
+ MAME_DIR .. "src/devices/cpu/m6502/g65sc02.h",
MAME_DIR .. "src/devices/cpu/m6502/gew7.cpp",
MAME_DIR .. "src/devices/cpu/m6502/gew7.h",
MAME_DIR .. "src/devices/cpu/m6502/gew12.cpp",
@@ -1811,8 +1813,6 @@ if CPUS["M6502"] then
MAME_DIR .. "src/devices/cpu/m6502/m65c02.h",
MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m65ce02.h",
- MAME_DIR .. "src/devices/cpu/m6502/m65sc02.cpp",
- MAME_DIR .. "src/devices/cpu/m6502/m65sc02.h",
MAME_DIR .. "src/devices/cpu/m6502/m740.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m740.h",
MAME_DIR .. "src/devices/cpu/m6502/m7501.cpp",
diff --git a/src/devices/bus/bbc/tube/tube_6502.h b/src/devices/bus/bbc/tube/tube_6502.h
index ddfc337109f..0d3ded97a84 100644
--- a/src/devices/bus/bbc/tube/tube_6502.h
+++ b/src/devices/bus/bbc/tube/tube_6502.h
@@ -18,7 +18,7 @@
#pragma once
#include "tube.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/ram.h"
#include "machine/tube.h"
diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h
index 453603d96f2..7123336d64a 100644
--- a/src/devices/bus/c64/fcc.h
+++ b/src/devices/bus/c64/fcc.h
@@ -12,7 +12,7 @@
#pragma once
#include "exp.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/gen_latch.h"
diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h
index ba515d59b7d..9083f9529a3 100644
--- a/src/devices/bus/isa/finalchs.h
+++ b/src/devices/bus/isa/finalchs.h
@@ -12,7 +12,7 @@
#pragma once
#include "isa.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/gen_latch.h"
diff --git a/src/devices/cpu/m6502/m65sc02.cpp b/src/devices/cpu/m6502/g65sc02.cpp
index 4bea3ff8113..67b3e742363 100644
--- a/src/devices/cpu/m6502/m65sc02.cpp
+++ b/src/devices/cpu/m6502/g65sc02.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Olivier Galibert
/***************************************************************************
- m65sc02.cpp
+ g65sc02.cpp
Rockwell-class 65c02 with internal static registers, making clock stoppable?
@@ -13,7 +13,7 @@
***************************************************************************/
#include "emu.h"
-#include "m65sc02.h"
+#include "g65sc02.h"
DEFINE_DEVICE_TYPE(G65SC02, g65sc02_device, "g65sc02", "GTE G65SC02")
DEFINE_DEVICE_TYPE(G65SC12, g65sc12_device, "g65sc12", "GTE G65SC12")
diff --git a/src/devices/cpu/m6502/m65sc02.h b/src/devices/cpu/m6502/g65sc02.h
index 147709ea265..a0004dfefdb 100644
--- a/src/devices/cpu/m6502/m65sc02.h
+++ b/src/devices/cpu/m6502/g65sc02.h
@@ -2,14 +2,14 @@
// copyright-holders:Olivier Galibert
/***************************************************************************
- m65sc02.h
+ g65sc02.h
Rockwell-class 65c02 with internal static registers, making clock stoppable?
***************************************************************************/
-#ifndef MAME_CPU_M6502_M65SC02_H
-#define MAME_CPU_M6502_M65SC02_H
+#ifndef MAME_CPU_M6502_G65SC02_H
+#define MAME_CPU_M6502_G65SC02_H
#include "r65c02.h"
@@ -44,4 +44,4 @@ DECLARE_DEVICE_TYPE(G65SC12, g65sc12_device)
DECLARE_DEVICE_TYPE(G65SC102, g65sc102_device)
DECLARE_DEVICE_TYPE(G65SC112, g65sc112_device)
-#endif // MAME_CPU_M6502_M65SC02_H
+#endif // MAME_CPU_M6502_G65SC02_H
diff --git a/src/devices/cpu/m6502/m6502.txt b/src/devices/cpu/m6502/m6502.txt
index 788ab6fad3d..c774747a98a 100644
--- a/src/devices/cpu/m6502/m6502.txt
+++ b/src/devices/cpu/m6502/m6502.txt
@@ -86,11 +86,11 @@ several other CMOS variants
additional commands
atari lynx bastian schicks bll
-integrated m65sc02 cpu core
+integrated g65sc02 cpu core
no bbr bbs instructions, else m65c02 compatible
watara supervision
-integrated m65c02 cpu core (or m65sc02 or m65ce02?)
+integrated m65c02 cpu core (or g65sc02 or m65ce02?)
gte65816 (nintendo snes)
diff --git a/src/mame/acorn/bbc.h b/src/mame/acorn/bbc.h
index 23b57f386ed..95bf25373e4 100644
--- a/src/mame/acorn/bbc.h
+++ b/src/mame/acorn/bbc.h
@@ -12,8 +12,8 @@
#pragma once
+#include "cpu/m6502/g65sc02.h"
#include "cpu/m6502/m6502.h"
-#include "cpu/m6502/m65sc02.h"
#include "imagedev/floppy.h"
#include "machine/74259.h"
#include "machine/6522via.h"
diff --git a/src/mame/atari/lynx.cpp b/src/mame/atari/lynx.cpp
index a74149d90fe..7b8e730278a 100644
--- a/src/mame/atari/lynx.cpp
+++ b/src/mame/atari/lynx.cpp
@@ -19,7 +19,7 @@
#include "emu.h"
#include "lynx.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "softlist_dev.h"
#include "speaker.h"
diff --git a/src/mame/atari/lynx_m.cpp b/src/mame/atari/lynx_m.cpp
index c1ae51a6a81..15b1f26bb70 100644
--- a/src/mame/atari/lynx_m.cpp
+++ b/src/mame/atari/lynx_m.cpp
@@ -6,7 +6,7 @@
#include "emu.h"
#include "lynx.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "corestr.h"
#include "render.h"
diff --git a/src/mame/commodore/clcd.cpp b/src/mame/commodore/clcd.cpp
index b7b0396bd0b..553d43a742a 100644
--- a/src/mame/commodore/clcd.cpp
+++ b/src/mame/commodore/clcd.cpp
@@ -17,7 +17,7 @@
#include "bus/cbmiec/cbmiec.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/6522via.h"
#include "machine/bankdev.h"
#include "machine/input_merger.h"
diff --git a/src/mame/fidelity/desdis.cpp b/src/mame/fidelity/desdis.cpp
index 44a40c11b41..227e155db0d 100644
--- a/src/mame/fidelity/desdis.cpp
+++ b/src/mame/fidelity/desdis.cpp
@@ -37,8 +37,8 @@ Designer Mach IV Master 2325 (model 6129) overview:
#include "emu.h"
+#include "cpu/m6502/m65c02.h"
#include "cpu/m6502/r65c02.h"
-#include "cpu/m6502/m65sc02.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m68000/m68020.h"
#include "machine/clock.h"
diff --git a/src/mame/fidelity/excel.cpp b/src/mame/fidelity/excel.cpp
index c0e38ae96bb..01678da3fe4 100644
--- a/src/mame/fidelity/excel.cpp
+++ b/src/mame/fidelity/excel.cpp
@@ -177,8 +177,8 @@ CPU D6 to W: (model 6092, tied to VCC otherwise)
#include "emu.h"
+#include "cpu/m6502/g65sc02.h"
#include "cpu/m6502/r65c02.h"
-#include "cpu/m6502/m65sc02.h"
#include "machine/clock.h"
#include "machine/sensorboard.h"
#include "sound/dac.h"
diff --git a/src/mame/funworld/funworld.cpp b/src/mame/funworld/funworld.cpp
index 442381fa68b..6ad4b425322 100644
--- a/src/mame/funworld/funworld.cpp
+++ b/src/mame/funworld/funworld.cpp
@@ -755,7 +755,7 @@
#include "emu.h"
#include "funworld.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "cpu/m6502/r65c02.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
diff --git a/src/mame/funworld/snookr10.cpp b/src/mame/funworld/snookr10.cpp
index 6ade37a0fb5..83b28abddda 100644
--- a/src/mame/funworld/snookr10.cpp
+++ b/src/mame/funworld/snookr10.cpp
@@ -619,7 +619,7 @@
#include "emu.h"
#include "snookr10.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/nvram.h"
#include "sound/okim6295.h"
#include "screen.h"
diff --git a/src/mame/hegenerglaser/mondial.cpp b/src/mame/hegenerglaser/mondial.cpp
index a4c134f669b..291f1b0b8b3 100644
--- a/src/mame/hegenerglaser/mondial.cpp
+++ b/src/mame/hegenerglaser/mondial.cpp
@@ -23,7 +23,7 @@ TODO:
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/sensorboard.h"
#include "sound/beep.h"
#include "video/pwm.h"
diff --git a/src/mame/hegenerglaser/mondial2.cpp b/src/mame/hegenerglaser/mondial2.cpp
index b3c7bf81b42..5ea45de82dc 100644
--- a/src/mame/hegenerglaser/mondial2.cpp
+++ b/src/mame/hegenerglaser/mondial2.cpp
@@ -15,7 +15,7 @@ Hardware notes:
#include "emu.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/sensorboard.h"
#include "sound/dac.h"
#include "video/pwm.h"
diff --git a/src/mame/hegenerglaser/risc.cpp b/src/mame/hegenerglaser/risc.cpp
index 4a7618108c3..da1bc98c863 100644
--- a/src/mame/hegenerglaser/risc.cpp
+++ b/src/mame/hegenerglaser/risc.cpp
@@ -23,7 +23,7 @@ Hardware notes:
#include "mmboard.h"
#include "mmdisplay2.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/74259.h"
#include "machine/chessmachine.h"
#include "machine/nvram.h"
diff --git a/src/mame/hegenerglaser/smondial.cpp b/src/mame/hegenerglaser/smondial.cpp
index 21c65fe6695..e50e8b40ad3 100644
--- a/src/mame/hegenerglaser/smondial.cpp
+++ b/src/mame/hegenerglaser/smondial.cpp
@@ -23,7 +23,7 @@ Undocumented buttons:
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "cpu/m6502/r65c02.h"
#include "machine/74259.h"
#include "machine/nvram.h"
diff --git a/src/mame/novag/const.cpp b/src/mame/novag/const.cpp
index b6b6ee0c172..c9fb6ddc873 100644
--- a/src/mame/novag/const.cpp
+++ b/src/mame/novag/const.cpp
@@ -70,8 +70,8 @@ TODO:
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
+#include "cpu/m6502/g65sc02.h"
#include "cpu/m6502/m6502.h"
-#include "cpu/m6502/m65sc02.h"
#include "cpu/m6502/r65c02.h"
#include "machine/clock.h"
#include "machine/nvram.h"
diff --git a/src/mame/skeleton/textelcomp.cpp b/src/mame/skeleton/textelcomp.cpp
index 6055be8e45e..44e98f8a1d3 100644
--- a/src/mame/skeleton/textelcomp.cpp
+++ b/src/mame/skeleton/textelcomp.cpp
@@ -7,7 +7,7 @@
*******************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m65sc02.h"
+#include "cpu/m6502/g65sc02.h"
#include "machine/input_merger.h"
#include "machine/6522via.h"
#include "machine/mos6551.h"