Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

name after oldest machine it appears in (nw)

Browse Source
This commit is contained in:
Vas Crabb 2018-08-27 00:17:00 +10:00
parent d629034f52
commit c643b6cc51
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mame/drivers/amiga.cpp
View File

@ -80,20 +80,20 @@ Amiga 2000, but uses 1kΩ resistors for timing. This gives delays of
*/ */
DECLARE_DEVICE_TYPE(A2000_KBRESET, a2000_kbreset_device) DECLARE_DEVICE_TYPE(A1000_KBRESET, a1000_kbreset_device)
class a2000_kbreset_device : public device_t class a1000_kbreset_device : public device_t
{ {
public: public:
a2000_kbreset_device(machine_config const &config, char const *tag, device_t *owner, u32 clock = 0U) : a1000_kbreset_device(machine_config const &config, char const *tag, device_t *owner, u32 clock = 0U) :
device_t(config, A2000_KBRESET, tag, owner, clock), device_t(config, A1000_KBRESET, tag, owner, clock),
m_kbrst_cb(*this) m_kbrst_cb(*this)
{ {
} }
auto kbrst_cb() { return m_kbrst_cb.bind(); } auto kbrst_cb() { return m_kbrst_cb.bind(); }
a2000_kbreset_device &set_delays(attotime detect, attotime stray, attotime output) a1000_kbreset_device &set_delays(attotime detect, attotime stray, attotime output)
{ {
m_detect_time = detect; m_detect_time = detect;
m_stray_time = stray; m_stray_time = stray;
@ -137,8 +137,8 @@ protected:
virtual void device_start() override virtual void device_start() override
{ {
// allocate resources // allocate resources
m_c813_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2000_kbreset_device::c813_charged), this)); m_c813_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a1000_kbreset_device::c813_charged), this));
m_c814_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2000_kbreset_device::c814_charged), this)); m_c814_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a1000_kbreset_device::c814_charged), this));
// start in idle state // start in idle state
m_kbclk = 1U; m_kbclk = 1U;
@ -210,7 +210,7 @@ private:
u8 m_c814_charging = 1U; // U805 pin 2 u8 m_c814_charging = 1U; // U805 pin 2
}; };
DEFINE_DEVICE_TYPE(A2000_KBRESET, a2000_kbreset_device, "a2000kbrst", "Amiga 1000/2000/CDTV keyboard reset circuit") DEFINE_DEVICE_TYPE(A1000_KBRESET, a1000_kbreset_device, "a1000kbrst", "Amiga 1000/2000/CDTV keyboard reset circuit")
//************************************************************************** //**************************************************************************
@ -1637,9 +1637,9 @@ MACHINE_CONFIG_START(a1000_state::a1000)
// keyboard // keyboard
auto &kbd(AMIGA_KEYBOARD_INTERFACE(config, "kbd", amiga_keyboard_devices, "a1000_us")); auto &kbd(AMIGA_KEYBOARD_INTERFACE(config, "kbd", amiga_keyboard_devices, "a1000_us"));
kbd.kclk_handler().set("cia_0", FUNC(mos8520_device::cnt_w)); kbd.kclk_handler().set("cia_0", FUNC(mos8520_device::cnt_w));
kbd.kclk_handler().append("kbrst", FUNC(a2000_kbreset_device::kbclk_w)); kbd.kclk_handler().append("kbrst", FUNC(a1000_kbreset_device::kbclk_w));
kbd.kdat_handler().set("cia_0", FUNC(mos8520_device::sp_w)); kbd.kdat_handler().set("cia_0", FUNC(mos8520_device::sp_w));
A2000_KBRESET(config, "kbrst") A1000_KBRESET(config, "kbrst")
.set_delays(attotime::from_msec(152), attotime::from_usec(176), attotime::from_msec(704)) .set_delays(attotime::from_msec(152), attotime::from_usec(176), attotime::from_msec(704))
.kbrst_cb().set(FUNC(a1000_state::kbreset_w)); .kbrst_cb().set(FUNC(a1000_state::kbreset_w));
@ -1676,9 +1676,9 @@ MACHINE_CONFIG_START(a2000_state::a2000)
// keyboard // keyboard
auto &kbd(AMIGA_KEYBOARD_INTERFACE(config, "kbd", amiga_keyboard_devices, "a2000_us")); auto &kbd(AMIGA_KEYBOARD_INTERFACE(config, "kbd", amiga_keyboard_devices, "a2000_us"));
kbd.kclk_handler().set("cia_0", FUNC(mos8520_device::cnt_w)); kbd.kclk_handler().set("cia_0", FUNC(mos8520_device::cnt_w));
kbd.kclk_handler().append("kbrst", FUNC(a2000_kbreset_device::kbclk_w)); kbd.kclk_handler().append("kbrst", FUNC(a1000_kbreset_device::kbclk_w));
kbd.kdat_handler().set("cia_0", FUNC(mos8520_device::sp_w)); kbd.kdat_handler().set("cia_0", FUNC(mos8520_device::sp_w));
A2000_KBRESET(config, "kbrst") A1000_KBRESET(config, "kbrst")
.set_delays(attotime::from_msec(112), attotime::from_msec(74), attotime::from_msec(1294)) .set_delays(attotime::from_msec(112), attotime::from_msec(74), attotime::from_msec(1294))
.kbrst_cb().set(FUNC(a2000_state::kbreset_w)); .kbrst_cb().set(FUNC(a2000_state::kbreset_w));
@ -1765,8 +1765,9 @@ MACHINE_CONFIG_START(cdtv_state::cdtv)
// keyboard // keyboard
auto &kbd(AMIGA_KEYBOARD_INTERFACE(config, "kbd", amiga_keyboard_devices, "a2000_us")); auto &kbd(AMIGA_KEYBOARD_INTERFACE(config, "kbd", amiga_keyboard_devices, "a2000_us"));
kbd.kclk_handler().set("cia_0", FUNC(mos8520_device::cnt_w)); kbd.kclk_handler().set("cia_0", FUNC(mos8520_device::cnt_w));
kbd.kclk_handler().append("kbrst", FUNC(a1000_kbreset_device::kbclk_w));
kbd.kdat_handler().set("cia_0", FUNC(mos8520_device::sp_w)); kbd.kdat_handler().set("cia_0", FUNC(mos8520_device::sp_w));
A2000_KBRESET(config, "kbrst") A1000_KBRESET(config, "kbrst")
.set_delays(attotime::from_usec(11238), attotime::from_usec(7432), attotime::from_usec(27539)) .set_delays(attotime::from_usec(11238), attotime::from_usec(7432), attotime::from_usec(27539))
.kbrst_cb().set(FUNC(a1000_state::kbreset_w)); .kbrst_cb().set(FUNC(a1000_state::kbreset_w));