summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/68307.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/68307.h')
-rw-r--r--src/devices/machine/68307.h131
1 files changed, 65 insertions, 66 deletions
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h
index c3ea6ea9286..e6ba1afcf44 100644
--- a/src/devices/machine/68307.h
+++ b/src/devices/machine/68307.h
@@ -1,61 +1,52 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
/* 68307 */
-
+#ifndef MAME_MACHINE_68307_H
+#define MAME_MACHINE_68307_H
#pragma once
-#ifndef __M68307_H__
-#define __M68307_H__
#include "cpu/m68000/m68000.h"
-
-#include "68307sim.h"
-#include "68307bus.h"
-#include "68307tmu.h"
#include "machine/mc68681.h"
-typedef device_delegate<uint8_t (address_space &space, bool dedicated, uint8_t line_mask)> m68307_porta_read_delegate;
-typedef device_delegate<void (address_space &space, bool dedicated, uint8_t data, uint8_t line_mask)> m68307_porta_write_delegate;
-typedef device_delegate<uint16_t (address_space &space, bool dedicated, uint16_t line_mask)> m68307_portb_read_delegate;
-typedef device_delegate<void (address_space &space, bool dedicated, uint16_t data, uint16_t line_mask)> m68307_portb_write_delegate;
-
-
/* trampolines so we can specify the 68681 serial configuration when adding the CPU */
#define MCFG_MC68307_SERIAL_A_TX_CALLBACK(_cb) \
- devcb = &m68307cpu_device::set_a_tx_cb(*device, DEVCB_##_cb);
+ devcb = &m68307_cpu_device::set_a_tx_cb(*device, DEVCB_##_cb);
#define MCFG_MC68307_SERIAL_B_TX_CALLBACK(_cb) \
- devcb = &m68307cpu_device::set_b_tx_cb(*device, DEVCB_##_cb);
+ devcb = &m68307_cpu_device::set_b_tx_cb(*device, DEVCB_##_cb);
// deprecated: use ipX_w() instead
#define MCFG_MC68307_SERIAL_INPORT_CALLBACK(_cb) \
- devcb = &m68307cpu_device::set_inport_cb(*device, DEVCB_##_cb);
+ devcb = &m68307_cpu_device::set_inport_cb(*device, DEVCB_##_cb);
#define MCFG_MC68307_SERIAL_OUTPORT_CALLBACK(_cb) \
- devcb = &m68307cpu_device::set_outport_cb(*device, DEVCB_##_cb);
+ devcb = &m68307_cpu_device::set_outport_cb(*device, DEVCB_##_cb);
-class m68307cpu_device : public m68000_device {
+class m68307_cpu_device : public m68000_device
+{
public:
- m68307cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ typedef device_delegate<uint8_t (address_space &space, bool dedicated, uint8_t line_mask)> porta_read_delegate;
+ typedef device_delegate<void (address_space &space, bool dedicated, uint8_t data, uint8_t line_mask)> porta_write_delegate;
+ typedef device_delegate<uint16_t (address_space &space, bool dedicated, uint16_t line_mask)> portb_read_delegate;
+ typedef device_delegate<void (address_space &space, bool dedicated, uint16_t data, uint16_t line_mask)> portb_write_delegate;
+
+ m68307_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
/* trampolines so we can specify the 68681 serial configuration when adding the CPU */
- template<class _Object> static devcb_base &set_irq_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_irq.set_callback(object); }
- template<class _Object> static devcb_base &set_a_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_a_tx.set_callback(object); }
- template<class _Object> static devcb_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_b_tx.set_callback(object); }
- template<class _Object> static devcb_base &set_inport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).read_inport.set_callback(object); }
- template<class _Object> static devcb_base &set_outport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_outport.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_cb(device_t &device, Object &&cb) { return downcast<m68307_cpu_device &>(device).write_irq.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_a_tx_cb(device_t &device, Object &&cb) { return downcast<m68307_cpu_device &>(device).write_a_tx.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_b_tx_cb(device_t &device, Object &&cb) { return downcast<m68307_cpu_device &>(device).write_b_tx.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_inport_cb(device_t &device, Object &&cb) { return downcast<m68307_cpu_device &>(device).read_inport.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_outport_cb(device_t &device, Object &&cb) { return downcast<m68307_cpu_device &>(device).write_outport.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE_LINE_MEMBER(m68307_duart_irq_handler);
- DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa){ write_a_tx(state); }
- DECLARE_WRITE_LINE_MEMBER(m68307_duart_txb){ write_b_tx(state); }
- DECLARE_READ8_MEMBER(m68307_duart_input_r){ return read_inport(); }
- DECLARE_WRITE8_MEMBER(m68307_duart_output_w){ write_outport(data); }
- devcb_write_line write_irq, write_a_tx, write_b_tx;
- devcb_read8 read_inport;
- devcb_write8 write_outport;
-
+ DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa) { write_a_tx(state); }
+ DECLARE_WRITE_LINE_MEMBER(m68307_duart_txb) { write_b_tx(state); }
+ DECLARE_READ8_MEMBER(m68307_duart_input_r) { return read_inport(); }
+ DECLARE_WRITE8_MEMBER(m68307_duart_output_w) { write_outport(data); }
uint16_t simple_read_immediate_16_m68307(offs_t address);
@@ -66,20 +57,6 @@ public:
void write_word_m68307(offs_t address, uint16_t data);
void write_dword_m68307(offs_t address, uint32_t data);
-
- /* 68307 peripheral modules */
- m68307_sim* m68307SIM;
- m68307_mbus* m68307MBUS;
-// m68307_serial* m68307SERIAL;
- m68307_timer* m68307TIMER;
-
- uint16_t m68307_base;
- uint16_t m68307_scrhigh;
- uint16_t m68307_scrlow;
-
- int m68307_currentcs;
-
-
DECLARE_READ16_MEMBER( m68307_internal_base_r );
DECLARE_WRITE16_MEMBER( m68307_internal_base_w );
DECLARE_READ16_MEMBER( m68307_internal_timer_r );
@@ -91,38 +68,60 @@ public:
DECLARE_READ8_MEMBER( m68307_internal_mbus_r );
DECLARE_WRITE8_MEMBER( m68307_internal_mbus_w );
-
/* callbacks for internal ports */
- void set_port_callbacks(m68307_porta_read_delegate porta_r, m68307_porta_write_delegate porta_w, m68307_portb_read_delegate portb_r, m68307_portb_write_delegate portb_w);
- void set_interrupt(int level, int vector);
+ void set_port_callbacks(porta_read_delegate &&porta_r, porta_write_delegate &&porta_w, portb_read_delegate &&portb_r, portb_write_delegate &&portb_w);
uint16_t get_cs(offs_t address);
+ void licr2_interrupt();
+
+protected:
+ class m68307_sim;
+ class m68307_mbus;
+ class m68307_timer;
+
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual machine_config_constructor device_mconfig_additions() const override;
+
+ virtual uint32_t disasm_min_opcode_bytes() const override { return 2; }
+ virtual uint32_t disasm_max_opcode_bytes() const override { return 10; }
+
+ virtual uint32_t execute_min_cycles() const override { return 4; }
+ virtual uint32_t execute_max_cycles() const override { return 158; }
+
+ void set_interrupt(int level, int vector);
void timer0_interrupt();
void timer1_interrupt();
void serial_interrupt(int vector);
void mbus_interrupt();
- void licr2_interrupt();
-
- m68307_porta_read_delegate m_m68307_porta_r;
- m68307_porta_write_delegate m_m68307_porta_w;
- m68307_portb_read_delegate m_m68307_portb_r;
- m68307_portb_write_delegate m_m68307_portb_w;
void init16_m68307(address_space &space);
- virtual uint32_t disasm_min_opcode_bytes() const override { return 2; };
- virtual uint32_t disasm_max_opcode_bytes() const override { return 10; };
+ int calc_cs(offs_t address) const;
- virtual uint32_t execute_min_cycles() const override { return 4; };
- virtual uint32_t execute_max_cycles() const override { return 158; };
+ devcb_write_line write_irq, write_a_tx, write_b_tx;
+ devcb_read8 read_inport;
+ devcb_write8 write_outport;
+
+ /* 68307 peripheral modules */
+ m68307_sim* m68307SIM;
+ m68307_mbus* m68307MBUS;
+// m68307_serial* m68307SERIAL;
+ m68307_timer* m68307TIMER;
+
+ uint16_t m68307_base;
+ uint16_t m68307_scrhigh;
+ uint16_t m68307_scrlow;
+
+ int m68307_currentcs;
+
+ porta_read_delegate m_porta_r;
+ porta_write_delegate m_porta_w;
+ portb_read_delegate m_portb_r;
+ portb_write_delegate m_portb_w;
required_device<mc68681_device> m_duart;
-protected:
- virtual machine_config_constructor device_mconfig_additions() const override;
- virtual void device_start() override;
- virtual void device_reset() override;
};
-extern const device_type M68307;
-
+DECLARE_DEVICE_TYPE(M68307, m68307_cpu_device)
-#endif
+#endif // MAME_MACHINE_68307_H