summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/upd71071.h
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-05-07 23:18:47 +1000
committer Vas Crabb <vas@vastheman.com>2017-05-14 21:44:11 +1000
commit0f0d39ef81562c75e79176dd3bebb1e491ca39d5 (patch)
tree201cee7fdf55ee800f83859a92efd2cfe66cf2b3 /src/devices/machine/upd71071.h
parente6c4be2b4d71c7a6c95be0bae111eb416ff0f9e7 (diff)
Move static data out of devices into the device types. This is a significant change, so please pay attention.
The core changes are: * Short name, full name and source file are no longer members of device_t, they are part of the device type * MACHINE_COFIG_START no longer needs a driver class * MACHINE_CONFIG_DERIVED_CLASS is no longer necessary * Specify the state class you want in the GAME/COMP/CONS line * The compiler will work out the base class where the driver init member is declared * There is one static device type object per driver rather than one per machine configuration Use DECLARE_DEVICE_TYPE or DECLARE_DEVICE_TYPE_NS to declare device type. * DECLARE_DEVICE_TYPE forward-declares teh device type and class, and declares extern object finders. * DECLARE_DEVICE_TYPE_NS is for devices classes in namespaces - it doesn't forward-declare the device type. Use DEFINE_DEVICE_TYPE or DEFINE_DEVICE_TYPE_NS to define device types. * These macros declare storage for the static data, and instantiate the device type and device finder templates. The rest of the changes are mostly just moving stuff out of headers that shouldn't be there, renaming stuff for consistency, and scoping stuff down where appropriate. Things I've actually messed with substantially: * More descriptive names for a lot of devices * Untangled the fantasy sound from the driver state, which necessitates breaking up sound/flip writes * Changed DECO BSMT2000 ready callback into a device delegate * Untangled Microprose 3D noise from driver state * Used object finders for CoCo multipak, KC85 D002, and Irem sound subdevices * Started to get TI-99 stuff out of the TI-990 directory and arrange bus devices properly * Started to break out common parts of Samsung ARM SoC devices * Turned some of FM, SID, SCSP DSP, EPIC12 and Voodoo cores into something resmbling C++ * Tried to make Z180 table allocation/setup a bit safer * Converted generic keyboard/terminal to not use WRITE8 - space/offset aren't relevant * Dynamically allocate generic terminal buffer so derived devices (e.g. teleprinter) can specify size * Imporved encapsulation of Z80DART channels * Refactored the SPC7110 bit table generator loop to make it more readable * Added wrappers for SNES PPU operations so members can be made protected * Factored out some boilerplate for YM chips with PSG * toaplan2 gfx * stic/intv resolution * Video System video * Out Run/Y-board sprite alignment * GIC video hookup * Amstrad CPC ROM box members * IQ151 ROM cart region * MSX cart IRQ callback resolution time * SMS passthrough control devices starting subslots I've smoke-tested several drivers, but I've probably missed something. Things I've missed will likely blow up spectacularly with failure to bind errors and the like. Let me know if there's more subtle breakage (could have happened in FM or Voodoo). And can everyone please, please try to keep stuff clean. In particular, please stop polluting the global namespace. Keep things out of headers that don't need to be there, and use things that can be scoped down rather than macros. It feels like an uphill battle trying to get this stuff under control while more of it's added.
Diffstat (limited to 'src/devices/machine/upd71071.h')
-rw-r--r--src/devices/machine/upd71071.h147
1 files changed, 64 insertions, 83 deletions
diff --git a/src/devices/machine/upd71071.h b/src/devices/machine/upd71071.h
index 4a4b6d1c330..21720d295d6 100644
--- a/src/devices/machine/upd71071.h
+++ b/src/devices/machine/upd71071.h
@@ -1,52 +1,25 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
-#ifndef __UPD71071_H__
-#define __UPD71071_H__
+#ifndef MAME_MACHINE_UPD71071_H
+#define MAME_MACHINE_UPD71071_H
+#pragma once
-struct upd71071_reg
-{
- uint8_t initialise;
- uint8_t channel;
- uint16_t count_current[4];
- uint16_t count_base[4];
- uint32_t address_current[4];
- uint32_t address_base[4];
- uint16_t device_control;
- uint8_t mode_control[4];
- uint8_t status;
- uint8_t temp_l;
- uint8_t temp_h;
- uint8_t request;
- uint8_t mask;
-};
-
class upd71071_device : public device_t
{
public:
upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~upd71071_device() {}
static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); }
static void set_clock(device_t &device, int clock) { downcast<upd71071_device &>(device).m_upd_clock = clock; }
- template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_eop_cb.set_callback(object); }
-
- template<class _Object> static devcb_base &set_dma_read_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_dma_read_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_dma_read_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_dma_read_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_read_3_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_dma_write_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_dma_write_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_dma_write_3_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_out_hreq_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_eop_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_out_eop_cb.set_callback(std::forward<Object>(cb)); }
- template<class _Object> static devcb_base &set_out_dack_0_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_dack_3_cb.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_dma_read_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_dma_read_cb[N].set_callback(std::forward<Object>(cb)); }
+ template <unsigned N, class Object> static devcb_base &set_dma_write_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_dma_write_cb[N].set_callback(std::forward<Object>(cb)); }
+ template <unsigned N, class Object> static devcb_base &set_out_dack_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_out_dack_cb[N].set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
@@ -60,11 +33,28 @@ protected:
virtual void device_start() override;
private:
- // internal state
+ struct upd71071_reg
+ {
+ uint8_t initialise;
+ uint8_t channel;
+ uint16_t count_current[4];
+ uint16_t count_base[4];
+ uint32_t address_current[4];
+ uint32_t address_base[4];
+ uint16_t device_control;
+ uint8_t mode_control[4];
+ uint8_t status;
+ uint8_t temp_l;
+ uint8_t temp_h;
+ uint8_t request;
+ uint8_t mask;
+ };
+
void soft_reset();
TIMER_CALLBACK_MEMBER(dma_transfer_timer);
- struct upd71071_reg m_reg;
+ // internal state
+ upd71071_reg m_reg;
int m_selected_channel;
int m_buswidth;
int m_dmarq[4];
@@ -75,71 +65,62 @@ private:
int m_upd_clock;
devcb_write_line m_out_hreq_cb;
devcb_write_line m_out_eop_cb;
- devcb_read16 m_dma_read_0_cb;
- devcb_read16 m_dma_read_1_cb;
- devcb_read16 m_dma_read_2_cb;
- devcb_read16 m_dma_read_3_cb;
- devcb_write16 m_dma_write_0_cb;
- devcb_write16 m_dma_write_1_cb;
- devcb_write16 m_dma_write_2_cb;
- devcb_write16 m_dma_write_3_cb;
- devcb_write_line m_out_dack_0_cb;
- devcb_write_line m_out_dack_1_cb;
- devcb_write_line m_out_dack_2_cb;
- devcb_write_line m_out_dack_3_cb;
+ devcb_read16 m_dma_read_cb[4];
+ devcb_write16 m_dma_write_cb[4];
+ devcb_write_line m_out_dack_cb[4];
int m_hreq;
int m_eop;
optional_device<cpu_device> m_cpu;
};
-extern const device_type UPD71071;
+DECLARE_DEVICE_TYPE(UPD71071, upd71071_device)
-#define MCFG_UPD71071_CPU(_tag) \
- upd71071_device::static_set_cpu_tag(*device, "^" _tag);
+#define MCFG_UPD71071_CPU(tag) \
+ upd71071_device::static_set_cpu_tag(*device, ("^" tag));
-#define MCFG_UPD71071_CLOCK(_clk) \
- upd71071_device::set_clock(*device, _clk);
+#define MCFG_UPD71071_CLOCK(clk) \
+ upd71071_device::set_clock(*device, (clk));
-#define MCFG_UPD71071_OUT_HREQ_CB(_devcb) \
- devcb = &upd71071_device::set_out_hreq_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_OUT_HREQ_CB(cb) \
+ devcb = &upd71071_device::set_out_hreq_callback(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_OUT_EOP_CB(_devcb) \
- devcb = &upd71071_device::set_out_eop_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_OUT_EOP_CB(cb) \
+ devcb = &upd71071_device::set_out_eop_callback(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_READ_0_CB(_devcb) \
- devcb = &upd71071_device::set_dma_read_0_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_READ_0_CB(cb) \
+ devcb = &upd71071_device::set_dma_read_callback<0>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_READ_1_CB(_devcb) \
- devcb = &upd71071_device::set_dma_read_1_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_READ_1_CB(cb) \
+ devcb = &upd71071_device::set_dma_read_callback<1>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_READ_2_CB(_devcb) \
- devcb = &upd71071_device::set_dma_read_2_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_READ_2_CB(cb) \
+ devcb = &upd71071_device::set_dma_read_callback<2>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_READ_3_CB(_devcb) \
- devcb = &upd71071_device::set_dma_read_3_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_READ_3_CB(cb) \
+ devcb = &upd71071_device::set_dma_read_callback<3>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_WRITE_0_CB(_devcb) \
- devcb = &upd71071_device::set_dma_write_0_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_WRITE_0_CB(cb) \
+ devcb = &upd71071_device::set_dma_write_callback<0>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_WRITE_1_CB(_devcb) \
- devcb = &upd71071_device::set_dma_write_1_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_WRITE_1_CB(cb) \
+ devcb = &upd71071_device::set_dma_write_callback<1>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_WRITE_2_CB(_devcb) \
- devcb = &upd71071_device::set_dma_write_2_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_WRITE_2_CB(cb) \
+ devcb = &upd71071_device::set_dma_write_callback<2>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_DMA_WRITE_3_CB(_devcb) \
- devcb = &upd71071_device::set_dma_write_3_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_DMA_WRITE_3_CB(cb) \
+ devcb = &upd71071_device::set_dma_write_callback<3>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_OUT_DACK_0_CB(_devcb) \
- devcb = &upd71071_device::set_out_dack_0_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_OUT_DACK_0_CB(cb) \
+ devcb = &upd71071_device::set_out_dack_callback<0>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_OUT_DACK_1_CB(_devcb) \
- devcb = &upd71071_device::set_out_dack_1_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_OUT_DACK_1_CB(cb) \
+ devcb = &upd71071_device::set_out_dack_callback<1>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_OUT_DACK_2_CB(_devcb) \
- devcb = &upd71071_device::set_out_dack_2_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_OUT_DACK_2_CB(cb) \
+ devcb = &upd71071_device::set_out_dack_callback<2>(*device, (DEVCB_##cb));
-#define MCFG_UPD71071_OUT_DACK_3_CB(_devcb) \
- devcb = &upd71071_device::set_out_dack_3_callback(*device, DEVCB_##_devcb);
+#define MCFG_UPD71071_OUT_DACK_3_CB(cb) \
+ devcb = &upd71071_device::set_out_dack_callback<3>(*device, (DEVCB_##cb));
-#endif /*UPD71071_H_*/
+#endif // MAME_MACHINE_UPD71071_H