summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/candela.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/candela.cpp')
-rw-r--r--src/mame/drivers/candela.cpp45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp
index 09528cc6d03..d08f6cb02f5 100644
--- a/src/mame/drivers/candela.cpp
+++ b/src/mame/drivers/candela.cpp
@@ -305,19 +305,19 @@ READ8_MEMBER( can09t_state::read )
{
case X0XX: // ACIA
LOGPLA("-- ACIA\n");
- byte = m_acia->read(offset & 1);
+ byte = m_acia->read(space, offset & 1);
break;
case X1XX: // SYSPIA
LOGPLA("-- SYSPIA\n");
- byte = m_syspia->read_alt(offset & 3);
+ byte = m_syspia->read_alt(space, offset & 3);
break;
case X2XX: // USRPIA
LOGPLA("-- USRPIA\n");
- byte = m_usrpia->read_alt(offset & 3);
+ byte = m_usrpia->read_alt(space, offset & 3);
break;
case X3XX: // PTM
LOGPLA("-- PTM\n");
- byte = m_ptm->read(offset & 7);
+ byte = m_ptm->read(space, offset & 7);
break;
case X4XX: //
LOGPLA("-- XX4X\n");
@@ -387,19 +387,19 @@ WRITE8_MEMBER( can09t_state::write )
{
case X0XX: // ACIA
LOGPLA("-- ACIA\n");
- m_acia->write(offset & 1, data);
+ m_acia->write(space, offset & 1, data);
break;
case X1XX: // SYSPIA
LOGPLA("-- SYSPIA\n");
- m_syspia->write_alt(offset & 3, data);
+ m_syspia->write_alt(space, offset & 3, data);
break;
case X2XX: // USRPIA
LOGPLA("-- USRPIA\n");
- m_usrpia->write_alt(offset & 3, data);
+ m_usrpia->write_alt(space, offset & 3, data);
break;
case X3XX: // PTM
LOGPLA("-- PTM\n");
- m_ptm->write(offset & 7, data);
+ m_ptm->write(space, offset & 7, data);
break;
case X4XX: //
LOGPLA("-- XX4X\n");
@@ -714,10 +714,9 @@ void can09t_state::can09t(machine_config &config)
#define CAN09_X1_CLOCK 22.1184_MHz_XTAL /* UKI 22118.40 Khz */
#define CAN09_CPU_CLOCK (CAN09_X1_CLOCK / 16) /* ~1.38MHz Divider needs to be check but is the most likelly */
-void can09_state::can09(machine_config &config)
-{
- MC6809E(config, m_maincpu, CAN09_CPU_CLOCK); // MC68A09EP
- m_maincpu->set_addrmap(AS_PROGRAM, &can09_state::can09_map);
+MACHINE_CONFIG_START(can09_state::can09)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, CAN09_CPU_CLOCK) // MC68A09EP
+ MCFG_DEVICE_PROGRAM_MAP(can09_map)
/* RAM banks */
RAM(config, RAM_TAG).set_default_size("768K");
@@ -753,18 +752,18 @@ void can09_state::can09(machine_config &config)
/* screen - totally faked value for now */
- screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
- screen.set_refresh_hz(50);
- screen.set_raw(4_MHz_XTAL / 2, 512, 0, 512, 576, 0, 576);
- screen.set_screen_update(FUNC(can09_state::screen_update));
- screen.set_palette("palette");
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_RAW_PARAMS(4_MHz_XTAL / 2, 512, 0, 512, 576, 0, 576)
+ MCFG_SCREEN_UPDATE_DRIVER(can09_state, screen_update)
+ MCFG_SCREEN_PALETTE("palette")
PALETTE(config, "palette", palette_device::MONOCHROME);
/* Floppy */
WD1770(config, "wd1770", 8_MHz_XTAL); // TODO: Verify 8MHz UKI crystal assumed to be used
#if 0
- FLOPPY_CONNECTOR(config, "wd1770:0", candela_floppies, "3dd", floppy_image_device::default_floppy_formats);
- SOFTWARE_LIST(config, "flop3_list").set_original("candela");
+ MCFG_FLOPPY_DRIVE_ADD("wd1770:0", candela_floppies, "3dd", floppy_image_device::default_floppy_formats)
+ MCFG_SOFTWARE_LIST_ADD("flop3_list", "candela")
#endif
/* --PIA inits----------------------- */
@@ -783,11 +782,11 @@ void can09_state::can09(machine_config &config)
/* 0xFF93 0xE034 (PIA1 Port B) = 0x18 - Write Data on Port B */
#if 1
- PIA6821(config, PIA2_TAG, 0); // CPU board
- ACIA6850(config, "acia1", 0); // CPU board
- ACIA6850(config, "acia2", 0); // CPU board
+ MCFG_DEVICE_ADD(PIA2_TAG, PIA6821, 0) // CPU board
+ MCFG_DEVICE_ADD("acia1", ACIA6850, 0) // CPU board
+ MCFG_DEVICE_ADD("acia2", ACIA6850, 0) // CPU board
#endif
-}
+MACHINE_CONFIG_END
ROM_START( can09t ) /* The smaller grey computer */
ROM_REGION(0x10000, "roms", 0)