From ad02a5db2942c080777ee22b7da712e38acc935b Mon Sep 17 00:00:00 2001 From: smf- Date: Thu, 30 Aug 2012 10:20:20 +0000 Subject: [PATCH] (MESS) a little reorganisation while investigating the S1410 SASI to ST506 adapter (nw) --- src/mess/drivers/abc1600.c | 1 - src/mess/drivers/tdv2324.c | 3 +-- src/mess/drivers/v1050.c | 1 + src/mess/machine/lux4105.c | 1 + src/mess/machine/rmnimbus.c | 2 +- src/mess/machine/s1410.h | 12 ++---------- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index 1e10dc992b0..32d2436ea2a 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -1933,7 +1933,6 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state ) MCFG_FD1797_ADD(SAB1797_02P_TAG, fdc_intf) MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, abc1600_floppy_interface) MCFG_ABC99_ADD(abc99_intf) - MCFG_S1410_ADD() MCFG_ABC1600BUS_SLOT_ADD("bus0i", bus0i_intf, abc1600bus_cards, NULL, NULL) MCFG_ABC1600BUS_SLOT_ADD("bus0x", bus0x_intf, abc1600bus_cards, NULL, NULL) diff --git a/src/mess/drivers/tdv2324.c b/src/mess/drivers/tdv2324.c index 2328510ddcc..16773592eab 100644 --- a/src/mess/drivers/tdv2324.c +++ b/src/mess/drivers/tdv2324.c @@ -434,8 +434,7 @@ static MACHINE_CONFIG_START( tdv2324, tdv2324_state ) MCFG_Z80SIO2_ADD(MK3887N4_TAG, 8000000/2, sio_intf) MCFG_FD1797_ADD(FD1797PL02_TAG, fdc_intf) MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, tdv2324_floppy_interface) - MCFG_HARDDISK_ADD("harddisk0") - MCFG_S1410_ADD() // 104521-F ROM + MCFG_S1410_ADD("s1410") // 104521-F ROM // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index a1f0ae9ae6e..2d29f0f7f46 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -1113,6 +1113,7 @@ static MACHINE_CONFIG_START( v1050, v1050_state ) // SASI bus MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf) MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0) + MCFG_S1410_ADD("s1410") MCFG_TIMER_ADD(TIMER_ACK_TAG, sasi_ack_tick) MCFG_TIMER_ADD(TIMER_RST_TAG, sasi_rst_tick) diff --git a/src/mess/machine/lux4105.c b/src/mess/machine/lux4105.c index 2a73142c818..8a5727af876 100644 --- a/src/mess/machine/lux4105.c +++ b/src/mess/machine/lux4105.c @@ -81,6 +81,7 @@ static const SCSIBus_interface sasi_intf = static MACHINE_CONFIG_FRAGMENT( luxor_4105 ) MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf) MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0) + MCFG_S1410_ADD("s1410") MACHINE_CONFIG_END diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index 557a04a8202..bd4fa563e86 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -25,7 +25,7 @@ CP3020 20MB 623 2 33 41118 ST225NP 20MB 615 4 17 41720 CP3040 40MB 1026 2 40 82080 -Via Xibec S1410 SASI to MFM bridge board - format with WINFORM.EXE +Via Xebec S1410 SASI to MFM bridge board - format with WINFORM.EXE NP05-10S 8MB 160 6 17 16320 NP04-20T 16MB 320 6 17 32640 NP03-20 15MB 306 6 17 31212 diff --git a/src/mess/machine/s1410.h b/src/mess/machine/s1410.h index d28535f066c..f9adfda3701 100644 --- a/src/mess/machine/s1410.h +++ b/src/mess/machine/s1410.h @@ -16,20 +16,12 @@ -//************************************************************************** -// MACROS / CONSTANTS -//************************************************************************** - -#define S1410_TAG "s1410" - - - //************************************************************************** // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_S1410_ADD() \ - MCFG_DEVICE_ADD(S1410_TAG, S1410, 0) +#define MCFG_S1410_ADD( _tag) \ + MCFG_DEVICE_ADD(_tag, S1410, 0)