summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/vp415.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/vp415.cpp')
-rw-r--r--src/mame/drivers/vp415.cpp51
1 files changed, 21 insertions, 30 deletions
diff --git a/src/mame/drivers/vp415.cpp b/src/mame/drivers/vp415.cpp
index fa623b81ac8..d13d41c5153 100644
--- a/src/mame/drivers/vp415.cpp
+++ b/src/mame/drivers/vp415.cpp
@@ -41,25 +41,23 @@
#include "emu.h"
#include "includes/vp415.h"
-/*static*/ const char *const vp415_state::DATACPU_TAG = "datacpu";
-/*static*/ const char *const vp415_state::DATAMCU_TAG = "datamcu";
-/*static*/ const char *const vp415_state::DATARAM_TAG = "dataram";
-/*static*/ const char *const vp415_state::SCSI_TAG = "ncr5385";
-/*static*/ const char *const vp415_state::CTRLCPU_TAG = "ctrlcpu";
-/*static*/ const char *const vp415_state::CTRLMCU_TAG = "ctrlmcu";
-/*static*/ const char *const vp415_state::CTRLRAM_TAG = "ctrlram";
-/*static*/ const char *const vp415_state::DRIVECPU_TAG = "drivecpu";
-/*static*/ const char *const vp415_state::DESCRAMBLE_ROM_TAG = "descramblerom";
-/*static*/ const char *const vp415_state::SYNC_ROM_TAG = "syncrom";
-/*static*/ const char *const vp415_state::DRIVE_ROM_TAG = "driverom";
-/*static*/ const char *const vp415_state::CONTROL_ROM_TAG = "controlrom";
-/*static*/ const char *const vp415_state::SWITCHES_TAG = "SWITCHES";
-/*static*/ const char *const vp415_state::I8155_TAG = "i8155";
-/*static*/ const char *const vp415_state::I8255_TAG = "i8255";
-/*static*/ const char *const vp415_state::CHARGEN_TAG = "mb88303";
-/*static*/ const char *const vp415_state::SYNCGEN_TAG = "saa1043";
-
-/*static*/ const device_timer_id vp415_state::DRIVE_2PPR_ID = 0;
+const char *const vp415_state::DATACPU_TAG = "datacpu";
+const char *const vp415_state::DATAMCU_TAG = "datamcu";
+const char *const vp415_state::DATARAM_TAG = "dataram";
+const char *const vp415_state::SCSI_TAG = "ncr5385";
+const char *const vp415_state::CTRLCPU_TAG = "ctrlcpu";
+const char *const vp415_state::CTRLMCU_TAG = "ctrlmcu";
+const char *const vp415_state::CTRLRAM_TAG = "ctrlram";
+const char *const vp415_state::DRIVECPU_TAG = "drivecpu";
+const char *const vp415_state::DESCRAMBLE_ROM_TAG = "descramblerom";
+const char *const vp415_state::SYNC_ROM_TAG = "syncrom";
+const char *const vp415_state::DRIVE_ROM_TAG = "driverom";
+const char *const vp415_state::CONTROL_ROM_TAG = "controlrom";
+const char *const vp415_state::SWITCHES_TAG = "SWITCHES";
+const char *const vp415_state::I8155_TAG = "i8155";
+const char *const vp415_state::I8255_TAG = "i8255";
+const char *const vp415_state::CHARGEN_TAG = "mb88303";
+const char *const vp415_state::SYNCGEN_TAG = "saa1043";
vp415_state::vp415_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
@@ -102,20 +100,13 @@ void vp415_state::machine_reset()
void vp415_state::machine_start()
{
- m_drive_2ppr_timer = timer_alloc(DRIVE_2PPR_ID);
+ m_drive_2ppr_timer = timer_alloc(FUNC(vp415_state::drive_2ppr_tick), this);
}
-void vp415_state::device_timer(emu_timer &timer, device_timer_id id, int param)
+TIMER_CALLBACK_MEMBER(vp415_state::drive_2ppr_tick)
{
- switch (id)
- {
- case DRIVE_2PPR_ID:
- m_drive_2ppr ^= I8155PB_2PPR;
- m_drive_2ppr_timer->adjust(attotime::from_msec(10));
- break;
- default:
- break;
- }
+ m_drive_2ppr ^= I8155PB_2PPR;
+ m_drive_2ppr_timer->adjust(attotime::from_msec(10));
}
WRITE_LINE_MEMBER(vp415_state::refv_w)