diff options
| author | 2025-09-23 16:55:22 +0200 | |
|---|---|---|
| committer | 2025-09-23 16:55:34 +0200 | |
| commit | 521ee3cf0b490cec5df606a647368779610b5911 (patch) | |
| tree | 92f87386ced862bc8ce3cb08f540a7b851627cf4 | |
| parent | d23b651fe2f4dd882e9f498f65d098994cba016f (diff) | |
pluto6: move those pl6_ devices to local folder
| -rw-r--r-- | scripts/src/machine.lua | 16 | ||||
| -rw-r--r-- | src/mame/jpm/jpmimpct.h | 5 | ||||
| -rw-r--r-- | src/mame/jpm/pl6_exp.cpp (renamed from src/devices/machine/pl6_exp.cpp) | 0 | ||||
| -rw-r--r-- | src/mame/jpm/pl6_exp.h (renamed from src/devices/machine/pl6_exp.h) | 28 | ||||
| -rw-r--r-- | src/mame/jpm/pl6_fpga.cpp (renamed from src/devices/machine/pl6_fpga.cpp) | 0 | ||||
| -rw-r--r-- | src/mame/jpm/pl6_fpga.h (renamed from src/devices/machine/pl6_fpga.h) | 6 | ||||
| -rw-r--r-- | src/mame/jpm/pl6_pic.cpp (renamed from src/devices/machine/pl6_pic.cpp) | 4 | ||||
| -rw-r--r-- | src/mame/jpm/pl6_pic.h (renamed from src/devices/machine/pl6_pic.h) | 8 | ||||
| -rw-r--r-- | src/mame/jpm/pluto5.cpp | 16 | ||||
| -rw-r--r-- | src/mame/jpm/pluto6.cpp | 10 |
10 files changed, 36 insertions, 57 deletions
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 19a480061cd..aeea0943ff1 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -5405,19 +5405,3 @@ if (MACHINES["SCI4"]~=null) then MAME_DIR .. "src/devices/machine/sci4.h", } end - ---------------------------------------------------- --- ---@src/devices/machine/pl6_fpga.h,MACHINES["HEBER_PLUTO"] = true ---@src/devices/machine/pl6_pic.h,MACHINES["HEBER_PLUTO"] = true ---------------------------------------------------- -if (MACHINES["HEBER_PLUTO"]~=null) then - files { - MAME_DIR .. "src/devices/machine/pl6_fpga.cpp", - MAME_DIR .. "src/devices/machine/pl6_fpga.h", - MAME_DIR .. "src/devices/machine/pl6_pic.cpp", - MAME_DIR .. "src/devices/machine/pl6_pic.h", - MAME_DIR .. "src/devices/machine/pl6_exp.cpp", - MAME_DIR .. "src/devices/machine/pl6_exp.h", - } -end diff --git a/src/mame/jpm/jpmimpct.h b/src/mame/jpm/jpmimpct.h index fc69131d9bc..0c63d05d90e 100644 --- a/src/mame/jpm/jpmimpct.h +++ b/src/mame/jpm/jpmimpct.h @@ -25,8 +25,6 @@ #include "emupal.h" - - class jpmtouch_device : public device_t, public device_serial_interface { @@ -121,6 +119,7 @@ protected: TIMER_DEVICE_CALLBACK_MEMBER(duart_set_ip5); virtual void update_irqs(); + protected: virtual void machine_start() override ATTR_COLD; virtual void machine_reset() override ATTR_COLD; @@ -150,8 +149,6 @@ private: void digits_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void lampstrobe_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - - void duart_irq_handler(int state); void impact_non_video_map(address_map &map) ATTR_COLD; diff --git a/src/devices/machine/pl6_exp.cpp b/src/mame/jpm/pl6_exp.cpp index 4995e9f4ba3..4995e9f4ba3 100644 --- a/src/devices/machine/pl6_exp.cpp +++ b/src/mame/jpm/pl6_exp.cpp diff --git a/src/devices/machine/pl6_exp.h b/src/mame/jpm/pl6_exp.h index 6cf1aba25ca..9592b2b0fe1 100644 --- a/src/devices/machine/pl6_exp.h +++ b/src/mame/jpm/pl6_exp.h @@ -1,5 +1,7 @@ -#ifndef MAME_MACHINE_PL6_EXP_H -#define MAME_MACHINE_PL6_EXP_H +// license:BSD-3-Clause +// copyright-holders:NaokiS +#ifndef MAME_JPM_PL6_EXP_H +#define MAME_JPM_PL6_EXP_H #pragma once @@ -24,7 +26,6 @@ public: protected: virtual void device_start() override ATTR_COLD; - private: pluto6_expansion_card_interface *m_dev; }; @@ -33,6 +34,7 @@ private: class pluto6_expansion_card_interface : public device_interface { friend class pluto6_expansion_slot_device; + public: virtual ~pluto6_expansion_card_interface(){} @@ -47,19 +49,19 @@ DECLARE_DEVICE_TYPE(HEBER_CALYPSO_GPU, pluto6_calypso32_device) class pluto6_calypso32_device : public device_t, public pluto6_expansion_card_interface { - public: - pluto6_calypso32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +public: + pluto6_calypso32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - protected: - pluto6_calypso32_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); +protected: + pluto6_calypso32_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - virtual void device_start() override ATTR_COLD {}; - virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; + virtual void device_start() override ATTR_COLD {}; + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; - private: - required_device<mb86292_device> m_gpu; - required_device<ram_device> m_vram; +private: + required_device<mb86292_device> m_gpu; + required_device<ram_device> m_vram; }; -#endif // MAME_MACHINE_PL6_EXP_H +#endif // MAME_JPM_PL6_EXP_H diff --git a/src/devices/machine/pl6_fpga.cpp b/src/mame/jpm/pl6_fpga.cpp index dcc2781e2a2..dcc2781e2a2 100644 --- a/src/devices/machine/pl6_fpga.cpp +++ b/src/mame/jpm/pl6_fpga.cpp diff --git a/src/devices/machine/pl6_fpga.h b/src/mame/jpm/pl6_fpga.h index 40345bef1c6..61ae2e36802 100644 --- a/src/devices/machine/pl6_fpga.h +++ b/src/mame/jpm/pl6_fpga.h @@ -52,8 +52,8 @@ share a common register and thus function. */ -#ifndef MAME_MACHINE_PL6_FPGA_H -#define MAME_MACHINE_PL6_FPGA_H +#ifndef MAME_JPM_PL6_FPGA_H +#define MAME_JPM_PL6_FPGA_H #pragma once @@ -250,4 +250,4 @@ private: DECLARE_DEVICE_TYPE(HEBER_PLUTO6_FPGA, pl6fpga_device) -#endif // MAME_MACHINE_PL6_FPGA_H +#endif // MAME_JPM_PL6_FPGA_H diff --git a/src/devices/machine/pl6_pic.cpp b/src/mame/jpm/pl6_pic.cpp index 61367a5f8d0..48453c2e71f 100644 --- a/src/devices/machine/pl6_pic.cpp +++ b/src/mame/jpm/pl6_pic.cpp @@ -12,8 +12,8 @@ #define LOGPIC(...) LOGMASKED(LOG_PIC, __VA_ARGS__) -pl6pic_device::pl6pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, HEBER_PLUTO6_PIC, tag, owner, clock), +pl6pic_device::pl6pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + device_t(mconfig, HEBER_PLUTO6_PIC, tag, owner, clock), i2c_hle_interface(mconfig, *this, 0xc0), device_rtc_interface(mconfig, *this), m_timer(nullptr), diff --git a/src/devices/machine/pl6_pic.h b/src/mame/jpm/pl6_pic.h index d25ae8188f9..c4ab807f718 100644 --- a/src/devices/machine/pl6_pic.h +++ b/src/mame/jpm/pl6_pic.h @@ -27,8 +27,8 @@ When the Pluto 6 is powered up, it does the following: * Hold CPU in reset? */ -#ifndef MAME_MACHINE_PL6_PIC_H -#define MAME_MACHINE_PL6_PIC_H +#ifndef MAME_JPM_PL6_PIC_H +#define MAME_JPM_PL6_PIC_H #pragma once @@ -77,10 +77,8 @@ private: required_ioport m_stake; required_ioport m_perc; required_ioport m_secsw; - - }; DECLARE_DEVICE_TYPE(HEBER_PLUTO6_PIC, pl6pic_device) -#endif // MAME_MACHINE_PL6_PIC_H +#endif // MAME_JPM_PL6_PIC_H diff --git a/src/mame/jpm/pluto5.cpp b/src/mame/jpm/pluto5.cpp index 169e041c050..efc8f4c01c8 100644 --- a/src/mame/jpm/pluto5.cpp +++ b/src/mame/jpm/pluto5.cpp @@ -194,17 +194,20 @@ namespace { class pluto5_state : public driver_device { public: - pluto5_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + pluto5_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } void pluto5(machine_config &config); void init_hb(); +protected: + virtual void machine_start() override ATTR_COLD; + private: - uint16_t* m_cpuregion = 0; + uint16_t* m_cpuregion = nullptr; std::unique_ptr<uint16_t[]> m_mainram; uint16_t pluto5_mem_r(offs_t offset, uint16_t mem_mask = ~0); @@ -214,8 +217,6 @@ private: // devices required_device<m68340_cpu_device> m_maincpu; - - virtual void machine_start() override ATTR_COLD; }; uint16_t pluto5_state::pluto5_mem_r(offs_t offset, uint16_t mem_mask) @@ -245,9 +246,7 @@ void pluto5_state::pluto5_mem_w(offs_t offset, uint16_t data, uint16_t mem_mask) { default: logerror("%08x maincpu write access offset %08x data %08x mem_mask %08x cs %d\n", pc, offset*4, data, mem_mask, cs); - } - } @@ -271,7 +270,6 @@ void pluto5_state::pluto5(machine_config &config) M68340(config, m_maincpu, 16000000); m_maincpu->set_addrmap(AS_PROGRAM, &pluto5_state::pluto5_map); - SPEAKER(config, "speaker", 2).front(); // unknown sound } diff --git a/src/mame/jpm/pluto6.cpp b/src/mame/jpm/pluto6.cpp index 8e2ed2386f0..15f486ec07a 100644 --- a/src/mame/jpm/pluto6.cpp +++ b/src/mame/jpm/pluto6.cpp @@ -153,6 +153,10 @@ EINT3: DUART INT? #include "emu.h" +#include "pl6_exp.h" +#include "pl6_fpga.h" +#include "pl6_pic.h" + #include "cpu/m68000/mcf5206e.h" #include "bus/ata/ataintf.h" #include "bus/ata/hdd.h" @@ -160,9 +164,6 @@ EINT3: DUART INT? #include "machine/mc68681.h" #include "machine/i2cmem.h" #include "machine/nvram.h" -#include "machine/pl6_exp.h" -#include "machine/pl6_fpga.h" -#include "machine/pl6_pic.h" #include "video/roc10937.h" #include "speaker.h" @@ -386,7 +387,6 @@ static INPUT_PORTS_START( pluto6 ) PORT_START("DEBUG") PORT_BIT( 0xffffffff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - INPUT_PORTS_END @@ -520,7 +520,7 @@ void pluto6_state::pluto6(machine_config &config){ m_fpga->cfuart_rx_a_callback().set(FUNC(pluto6_state::cfuart_rx_a_w)); m_fpga->cfuart_rx_b_callback().set(FUNC(pluto6_state::cfuart_rx_b_w)); - HEBER_PLUTO6_PIC(config, m_pic, XTAL(500'000)); + HEBER_PLUTO6_PIC(config, m_pic, XTAL(5'000'000)); m_pic->sda_rx_cb().set(FUNC(pluto6_state::pluto_sda)); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); |
