summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Dirk Best <mail@dirk-best.de>2017-11-08 17:15:09 +0100
committer Dirk Best <mail@dirk-best.de>2017-11-08 17:15:20 +0100
commit67034f451303cf1e0f2bd64d28bb0d002484247b (patch)
tree7d45cf0ffe9e1820a31d3029eef122b5a77ff7ec
parentf3a161d3f40993d8df6eb21f48a00e870615797e (diff)
adc0844: Support ADC0848 variant, some adjustments to differential mode
-rw-r--r--src/devices/machine/adc0844.cpp141
-rw-r--r--src/devices/machine/adc0844.h68
2 files changed, 156 insertions, 53 deletions
diff --git a/src/devices/machine/adc0844.cpp b/src/devices/machine/adc0844.cpp
index 911a1604866..c4464bb3814 100644
--- a/src/devices/machine/adc0844.cpp
+++ b/src/devices/machine/adc0844.cpp
@@ -2,7 +2,7 @@
// copyright-holders: Dirk Best
/***************************************************************************
- ADC0844
+ ADC0844/ADC0848
A/D Converter With Multiplexer Options
@@ -17,6 +17,7 @@
//**************************************************************************
DEFINE_DEVICE_TYPE(ADC0844, adc0844_device, "adc0844", "ADC0844 A/D Converter")
+DEFINE_DEVICE_TYPE(ADC0848, adc0848_device, "adc0848", "ADC0848 A/D Converter")
//**************************************************************************
@@ -30,13 +31,28 @@ DEFINE_DEVICE_TYPE(ADC0844, adc0844_device, "adc0844", "ADC0844 A/D Converter")
adc0844_device::adc0844_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ADC0844, tag, owner, clock),
m_intr_cb(*this),
- m_channel_cb{ { *this }, { *this }, { *this }, { *this } },
+ m_ch1_cb(*this), m_ch2_cb(*this), m_ch3_cb(*this), m_ch4_cb(*this),
m_conversion_timer(nullptr),
m_channel(0x0f),
m_result(0xff)
{
}
+adc0844_device::adc0844_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ adc0844_device(mconfig, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+// adc0848_device - constructor
+//-------------------------------------------------
+
+adc0848_device::adc0848_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ adc0844_device(mconfig, ADC0848, tag, owner, clock),
+ m_ch5_cb(*this), m_ch6_cb(*this), m_ch7_cb(*this), m_ch8_cb(*this)
+{
+}
+
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
@@ -45,10 +61,10 @@ void adc0844_device::device_start()
{
// resolve callbacks
m_intr_cb.resolve_safe();
- m_channel_cb[0].resolve_safe(0xff);
- m_channel_cb[1].resolve_safe(0xff);
- m_channel_cb[2].resolve_safe(0xff);
- m_channel_cb[3].resolve_safe(0xff);
+ m_ch1_cb.resolve_safe(0xff);
+ m_ch2_cb.resolve_safe(0xff);
+ m_ch3_cb.resolve_safe(0xff);
+ m_ch4_cb.resolve_safe(0xff);
// allocate timers
m_conversion_timer = timer_alloc();
@@ -58,21 +74,22 @@ void adc0844_device::device_start()
save_item(NAME(m_result));
}
-//-------------------------------------------------
-// device_reset - device-specific reset
-//-------------------------------------------------
-
-void adc0844_device::device_reset()
+void adc0848_device::device_start()
{
+ // resolve callbacks
+ m_ch5_cb.resolve_safe(0xff);
+ m_ch6_cb.resolve_safe(0xff);
+ m_ch7_cb.resolve_safe(0xff);
+ m_ch8_cb.resolve_safe(0xff);
}
//-------------------------------------------------
-// device_timer - handler timer events
+// clamp - restrict value to 0..255
//-------------------------------------------------
uint8_t adc0844_device::clamp(int value)
{
- if (value > 0)
+ if (value > 0xff)
return 0xff;
else if (value < 0)
return 0x00;
@@ -80,54 +97,79 @@ uint8_t adc0844_device::clamp(int value)
return value;
}
+//-------------------------------------------------
+// device_timer - handler timer events
+//-------------------------------------------------
+
void adc0844_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
switch (m_channel)
{
// differential
case 0x00:
- case 0x08:
- m_result = clamp(m_channel_cb[0](0) + m_channel_cb[0](0));
- break;
+ case 0x08: m_result = clamp(0xff - (m_ch2_cb(0) - m_ch1_cb(0))); break;
case 0x01:
- case 0x09:
- m_result = clamp(m_channel_cb[1](0) + m_channel_cb[1](0));
- break;
+ case 0x09: m_result = clamp(0xff - (m_ch1_cb(0) - m_ch2_cb(0))); break;
case 0x02:
- case 0x0a:
- m_result = clamp(m_channel_cb[2](0) + m_channel_cb[3](0));
- break;
+ case 0x0a: m_result = clamp(0xff - (m_ch4_cb(0) - m_ch3_cb(0))); break;
case 0x03:
- case 0x0b:
- m_result = clamp(m_channel_cb[3](0) + m_channel_cb[2](0));
- break;
+ case 0x0b: m_result = clamp(0xff - (m_ch3_cb(0) - m_ch4_cb(0))); break;
// single-ended
+ case 0x04: m_result = m_ch1_cb(0); break;
+ case 0x05: m_result = m_ch2_cb(0); break;
+ case 0x06: m_result = m_ch3_cb(0); break;
+ case 0x07: m_result = m_ch4_cb(0); break;
+ // pseudo-differential
+ case 0x0c: m_result = clamp(0xff - (m_ch4_cb(0) - m_ch1_cb(0))); break;
+ case 0x0d: m_result = clamp(0xff - (m_ch4_cb(0) - m_ch2_cb(0))); break;
+ case 0x0e: m_result = clamp(0xff - (m_ch4_cb(0) - m_ch3_cb(0))); break;
+ // undefined
+ case 0x0f: m_result = 0x00; break;
+ }
+
+ m_intr_cb(ASSERT_LINE);
+}
+
+void adc0848_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+ switch (m_channel)
+ {
+ // differential
+ case 0x00:
+ case 0x10: m_result = clamp(0xff - (m_ch2_cb(0) - m_ch1_cb(0))); break;
+ case 0x01:
+ case 0x11: m_result = clamp(0xff - (m_ch1_cb(0) - m_ch2_cb(0))); break;
+ case 0x02:
+ case 0x12: m_result = clamp(0xff - (m_ch4_cb(0) - m_ch3_cb(0))); break;
+ case 0x03:
+ case 0x13: m_result = clamp(0xff - (m_ch3_cb(0) - m_ch4_cb(0))); break;
case 0x04:
- m_result = m_channel_cb[0](0);
- break;
+ case 0x14: m_result = clamp(0xff - (m_ch6_cb(0) - m_ch5_cb(0))); break;
case 0x05:
- m_result = m_channel_cb[1](0);
- break;
+ case 0x15: m_result = clamp(0xff - (m_ch5_cb(0) - m_ch6_cb(0))); break;
case 0x06:
- m_result = m_channel_cb[2](0);
- break;
+ case 0x16: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch7_cb(0))); break;
case 0x07:
- m_result = m_channel_cb[3](0);
- break;
+ case 0x17: m_result = clamp(0xff - (m_ch7_cb(0) - m_ch8_cb(0))); break;
+ // single-ended
+ case 0x08: m_result = m_ch1_cb(0); break;
+ case 0x09: m_result = m_ch2_cb(0); break;
+ case 0x0a: m_result = m_ch3_cb(0); break;
+ case 0x0b: m_result = m_ch4_cb(0); break;
+ case 0x0c: m_result = m_ch5_cb(0); break;
+ case 0x0d: m_result = m_ch6_cb(0); break;
+ case 0x0e: m_result = m_ch7_cb(0); break;
+ case 0x0f: m_result = m_ch8_cb(0); break;
// pseudo-differential
- case 0x0c:
- m_result = clamp(m_channel_cb[0](0) + m_channel_cb[3](0));
- break;
- case 0x0d:
- m_result = clamp(m_channel_cb[1](0) + m_channel_cb[3](0));
- break;
- case 0x0e:
- m_result = clamp(m_channel_cb[2](0) + m_channel_cb[3](0));
- break;
+ case 0x18: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch1_cb(0))); break;
+ case 0x19: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch2_cb(0))); break;
+ case 0x1a: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch3_cb(0))); break;
+ case 0x1b: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch4_cb(0))); break;
+ case 0x1c: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch5_cb(0))); break;
+ case 0x1d: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch6_cb(0))); break;
+ case 0x1e: m_result = clamp(0xff - (m_ch8_cb(0) - m_ch7_cb(0))); break;
// undefined
- case 0x0f:
- m_result = 0x00;
- break;
+ case 0x1f: m_result = 0x00; break;
}
m_intr_cb(ASSERT_LINE);
@@ -153,3 +195,12 @@ WRITE8_MEMBER( adc0844_device::write )
m_channel = data & 0x0f;
m_conversion_timer->adjust(attotime::from_usec(40));
}
+
+WRITE8_MEMBER( adc0848_device::write )
+{
+ m_intr_cb(CLEAR_LINE);
+
+ // set channel and start conversion
+ m_channel = data & 0x1f;
+ m_conversion_timer->adjust(attotime::from_usec(40));
+}
diff --git a/src/devices/machine/adc0844.h b/src/devices/machine/adc0844.h
index d18ba963172..404a4cfa7a4 100644
--- a/src/devices/machine/adc0844.h
+++ b/src/devices/machine/adc0844.h
@@ -48,6 +48,27 @@
#define MCFG_ADC0844_CH4_CB(_devcb) \
devcb = &adc0844_device::set_ch4_callback(*device, DEVCB_##_devcb);
+#define MCFG_ADC0848_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ADC0848, 0)
+
+#define MCFG_ADC0848_INTR_CB MCFG_ADC0844_INTR_CB
+#define MCFG_ADC0848_CH1_CB MCFG_ADC0844_CH1_CB
+#define MCFG_ADC0848_CH2_CB MCFG_ADC0844_CH2_CB
+#define MCFG_ADC0848_CH3_CB MCFG_ADC0844_CH3_CB
+#define MCFG_ADC0848_CH4_CB MCFG_ADC0844_CH4_CB
+
+#define MCFG_ADC0848_CH5_CB(_devcb) \
+ devcb = &adc0848_device::set_ch5_callback(*device, DEVCB_##_devcb);
+
+#define MCFG_ADC0848_CH6_CB(_devcb) \
+ devcb = &adc0848_device::set_ch6_callback(*device, DEVCB_##_devcb);
+
+#define MCFG_ADC0848_CH7_CB(_devcb) \
+ devcb = &adc0848_device::set_ch7_callback(*device, DEVCB_##_devcb);
+
+#define MCFG_ADC0848_CH8_CB(_devcb) \
+ devcb = &adc0848_device::set_ch8_callback(*device, DEVCB_##_devcb);
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -64,32 +85,32 @@ public:
{ return downcast<adc0844_device &>(device).m_intr_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_ch1_callback(device_t &device, Object &&cb)
- { return downcast<adc0844_device &>(device).m_channel_cb[0].set_callback(std::forward<Object>(cb)); }
+ { return downcast<adc0844_device &>(device).m_ch1_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_ch2_callback(device_t &device, Object &&cb)
- { return downcast<adc0844_device &>(device).m_channel_cb[1].set_callback(std::forward<Object>(cb)); }
+ { return downcast<adc0844_device &>(device).m_ch2_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_ch3_callback(device_t &device, Object &&cb)
- { return downcast<adc0844_device &>(device).m_channel_cb[2].set_callback(std::forward<Object>(cb)); }
+ { return downcast<adc0844_device &>(device).m_ch3_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_ch4_callback(device_t &device, Object &&cb)
- { return downcast<adc0844_device &>(device).m_channel_cb[3].set_callback(std::forward<Object>(cb)); }
+ { return downcast<adc0844_device &>(device).m_ch4_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ virtual DECLARE_WRITE8_MEMBER(write);
protected:
+ adc0844_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
- virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-private:
uint8_t clamp(int value);
// callbacks
devcb_write_line m_intr_cb;
- devcb_read8 m_channel_cb[4];
+ devcb_read8 m_ch1_cb, m_ch2_cb, m_ch3_cb, m_ch4_cb;
emu_timer *m_conversion_timer;
@@ -98,7 +119,38 @@ private:
uint8_t m_result;
};
+class adc0848_device : public adc0844_device
+{
+public:
+ // construction/destruction
+ adc0848_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ // configuration
+ template <class Object> static devcb_base &set_ch5_callback(device_t &device, Object &&cb)
+ { return downcast<adc0848_device &>(device).m_ch5_cb.set_callback(std::forward<Object>(cb)); }
+
+ template <class Object> static devcb_base &set_ch6_callback(device_t &device, Object &&cb)
+ { return downcast<adc0848_device &>(device).m_ch6_cb.set_callback(std::forward<Object>(cb)); }
+
+ template <class Object> static devcb_base &set_ch7_callback(device_t &device, Object &&cb)
+ { return downcast<adc0848_device &>(device).m_ch7_cb.set_callback(std::forward<Object>(cb)); }
+
+ template <class Object> static devcb_base &set_ch8_callback(device_t &device, Object &&cb)
+ { return downcast<adc0848_device &>(device).m_ch8_cb.set_callback(std::forward<Object>(cb)); }
+
+ virtual DECLARE_WRITE8_MEMBER(write) override;
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+private:
+ devcb_read8 m_ch5_cb, m_ch6_cb, m_ch7_cb, m_ch8_cb;
+};
+
// device type definition
DECLARE_DEVICE_TYPE(ADC0844, adc0844_device)
+DECLARE_DEVICE_TYPE(ADC0848, adc0848_device)
#endif // MAME_DEVICES_MACHINE_ADC0844_H