Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(MESS) abc800: Fixed formatting on the ABC 830/832/834/838 floppy drives. [Curt Coder]

Browse Source
This commit is contained in:
Curt Coder 2013-11-17 11:47:56 +00:00
parent ca4aab3a4e
commit 2899f32419
5 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/bus/abcbus/abcbus.c
View File

@ -99,7 +99,6 @@ SLOT_INTERFACE_START( abcbus_cards )
SLOT_INTERFACE("fd2", ABC_FD2)
SLOT_INTERFACE("sio", ABC_SIO)
SLOT_INTERFACE("slow", LUXOR_55_10828)
SLOT_INTERFACE("fast", LUXOR_55_21046)
SLOT_INTERFACE("uni800", ABC_UNI800)
SLOT_INTERFACE("slutprov", ABC_SLUTPROV)
SLOT_INTERFACE("turbo", TURBO_KONTROLLER)
@ -115,5 +114,4 @@ SLOT_INTERFACE_START( abc1600bus_cards )
SLOT_INTERFACE("4105", LUXOR_4105) // SASI interface
// SLOT_INTERFACE("4077", LUXOR_4077) // Winchester controller
// SLOT_INTERFACE("4004", LUXOR_4004) // ICOM I/O (Z80, Z80PIO, Z80SIO/2, Z80CTC, 2 Z80DMAs, 2 PROMs, 64KB RAM)
SLOT_INTERFACE("fast", LUXOR_55_21046)
SLOT_INTERFACE_END

107
src/emu/bus/abcbus/lux21046.c
View File

@ -275,6 +275,7 @@ static SLOT_INTERFACE_START( abc_floppies )
SLOT_INTERFACE( "525sd", FLOPPY_525_SD )
SLOT_INTERFACE( "525ssdd", FLOPPY_525_SSDD )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
@ -315,9 +316,26 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_21046 )
MCFG_Z80DMA_ADD(Z80DMA_TAG, XTAL_16MHz/4, dma_intf)
MCFG_FD1793x_ADD(SAB1793_TAG, XTAL_16MHz/16)
MACHINE_CONFIG_END
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525dd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525dd", luxor_55_21046_device::floppy_formats)
//-------------------------------------------------
// MACHINE_CONFIG( abc830 )
//-------------------------------------------------
static MACHINE_CONFIG_DERIVED( abc830, luxor_55_21046 )
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
//-------------------------------------------------
// MACHINE_CONFIG( abc832 )
//-------------------------------------------------
static MACHINE_CONFIG_DERIVED( abc832, luxor_55_21046 )
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
@ -326,10 +344,8 @@ MACHINE_CONFIG_END
//-------------------------------------------------
static MACHINE_CONFIG_DERIVED( abc838, luxor_55_21046 )
MCFG_DEVICE_MODIFY(SAB1793_TAG":0")
MCFG_DEVICE_SLOT_INTERFACE(abc_floppies, "8dsdd", false)
MCFG_DEVICE_MODIFY(SAB1793_TAG":1")
MCFG_DEVICE_SLOT_INTERFACE(abc_floppies, "8dsdd", false)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
@ -338,8 +354,8 @@ MACHINE_CONFIG_END
//-------------------------------------------------
static MACHINE_CONFIG_DERIVED( abc850, luxor_55_21046 )
MCFG_DEVICE_MODIFY(SAB1793_TAG":1")
MCFG_DEVICE_SLOT_INTERFACE(abc_floppies, NULL, false)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, NULL, luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
@ -353,6 +369,21 @@ machine_config_constructor luxor_55_21046_device::device_mconfig_additions() con
return MACHINE_CONFIG_NAME( luxor_55_21046 );
}
machine_config_constructor abc830_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( abc830 );
}
machine_config_constructor abc832_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( abc832 );
}
machine_config_constructor abc834_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( abc832 );
}
machine_config_constructor abc838_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( abc838 );
@ -374,12 +405,12 @@ INPUT_PORTS_START( luxor_55_21046 )
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2e)
PORT_DIPSETTING( 0x00, DEF_STR( Unused ) ) PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2e)
// ABC 830
PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x01, "Double" )
PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x02, "Double" )
PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
PORT_DIPSETTING( 0x01, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
PORT_DIPSETTING( 0x02, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x04, 0x00, "Drive 0 Density" ) PORT_DIPLOCATION("SW1:3") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
PORT_DIPSETTING( 0x04, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
@ -387,12 +418,12 @@ INPUT_PORTS_START( luxor_55_21046 )
PORT_DIPSETTING( 0x08, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
// ABC 832/834/850
PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x01, "Double" )
PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x02, "Double" )
PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
PORT_DIPSETTING( 0x01, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
PORT_DIPSETTING( 0x02, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x04, 0x04, "Drive 0 Tracks" ) PORT_DIPLOCATION("SW1:3") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
PORT_DIPSETTING( 0x00, "40" )
PORT_DIPSETTING( 0x04, "80" )
@ -446,12 +477,12 @@ INPUT_PORTS_END
INPUT_PORTS_START( abc830 )
PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x01, "Double" )
PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x02, "Double" )
PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x04, 0x00, "Drive 0 Density" ) PORT_DIPLOCATION("SW1:3")
PORT_DIPSETTING( 0x04, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
@ -496,12 +527,12 @@ INPUT_PORTS_END
INPUT_PORTS_START( abc832 )
PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x01, "Double" )
PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x02, "Double" )
PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x04, 0x04, "Drive 0 Tracks" ) PORT_DIPLOCATION("SW1:3")
PORT_DIPSETTING( 0x00, "40" )
PORT_DIPSETTING( 0x04, "80" )
@ -547,12 +578,12 @@ INPUT_PORTS_END
INPUT_PORTS_START( abc834 )
PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x01, "Double" )
PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x02, "Double" )
PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Double" )
PORT_DIPNAME( 0x04, 0x04, "Drive 0 Tracks" ) PORT_DIPLOCATION("SW1:3")
PORT_DIPSETTING( 0x00, "40" )
PORT_DIPSETTING( 0x04, "80" )

3
src/emu/bus/abcbus/lux21046.h
View File

@ -130,6 +130,7 @@ public:
abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual ioport_constructor device_input_ports() const;
};
@ -143,6 +144,7 @@ public:
abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual ioport_constructor device_input_ports() const;
};
@ -156,6 +158,7 @@ public:
abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual ioport_constructor device_input_ports() const;
};

4
src/lib/formats/abc800_dsk.c
View File

@ -4,7 +4,7 @@
formats/abc800_dsk.c
Luxor ABC 830/832/838 disk image formats
Luxor ABC 830/832/834/838 disk image formats
*********************************************************************/
@ -22,7 +22,7 @@ const char *abc800_format::name() const
const char *abc800_format::description() const
{
return "Luxor ABC 830/832/838 disk image";
return "Luxor ABC 830/832/834/838 disk image";
}
const char *abc800_format::extensions() const

2
src/lib/formats/abc800_dsk.h
View File

@ -4,7 +4,7 @@
formats/abc800_dsk.h
Luxor ABC 830/832/838 disk image formats
Luxor ABC 830/832/834/838 disk image formats
*********************************************************************/