Previous 199869 Revisions Next

r26227 Sunday 17th November, 2013 at 11:47:56 UTC by Curt Coder
(MESS) abc800: Fixed formatting on the ABC 830/832/834/838 floppy drives. [Curt Coder]
[src/emu/bus/abcbus]abcbus.c lux21046.c lux21046.h
[src/lib/formats]abc800_dsk.c abc800_dsk.h

trunk/src/emu/bus/abcbus/abcbus.c
r26226r26227
9999   SLOT_INTERFACE("fd2", ABC_FD2)
100100   SLOT_INTERFACE("sio", ABC_SIO)
101101   SLOT_INTERFACE("slow", LUXOR_55_10828)
102   SLOT_INTERFACE("fast", LUXOR_55_21046)
103102   SLOT_INTERFACE("uni800", ABC_UNI800)
104103   SLOT_INTERFACE("slutprov", ABC_SLUTPROV)
105104   SLOT_INTERFACE("turbo", TURBO_KONTROLLER)
r26226r26227
115114   SLOT_INTERFACE("4105", LUXOR_4105) // SASI interface
116115//  SLOT_INTERFACE("4077", LUXOR_4077) // Winchester controller
117116//  SLOT_INTERFACE("4004", LUXOR_4004) // ICOM I/O (Z80, Z80PIO, Z80SIO/2, Z80CTC, 2 Z80DMAs, 2 PROMs, 64KB RAM)
118   SLOT_INTERFACE("fast", LUXOR_55_21046)
119117SLOT_INTERFACE_END
trunk/src/emu/bus/abcbus/lux21046.c
r26226r26227
275275   SLOT_INTERFACE( "525sd", FLOPPY_525_SD )
276276   SLOT_INTERFACE( "525ssdd", FLOPPY_525_SSDD )
277277   SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
278   SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
278279   SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
279280SLOT_INTERFACE_END
280281
r26226r26227
315316
316317   MCFG_Z80DMA_ADD(Z80DMA_TAG, XTAL_16MHz/4, dma_intf)
317318   MCFG_FD1793x_ADD(SAB1793_TAG, XTAL_16MHz/16)
319MACHINE_CONFIG_END
318320
319   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525dd", luxor_55_21046_device::floppy_formats)
320   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525dd", luxor_55_21046_device::floppy_formats)
321
322//-------------------------------------------------
323//  MACHINE_CONFIG( abc830 )
324//-------------------------------------------------
325
326static MACHINE_CONFIG_DERIVED( abc830, luxor_55_21046 )
327   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
328   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
321329MACHINE_CONFIG_END
322330
323331
324332//-------------------------------------------------
333//  MACHINE_CONFIG( abc832 )
334//-------------------------------------------------
335
336static MACHINE_CONFIG_DERIVED( abc832, luxor_55_21046 )
337   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
338   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
339MACHINE_CONFIG_END
340
341
342//-------------------------------------------------
325343//  MACHINE_CONFIG( abc838 )
326344//-------------------------------------------------
327345
328346static MACHINE_CONFIG_DERIVED( abc838, luxor_55_21046 )
329   MCFG_DEVICE_MODIFY(SAB1793_TAG":0")
330   MCFG_DEVICE_SLOT_INTERFACE(abc_floppies, "8dsdd", false)
331   MCFG_DEVICE_MODIFY(SAB1793_TAG":1")
332   MCFG_DEVICE_SLOT_INTERFACE(abc_floppies, "8dsdd", false)
347   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
348   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
333349MACHINE_CONFIG_END
334350
335351
r26226r26227
338354//-------------------------------------------------
339355
340356static MACHINE_CONFIG_DERIVED( abc850, luxor_55_21046 )
341   MCFG_DEVICE_MODIFY(SAB1793_TAG":1")
342   MCFG_DEVICE_SLOT_INTERFACE(abc_floppies, NULL, false)
357   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
358   MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, NULL, luxor_55_21046_device::floppy_formats)
343359MACHINE_CONFIG_END
344360
345361
r26226r26227
353369   return MACHINE_CONFIG_NAME( luxor_55_21046 );
354370}
355371
372machine_config_constructor abc830_device::device_mconfig_additions() const
373{
374   return MACHINE_CONFIG_NAME( abc830 );
375}
376
377machine_config_constructor abc832_device::device_mconfig_additions() const
378{
379   return MACHINE_CONFIG_NAME( abc832 );
380}
381
382machine_config_constructor abc834_device::device_mconfig_additions() const
383{
384   return MACHINE_CONFIG_NAME( abc832 );
385}
386
356387machine_config_constructor abc838_device::device_mconfig_additions() const
357388{
358389   return MACHINE_CONFIG_NAME( abc838 );
r26226r26227
374405   PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2e)
375406   PORT_DIPSETTING(    0x00, DEF_STR( Unused ) ) PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2e)
376407   // ABC 830
377   PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
378   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
379   PORT_DIPSETTING(    0x01, "Double" )
380   PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
381   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
382   PORT_DIPSETTING(    0x02, "Double" )
408   PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
409   PORT_DIPSETTING(    0x01, DEF_STR( Single ) )
410   PORT_DIPSETTING(    0x00, "Double" )
411   PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
412   PORT_DIPSETTING(    0x02, DEF_STR( Single ) )
413   PORT_DIPSETTING(    0x00, "Double" )
383414   PORT_DIPNAME( 0x04, 0x00, "Drive 0 Density" ) PORT_DIPLOCATION("SW1:3") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2d)
384415   PORT_DIPSETTING(    0x04, DEF_STR( Single ) )
385416   PORT_DIPSETTING(    0x00, "Double" )
r26226r26227
387418   PORT_DIPSETTING(    0x08, DEF_STR( Single ) )
388419   PORT_DIPSETTING(    0x00, "Double" )
389420   // ABC 832/834/850
390   PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
391   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
392   PORT_DIPSETTING(    0x01, "Double" )
393   PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
394   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
395   PORT_DIPSETTING(    0x02, "Double" )
421   PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
422   PORT_DIPSETTING(    0x01, DEF_STR( Single ) )
423   PORT_DIPSETTING(    0x00, "Double" )
424   PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
425   PORT_DIPSETTING(    0x02, DEF_STR( Single ) )
426   PORT_DIPSETTING(    0x00, "Double" )
396427   PORT_DIPNAME( 0x04, 0x04, "Drive 0 Tracks" ) PORT_DIPLOCATION("SW1:3") PORT_CONDITION("SW3", 0x7f, EQUALS, 0x2c)
397428   PORT_DIPSETTING(    0x00, "40" )
398429   PORT_DIPSETTING(    0x04, "80" )
r26226r26227
446477
447478INPUT_PORTS_START( abc830 )
448479   PORT_START("SW1")
449   PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
450   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
451   PORT_DIPSETTING(    0x01, "Double" )
452   PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
453   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
454   PORT_DIPSETTING(    0x02, "Double" )
480   PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
481   PORT_DIPSETTING(    0x01, DEF_STR( Single ) )
482   PORT_DIPSETTING(    0x00, "Double" )
483   PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
484   PORT_DIPSETTING(    0x02, DEF_STR( Single ) )
485   PORT_DIPSETTING(    0x00, "Double" )
455486   PORT_DIPNAME( 0x04, 0x00, "Drive 0 Density" ) PORT_DIPLOCATION("SW1:3")
456487   PORT_DIPSETTING(    0x04, DEF_STR( Single ) )
457488   PORT_DIPSETTING(    0x00, "Double" )
r26226r26227
496527
497528INPUT_PORTS_START( abc832 )
498529   PORT_START("SW1")
499   PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
500   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
501   PORT_DIPSETTING(    0x01, "Double" )
502   PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
503   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
504   PORT_DIPSETTING(    0x02, "Double" )
530   PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
531   PORT_DIPSETTING(    0x01, DEF_STR( Single ) )
532   PORT_DIPSETTING(    0x00, "Double" )
533   PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
534   PORT_DIPSETTING(    0x02, DEF_STR( Single ) )
535   PORT_DIPSETTING(    0x00, "Double" )
505536   PORT_DIPNAME( 0x04, 0x04, "Drive 0 Tracks" ) PORT_DIPLOCATION("SW1:3")
506537   PORT_DIPSETTING(    0x00, "40" )
507538   PORT_DIPSETTING(    0x04, "80" )
r26226r26227
547578
548579INPUT_PORTS_START( abc834 )
549580   PORT_START("SW1")
550   PORT_DIPNAME( 0x01, 0x01, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
551   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
552   PORT_DIPSETTING(    0x01, "Double" )
553   PORT_DIPNAME( 0x02, 0x02, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
554   PORT_DIPSETTING(    0x00, DEF_STR( Single ) )
555   PORT_DIPSETTING(    0x02, "Double" )
581   PORT_DIPNAME( 0x01, 0x00, "Drive 0 Sides" ) PORT_DIPLOCATION("SW1:1")
582   PORT_DIPSETTING(    0x01, DEF_STR( Single ) )
583   PORT_DIPSETTING(    0x00, "Double" )
584   PORT_DIPNAME( 0x02, 0x00, "Drive 1 Sides" ) PORT_DIPLOCATION("SW1:2")
585   PORT_DIPSETTING(    0x02, DEF_STR( Single ) )
586   PORT_DIPSETTING(    0x00, "Double" )
556587   PORT_DIPNAME( 0x04, 0x04, "Drive 0 Tracks" ) PORT_DIPLOCATION("SW1:3")
557588   PORT_DIPSETTING(    0x00, "40" )
558589   PORT_DIPSETTING(    0x04, "80" )
trunk/src/emu/bus/abcbus/lux21046.h
r26226r26227
130130   abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
131131
132132   // optional information overrides
133   virtual machine_config_constructor device_mconfig_additions() const;
133134   virtual ioport_constructor device_input_ports() const;
134135};
135136
r26226r26227
143144   abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
144145
145146   // optional information overrides
147   virtual machine_config_constructor device_mconfig_additions() const;
146148   virtual ioport_constructor device_input_ports() const;
147149};
148150
r26226r26227
156158   abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
157159
158160   // optional information overrides
161   virtual machine_config_constructor device_mconfig_additions() const;
159162   virtual ioport_constructor device_input_ports() const;
160163};
161164
trunk/src/lib/formats/abc800_dsk.c
r26226r26227
44
55    formats/abc800_dsk.c
66
7    Luxor ABC 830/832/838 disk image formats
7    Luxor ABC 830/832/834/838 disk image formats
88
99*********************************************************************/
1010
r26226r26227
2222
2323const char *abc800_format::description() const
2424{
25   return "Luxor ABC 830/832/838 disk image";
25   return "Luxor ABC 830/832/834/838 disk image";
2626}
2727
2828const char *abc800_format::extensions() const
trunk/src/lib/formats/abc800_dsk.h
r26226r26227
44
55    formats/abc800_dsk.h
66
7    Luxor ABC 830/832/838 disk image formats
7    Luxor ABC 830/832/834/838 disk image formats
88
99*********************************************************************/
1010

Previous 199869 Revisions Next

© 1997-2024 The MAME Team