summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-05-07 23:18:47 +1000
committer Vas Crabb <vas@vastheman.com>2017-05-14 21:44:11 +1000
commit0f0d39ef81562c75e79176dd3bebb1e491ca39d5 (patch)
tree201cee7fdf55ee800f83859a92efd2cfe66cf2b3 /src/devices/bus
parente6c4be2b4d71c7a6c95be0bae111eb416ff0f9e7 (diff)
Move static data out of devices into the device types. This is a significant change, so please pay attention.
The core changes are: * Short name, full name and source file are no longer members of device_t, they are part of the device type * MACHINE_COFIG_START no longer needs a driver class * MACHINE_CONFIG_DERIVED_CLASS is no longer necessary * Specify the state class you want in the GAME/COMP/CONS line * The compiler will work out the base class where the driver init member is declared * There is one static device type object per driver rather than one per machine configuration Use DECLARE_DEVICE_TYPE or DECLARE_DEVICE_TYPE_NS to declare device type. * DECLARE_DEVICE_TYPE forward-declares teh device type and class, and declares extern object finders. * DECLARE_DEVICE_TYPE_NS is for devices classes in namespaces - it doesn't forward-declare the device type. Use DEFINE_DEVICE_TYPE or DEFINE_DEVICE_TYPE_NS to define device types. * These macros declare storage for the static data, and instantiate the device type and device finder templates. The rest of the changes are mostly just moving stuff out of headers that shouldn't be there, renaming stuff for consistency, and scoping stuff down where appropriate. Things I've actually messed with substantially: * More descriptive names for a lot of devices * Untangled the fantasy sound from the driver state, which necessitates breaking up sound/flip writes * Changed DECO BSMT2000 ready callback into a device delegate * Untangled Microprose 3D noise from driver state * Used object finders for CoCo multipak, KC85 D002, and Irem sound subdevices * Started to get TI-99 stuff out of the TI-990 directory and arrange bus devices properly * Started to break out common parts of Samsung ARM SoC devices * Turned some of FM, SID, SCSP DSP, EPIC12 and Voodoo cores into something resmbling C++ * Tried to make Z180 table allocation/setup a bit safer * Converted generic keyboard/terminal to not use WRITE8 - space/offset aren't relevant * Dynamically allocate generic terminal buffer so derived devices (e.g. teleprinter) can specify size * Imporved encapsulation of Z80DART channels * Refactored the SPC7110 bit table generator loop to make it more readable * Added wrappers for SNES PPU operations so members can be made protected * Factored out some boilerplate for YM chips with PSG * toaplan2 gfx * stic/intv resolution * Video System video * Out Run/Y-board sprite alignment * GIC video hookup * Amstrad CPC ROM box members * IQ151 ROM cart region * MSX cart IRQ callback resolution time * SMS passthrough control devices starting subslots I've smoke-tested several drivers, but I've probably missed something. Things I've missed will likely blow up spectacularly with failure to bind errors and the like. Let me know if there's more subtle breakage (could have happened in FM or Voodoo). And can everyone please, please try to keep stuff clean. In particular, please stop polluting the global namespace. Keep things out of headers that don't need to be there, and use things that can be scoped down rather than macros. It feels like an uphill battle trying to get this stuff under control while more of it's added.
Diffstat (limited to 'src/devices/bus')
-rw-r--r--src/devices/bus/a1bus/a1bus.cpp36
-rw-r--r--src/devices/bus/a1bus/a1bus.h35
-rw-r--r--src/devices/bus/a1bus/a1cassette.cpp18
-rw-r--r--src/devices/bus/a1bus/a1cassette.h17
-rw-r--r--src/devices/bus/a1bus/a1cffa.cpp19
-rw-r--r--src/devices/bus/a1bus/a1cffa.h15
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp12
-rw-r--r--src/devices/bus/a2bus/a2alfam2.h28
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp10
-rw-r--r--src/devices/bus/a2bus/a2applicard.h13
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp11
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.h13
-rw-r--r--src/devices/bus/a2bus/a2bus.cpp35
-rw-r--r--src/devices/bus/a2bus/a2bus.h30
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp12
-rw-r--r--src/devices/bus/a2bus/a2cffa.h18
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp10
-rw-r--r--src/devices/bus/a2bus/a2corvus.h17
-rw-r--r--src/devices/bus/a2bus/a2diskii.cpp20
-rw-r--r--src/devices/bus/a2bus/a2diskii.h20
-rw-r--r--src/devices/bus/a2bus/a2diskiing.cpp7
-rw-r--r--src/devices/bus/a2bus/a2diskiing.h12
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp11
-rw-r--r--src/devices/bus/a2bus/a2dx1.h19
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.cpp36
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.h28
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp10
-rw-r--r--src/devices/bus/a2bus/a2echoii.h12
-rw-r--r--src/devices/bus/a2bus/a2eext80col.cpp9
-rw-r--r--src/devices/bus/a2bus/a2eext80col.h13
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.cpp13
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.h11
-rw-r--r--src/devices/bus/a2bus/a2estd80col.cpp9
-rw-r--r--src/devices/bus/a2bus/a2estd80col.h13
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp11
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.h19
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp23
-rw-r--r--src/devices/bus/a2bus/a2mcms.h16
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp12
-rw-r--r--src/devices/bus/a2bus/a2memexp.h18
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp12
-rw-r--r--src/devices/bus/a2bus/a2midi.h13
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp16
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.h23
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp14
-rw-r--r--src/devices/bus/a2bus/a2pic.h23
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp4
-rw-r--r--src/devices/bus/a2bus/a2sam.h12
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp11
-rw-r--r--src/devices/bus/a2bus/a2scsi.h19
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp10
-rw-r--r--src/devices/bus/a2bus/a2softcard.h11
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp13
-rw-r--r--src/devices/bus/a2bus/a2ssc.h15
-rw-r--r--src/devices/bus/a2bus/a2swyft.cpp9
-rw-r--r--src/devices/bus/a2bus/a2swyft.h13
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp10
-rw-r--r--src/devices/bus/a2bus/a2themill.h13
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.cpp10
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.h13
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp12
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.h28
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp32
-rw-r--r--src/devices/bus/a2bus/a2videoterm.h41
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp12
-rw-r--r--src/devices/bus/a2bus/a2vulcan.h18
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp8
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.h16
-rw-r--r--src/devices/bus/a2bus/agat7langcard.cpp9
-rw-r--r--src/devices/bus/a2bus/agat7langcard.h12
-rw-r--r--src/devices/bus/a2bus/agat7ram.cpp9
-rw-r--r--src/devices/bus/a2bus/agat7ram.h13
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp17
-rw-r--r--src/devices/bus/a2bus/corvfdc01.h15
-rw-r--r--src/devices/bus/a2bus/corvfdc02.cpp14
-rw-r--r--src/devices/bus/a2bus/corvfdc02.h13
-rw-r--r--src/devices/bus/a2bus/ezcgi.cpp30
-rw-r--r--src/devices/bus/a2bus/ezcgi.h23
-rw-r--r--src/devices/bus/a2bus/laser128.cpp9
-rw-r--r--src/devices/bus/a2bus/laser128.h13
-rw-r--r--src/devices/bus/a2bus/mouse.cpp8
-rw-r--r--src/devices/bus/a2bus/mouse.h5
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp16
-rw-r--r--src/devices/bus/a2bus/pc_xporter.h44
-rw-r--r--src/devices/bus/a2bus/ramcard128k.cpp11
-rw-r--r--src/devices/bus/a2bus/ramcard128k.h13
-rw-r--r--src/devices/bus/a2bus/ramcard16k.cpp9
-rw-r--r--src/devices/bus/a2bus/ramcard16k.h13
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp12
-rw-r--r--src/devices/bus/a2bus/timemasterho.h13
-rw-r--r--src/devices/bus/a7800/a78_carts.h7
-rw-r--r--src/devices/bus/a7800/a78_slot.cpp12
-rw-r--r--src/devices/bus/a7800/a78_slot.h13
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp22
-rw-r--r--src/devices/bus/a7800/cpuwiz.h17
-rw-r--r--src/devices/bus/a7800/hiscore.cpp6
-rw-r--r--src/devices/bus/a7800/hiscore.h10
-rw-r--r--src/devices/bus/a7800/rom.cpp104
-rw-r--r--src/devices/bus/a7800/rom.h86
-rw-r--r--src/devices/bus/a7800/xboard.cpp27
-rw-r--r--src/devices/bus/a7800/xboard.h25
-rw-r--r--src/devices/bus/a800/a800_carts.h7
-rw-r--r--src/devices/bus/a800/a800_slot.cpp22
-rw-r--r--src/devices/bus/a800/a800_slot.h27
-rw-r--r--src/devices/bus/a800/a8sio.cpp22
-rw-r--r--src/devices/bus/a800/a8sio.h31
-rw-r--r--src/devices/bus/a800/cassette.cpp17
-rw-r--r--src/devices/bus/a800/cassette.h13
-rw-r--r--src/devices/bus/a800/oss.cpp25
-rw-r--r--src/devices/bus/a800/oss.h48
-rw-r--r--src/devices/bus/a800/rom.cpp62
-rw-r--r--src/devices/bus/a800/rom.h93
-rw-r--r--src/devices/bus/a800/sparta.cpp10
-rw-r--r--src/devices/bus/a800/sparta.h18
-rw-r--r--src/devices/bus/abcbus/abc890.cpp98
-rw-r--r--src/devices/bus/abcbus/abc890.h59
-rw-r--r--src/devices/bus/abcbus/abcbus.cpp12
-rw-r--r--src/devices/bus/abcbus/abcbus.h66
-rw-r--r--src/devices/bus/abcbus/fd2.cpp60
-rw-r--r--src/devices/bus/abcbus/fd2.h20
-rw-r--r--src/devices/bus/abcbus/hdc.cpp8
-rw-r--r--src/devices/bus/abcbus/hdc.h12
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp4
-rw-r--r--src/devices/bus/abcbus/lux10828.h12
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp144
-rw-r--r--src/devices/bus/abcbus/lux21046.h48
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp4
-rw-r--r--src/devices/bus/abcbus/lux21056.h14
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp4
-rw-r--r--src/devices/bus/abcbus/lux4105.h13
-rw-r--r--src/devices/bus/abcbus/memcard.cpp14
-rw-r--r--src/devices/bus/abcbus/memcard.h16
-rw-r--r--src/devices/bus/abcbus/ram.cpp14
-rw-r--r--src/devices/bus/abcbus/ram.h19
-rw-r--r--src/devices/bus/abcbus/sio.cpp4
-rw-r--r--src/devices/bus/abcbus/sio.h12
-rw-r--r--src/devices/bus/abcbus/slutprov.cpp4
-rw-r--r--src/devices/bus/abcbus/slutprov.h12
-rw-r--r--src/devices/bus/abcbus/turbo.cpp4
-rw-r--r--src/devices/bus/abcbus/turbo.h11
-rw-r--r--src/devices/bus/abcbus/uni800.cpp4
-rw-r--r--src/devices/bus/abcbus/uni800.h12
-rw-r--r--src/devices/bus/abckb/abc77.cpp12
-rw-r--r--src/devices/bus/abckb/abc77.h10
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp5
-rw-r--r--src/devices/bus/abckb/abc800kb.h12
-rw-r--r--src/devices/bus/abckb/abc99.cpp4
-rw-r--r--src/devices/bus/abckb/abc99.h2
-rw-r--r--src/devices/bus/abckb/abckb.cpp4
-rw-r--r--src/devices/bus/abckb/abckb.h27
-rw-r--r--src/devices/bus/adam/adamlink.cpp6
-rw-r--r--src/devices/bus/adam/adamlink.h12
-rw-r--r--src/devices/bus/adam/exp.cpp4
-rw-r--r--src/devices/bus/adam/exp.h18
-rw-r--r--src/devices/bus/adam/ide.cpp4
-rw-r--r--src/devices/bus/adam/ide.h12
-rw-r--r--src/devices/bus/adam/ram.cpp4
-rw-r--r--src/devices/bus/adam/ram.h12
-rw-r--r--src/devices/bus/adamnet/adamnet.cpp8
-rw-r--r--src/devices/bus/adamnet/adamnet.h18
-rw-r--r--src/devices/bus/adamnet/ddp.cpp4
-rw-r--r--src/devices/bus/adamnet/ddp.h12
-rw-r--r--src/devices/bus/adamnet/fdc.cpp20
-rw-r--r--src/devices/bus/adamnet/fdc.h12
-rw-r--r--src/devices/bus/adamnet/kb.cpp4
-rw-r--r--src/devices/bus/adamnet/kb.h10
-rw-r--r--src/devices/bus/adamnet/printer.cpp4
-rw-r--r--src/devices/bus/adamnet/printer.h12
-rw-r--r--src/devices/bus/adamnet/spi.cpp4
-rw-r--r--src/devices/bus/adamnet/spi.h12
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.cpp4
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.h22
-rw-r--r--src/devices/bus/amiga/keyboard/a500.cpp47
-rw-r--r--src/devices/bus/amiga/keyboard/a500.h37
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.cpp4
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.h25
-rw-r--r--src/devices/bus/amiga/keyboard/matrix.h6
-rw-r--r--src/devices/bus/amiga/zorro/a2052.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/a2052.h10
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/a2232.h10
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp13
-rw-r--r--src/devices/bus/amiga/zorro/a590.h21
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.cpp17
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.h21
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/buddha.h10
-rw-r--r--src/devices/bus/amiga/zorro/cards.cpp7
-rw-r--r--src/devices/bus/amiga/zorro/cards.h14
-rw-r--r--src/devices/bus/amiga/zorro/zorro.cpp39
-rw-r--r--src/devices/bus/amiga/zorro/zorro.h74
-rw-r--r--src/devices/bus/apf/rom.cpp18
-rw-r--r--src/devices/bus/apf/rom.h27
-rw-r--r--src/devices/bus/apf/slot.cpp10
-rw-r--r--src/devices/bus/apf/slot.h9
-rw-r--r--src/devices/bus/apricot/expansion/cards.cpp1
-rw-r--r--src/devices/bus/apricot/expansion/cards.h10
-rw-r--r--src/devices/bus/apricot/expansion/expansion.cpp18
-rw-r--r--src/devices/bus/apricot/expansion/expansion.h47
-rw-r--r--src/devices/bus/apricot/expansion/ram.cpp12
-rw-r--r--src/devices/bus/apricot/expansion/ram.h14
-rw-r--r--src/devices/bus/apricot/keyboard/hle.cpp4
-rw-r--r--src/devices/bus/apricot/keyboard/hle.h14
-rw-r--r--src/devices/bus/apricot/keyboard/keyboard.cpp4
-rw-r--r--src/devices/bus/apricot/keyboard/keyboard.h19
-rw-r--r--src/devices/bus/arcadia/rom.cpp14
-rw-r--r--src/devices/bus/arcadia/rom.h22
-rw-r--r--src/devices/bus/arcadia/slot.cpp10
-rw-r--r--src/devices/bus/arcadia/slot.h14
-rw-r--r--src/devices/bus/astrocde/exp.cpp8
-rw-r--r--src/devices/bus/astrocde/exp.h17
-rw-r--r--src/devices/bus/astrocde/ram.cpp46
-rw-r--r--src/devices/bus/astrocde/ram.h58
-rw-r--r--src/devices/bus/astrocde/rom.cpp22
-rw-r--r--src/devices/bus/astrocde/rom.h42
-rw-r--r--src/devices/bus/astrocde/slot.cpp10
-rw-r--r--src/devices/bus/astrocde/slot.h19
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.cpp6
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.h21
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.cpp6
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.h10
-rw-r--r--src/devices/bus/bbc/analogue/analogue.cpp6
-rw-r--r--src/devices/bus/bbc/analogue/analogue.h15
-rw-r--r--src/devices/bus/bbc/analogue/joystick.cpp12
-rw-r--r--src/devices/bus/bbc/analogue/joystick.h18
-rw-r--r--src/devices/bus/bbc/fdc/acorn.cpp10
-rw-r--r--src/devices/bus/bbc/fdc/acorn.h14
-rw-r--r--src/devices/bus/bbc/fdc/cumana.cpp14
-rw-r--r--src/devices/bus/bbc/fdc/cumana.h19
-rw-r--r--src/devices/bus/bbc/fdc/fdc.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/fdc.h21
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp18
-rw-r--r--src/devices/bus/bbc/fdc/opus.h21
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp16
-rw-r--r--src/devices/bus/bbc/fdc/watford.h22
-rw-r--r--src/devices/bus/bbc/joyport/joyport.cpp6
-rw-r--r--src/devices/bus/bbc/joyport/joyport.h14
-rw-r--r--src/devices/bus/bbc/joyport/joystick.cpp8
-rw-r--r--src/devices/bus/bbc/joyport/joystick.h10
-rw-r--r--src/devices/bus/bbc/tube/tube.cpp6
-rw-r--r--src/devices/bus/bbc/tube/tube.h19
-rw-r--r--src/devices/bus/bbc/userport/userport.cpp6
-rw-r--r--src/devices/bus/bbc/userport/userport.h14
-rw-r--r--src/devices/bus/bml3/bml3bus.cpp30
-rw-r--r--src/devices/bus/bml3/bml3bus.h31
-rw-r--r--src/devices/bus/bml3/bml3kanji.cpp4
-rw-r--r--src/devices/bus/bml3/bml3kanji.h10
-rw-r--r--src/devices/bus/bml3/bml3mp1802.cpp6
-rw-r--r--src/devices/bus/bml3/bml3mp1802.h11
-rw-r--r--src/devices/bus/bml3/bml3mp1805.cpp4
-rw-r--r--src/devices/bus/bml3/bml3mp1805.h10
-rw-r--r--src/devices/bus/bw2/exp.cpp4
-rw-r--r--src/devices/bus/bw2/exp.h14
-rw-r--r--src/devices/bus/bw2/ramcard.cpp4
-rw-r--r--src/devices/bus/bw2/ramcard.h10
-rw-r--r--src/devices/bus/c64/16kb.cpp4
-rw-r--r--src/devices/bus/c64/16kb.h14
-rw-r--r--src/devices/bus/c64/4dxh.cpp4
-rw-r--r--src/devices/bus/c64/4dxh.h10
-rw-r--r--src/devices/bus/c64/4ksa.cpp4
-rw-r--r--src/devices/bus/c64/4ksa.h10
-rw-r--r--src/devices/bus/c64/4tba.cpp4
-rw-r--r--src/devices/bus/c64/4tba.h11
-rw-r--r--src/devices/bus/c64/bn1541.cpp4
-rw-r--r--src/devices/bus/c64/bn1541.h10
-rw-r--r--src/devices/bus/c64/c128_comal80.cpp4
-rw-r--r--src/devices/bus/c64/c128_comal80.h10
-rw-r--r--src/devices/bus/c64/c128_partner.cpp27
-rw-r--r--src/devices/bus/c64/c128_partner.h16
-rw-r--r--src/devices/bus/c64/comal80.cpp4
-rw-r--r--src/devices/bus/c64/comal80.h10
-rw-r--r--src/devices/bus/c64/cpm.cpp4
-rw-r--r--src/devices/bus/c64/cpm.h12
-rw-r--r--src/devices/bus/c64/currah_speech.cpp4
-rw-r--r--src/devices/bus/c64/currah_speech.h10
-rw-r--r--src/devices/bus/c64/dela_ep256.cpp4
-rw-r--r--src/devices/bus/c64/dela_ep256.h11
-rw-r--r--src/devices/bus/c64/dela_ep64.cpp4
-rw-r--r--src/devices/bus/c64/dela_ep64.h10
-rw-r--r--src/devices/bus/c64/dela_ep7x8.cpp4
-rw-r--r--src/devices/bus/c64/dela_ep7x8.h11
-rw-r--r--src/devices/bus/c64/dinamic.cpp4
-rw-r--r--src/devices/bus/c64/dinamic.h10
-rw-r--r--src/devices/bus/c64/dqbb.cpp4
-rw-r--r--src/devices/bus/c64/dqbb.h10
-rw-r--r--src/devices/bus/c64/easy_calc_result.cpp4
-rw-r--r--src/devices/bus/c64/easy_calc_result.h10
-rw-r--r--src/devices/bus/c64/easyflash.cpp4
-rw-r--r--src/devices/bus/c64/easyflash.h10
-rw-r--r--src/devices/bus/c64/epyx_fast_load.cpp4
-rw-r--r--src/devices/bus/c64/epyx_fast_load.h10
-rw-r--r--src/devices/bus/c64/exos.cpp4
-rw-r--r--src/devices/bus/c64/exos.h10
-rw-r--r--src/devices/bus/c64/exp.cpp4
-rw-r--r--src/devices/bus/c64/exp.h23
-rw-r--r--src/devices/bus/c64/fcc.cpp4
-rw-r--r--src/devices/bus/c64/fcc.h11
-rw-r--r--src/devices/bus/c64/final.cpp4
-rw-r--r--src/devices/bus/c64/final.h10
-rw-r--r--src/devices/bus/c64/final3.cpp4
-rw-r--r--src/devices/bus/c64/final3.h10
-rw-r--r--src/devices/bus/c64/fun_play.cpp4
-rw-r--r--src/devices/bus/c64/fun_play.h10
-rw-r--r--src/devices/bus/c64/geocable.cpp4
-rw-r--r--src/devices/bus/c64/geocable.h9
-rw-r--r--src/devices/bus/c64/georam.cpp4
-rw-r--r--src/devices/bus/c64/georam.h10
-rw-r--r--src/devices/bus/c64/ide64.cpp4
-rw-r--r--src/devices/bus/c64/ide64.h10
-rw-r--r--src/devices/bus/c64/ieee488.cpp4
-rw-r--r--src/devices/bus/c64/ieee488.h13
-rw-r--r--src/devices/bus/c64/kingsoft.cpp4
-rw-r--r--src/devices/bus/c64/kingsoft.h10
-rw-r--r--src/devices/bus/c64/mach5.cpp4
-rw-r--r--src/devices/bus/c64/mach5.h10
-rw-r--r--src/devices/bus/c64/magic_desk.cpp4
-rw-r--r--src/devices/bus/c64/magic_desk.h10
-rw-r--r--src/devices/bus/c64/magic_formel.cpp4
-rw-r--r--src/devices/bus/c64/magic_formel.h10
-rw-r--r--src/devices/bus/c64/magic_voice.cpp4
-rw-r--r--src/devices/bus/c64/magic_voice.h13
-rw-r--r--src/devices/bus/c64/midi_maplin.cpp4
-rw-r--r--src/devices/bus/c64/midi_maplin.h10
-rw-r--r--src/devices/bus/c64/midi_namesoft.cpp4
-rw-r--r--src/devices/bus/c64/midi_namesoft.h10
-rw-r--r--src/devices/bus/c64/midi_passport.cpp4
-rw-r--r--src/devices/bus/c64/midi_passport.h10
-rw-r--r--src/devices/bus/c64/midi_sci.cpp4
-rw-r--r--src/devices/bus/c64/midi_sci.h10
-rw-r--r--src/devices/bus/c64/midi_siel.cpp4
-rw-r--r--src/devices/bus/c64/midi_siel.h10
-rw-r--r--src/devices/bus/c64/mikro_assembler.cpp4
-rw-r--r--src/devices/bus/c64/mikro_assembler.h10
-rw-r--r--src/devices/bus/c64/multiscreen.cpp4
-rw-r--r--src/devices/bus/c64/multiscreen.h10
-rw-r--r--src/devices/bus/c64/music64.cpp4
-rw-r--r--src/devices/bus/c64/music64.h10
-rw-r--r--src/devices/bus/c64/neoram.cpp4
-rw-r--r--src/devices/bus/c64/neoram.h10
-rw-r--r--src/devices/bus/c64/ocean.cpp4
-rw-r--r--src/devices/bus/c64/ocean.h10
-rw-r--r--src/devices/bus/c64/pagefox.cpp4
-rw-r--r--src/devices/bus/c64/pagefox.h10
-rw-r--r--src/devices/bus/c64/partner.cpp4
-rw-r--r--src/devices/bus/c64/partner.h10
-rw-r--r--src/devices/bus/c64/prophet64.cpp4
-rw-r--r--src/devices/bus/c64/prophet64.h12
-rw-r--r--src/devices/bus/c64/ps64.cpp4
-rw-r--r--src/devices/bus/c64/ps64.h10
-rw-r--r--src/devices/bus/c64/reu.cpp16
-rw-r--r--src/devices/bus/c64/reu.h21
-rw-r--r--src/devices/bus/c64/rex.cpp4
-rw-r--r--src/devices/bus/c64/rex.h10
-rw-r--r--src/devices/bus/c64/rex_ep256.cpp4
-rw-r--r--src/devices/bus/c64/rex_ep256.h11
-rw-r--r--src/devices/bus/c64/ross.cpp4
-rw-r--r--src/devices/bus/c64/ross.h11
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp4
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.h11
-rw-r--r--src/devices/bus/c64/silverrock.cpp4
-rw-r--r--src/devices/bus/c64/silverrock.h10
-rw-r--r--src/devices/bus/c64/simons_basic.cpp4
-rw-r--r--src/devices/bus/c64/simons_basic.h10
-rw-r--r--src/devices/bus/c64/speakeasy.cpp16
-rw-r--r--src/devices/bus/c64/speakeasy.h18
-rw-r--r--src/devices/bus/c64/stardos.cpp4
-rw-r--r--src/devices/bus/c64/stardos.h10
-rw-r--r--src/devices/bus/c64/std.cpp4
-rw-r--r--src/devices/bus/c64/std.h10
-rw-r--r--src/devices/bus/c64/structured_basic.cpp4
-rw-r--r--src/devices/bus/c64/structured_basic.h11
-rw-r--r--src/devices/bus/c64/super_explode.cpp4
-rw-r--r--src/devices/bus/c64/super_explode.h10
-rw-r--r--src/devices/bus/c64/super_games.cpp4
-rw-r--r--src/devices/bus/c64/super_games.h10
-rw-r--r--src/devices/bus/c64/supercpu.cpp4
-rw-r--r--src/devices/bus/c64/supercpu.h11
-rw-r--r--src/devices/bus/c64/sw8k.cpp4
-rw-r--r--src/devices/bus/c64/sw8k.h9
-rw-r--r--src/devices/bus/c64/swiftlink.cpp4
-rw-r--r--src/devices/bus/c64/swiftlink.h10
-rw-r--r--src/devices/bus/c64/system3.cpp4
-rw-r--r--src/devices/bus/c64/system3.h10
-rw-r--r--src/devices/bus/c64/tdos.cpp4
-rw-r--r--src/devices/bus/c64/tdos.h10
-rw-r--r--src/devices/bus/c64/turbo232.cpp4
-rw-r--r--src/devices/bus/c64/turbo232.h10
-rw-r--r--src/devices/bus/c64/user.h8
-rw-r--r--src/devices/bus/c64/vizastar.cpp4
-rw-r--r--src/devices/bus/c64/vizastar.h10
-rw-r--r--src/devices/bus/c64/vw64.cpp4
-rw-r--r--src/devices/bus/c64/vw64.h10
-rw-r--r--src/devices/bus/c64/warp_speed.cpp4
-rw-r--r--src/devices/bus/c64/warp_speed.h10
-rw-r--r--src/devices/bus/c64/westermann.cpp4
-rw-r--r--src/devices/bus/c64/westermann.h10
-rw-r--r--src/devices/bus/c64/xl80.cpp4
-rw-r--r--src/devices/bus/c64/xl80.h10
-rw-r--r--src/devices/bus/c64/zaxxon.cpp4
-rw-r--r--src/devices/bus/c64/zaxxon.h10
-rw-r--r--src/devices/bus/cbm2/24k.cpp4
-rw-r--r--src/devices/bus/cbm2/24k.h10
-rw-r--r--src/devices/bus/cbm2/exp.cpp9
-rw-r--r--src/devices/bus/cbm2/exp.h14
-rw-r--r--src/devices/bus/cbm2/hrg.cpp40
-rw-r--r--src/devices/bus/cbm2/hrg.h35
-rw-r--r--src/devices/bus/cbm2/std.cpp4
-rw-r--r--src/devices/bus/cbm2/std.h10
-rw-r--r--src/devices/bus/cbm2/user.cpp4
-rw-r--r--src/devices/bus/cbm2/user.h27
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp50
-rw-r--r--src/devices/bus/cbmiec/c1526.h36
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp236
-rw-r--r--src/devices/bus/cbmiec/c1541.h120
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp264
-rw-r--r--src/devices/bus/cbmiec/c1571.h49
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp87
-rw-r--r--src/devices/bus/cbmiec/c1581.h31
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.cpp6
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.h14
-rw-r--r--src/devices/bus/cbmiec/cbmiec.cpp8
-rw-r--r--src/devices/bus/cbmiec/cbmiec.h37
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp4
-rw-r--r--src/devices/bus/cbmiec/cmdhd.h16
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.cpp6
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.h11
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp29
-rw-r--r--src/devices/bus/cbmiec/fd2000.h28
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp10
-rw-r--r--src/devices/bus/cbmiec/interpod.h16
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp4
-rw-r--r--src/devices/bus/cbmiec/serialbox.h14
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp28
-rw-r--r--src/devices/bus/cbmiec/vic1515.h18
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp26
-rw-r--r--src/devices/bus/cbmiec/vic1520.h16
-rw-r--r--src/devices/bus/centronics/comxpl80.cpp4
-rw-r--r--src/devices/bus/centronics/comxpl80.h10
-rw-r--r--src/devices/bus/centronics/covox.cpp8
-rw-r--r--src/devices/bus/centronics/covox.h10
-rw-r--r--src/devices/bus/centronics/ctronics.cpp4
-rw-r--r--src/devices/bus/centronics/ctronics.h80
-rw-r--r--src/devices/bus/centronics/digiblst.cpp4
-rw-r--r--src/devices/bus/centronics/digiblst.h8
-rw-r--r--src/devices/bus/centronics/dsjoy.cpp4
-rw-r--r--src/devices/bus/centronics/dsjoy.h8
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp64
-rw-r--r--src/devices/bus/centronics/epson_ex800.h16
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp80
-rw-r--r--src/devices/bus/centronics/epson_lx800.h19
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp147
-rw-r--r--src/devices/bus/centronics/epson_lx810l.h29
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp22
-rw-r--r--src/devices/bus/centronics/nec_p72.h22
-rw-r--r--src/devices/bus/centronics/printer.cpp4
-rw-r--r--src/devices/bus/centronics/printer.h10
-rw-r--r--src/devices/bus/cgenie/expansion/carts.cpp4
-rw-r--r--src/devices/bus/cgenie/expansion/carts.h12
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.cpp30
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.h59
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp14
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.h14
-rw-r--r--src/devices/bus/cgenie/parallel/carts.cpp5
-rw-r--r--src/devices/bus/cgenie/parallel/carts.h13
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.cpp6
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.h12
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.cpp36
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.h43
-rw-r--r--src/devices/bus/cgenie/parallel/printer.cpp6
-rw-r--r--src/devices/bus/cgenie/parallel/printer.h12
-rw-r--r--src/devices/bus/chanf/rom.cpp40
-rw-r--r--src/devices/bus/chanf/rom.h22
-rw-r--r--src/devices/bus/chanf/slot.cpp10
-rw-r--r--src/devices/bus/chanf/slot.h16
-rw-r--r--src/devices/bus/coco/coco_232.cpp8
-rw-r--r--src/devices/bus/coco/coco_232.h28
-rw-r--r--src/devices/bus/coco/coco_dwsock.cpp15
-rw-r--r--src/devices/bus/coco/coco_dwsock.h8
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp34
-rw-r--r--src/devices/bus/coco/coco_fdc.h22
-rw-r--r--src/devices/bus/coco/coco_multi.cpp13
-rw-r--r--src/devices/bus/coco/coco_multi.h12
-rw-r--r--src/devices/bus/coco/coco_orch90.cpp10
-rw-r--r--src/devices/bus/coco/coco_orch90.h12
-rw-r--r--src/devices/bus/coco/coco_pak.cpp20
-rw-r--r--src/devices/bus/coco/coco_pak.h60
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp29
-rw-r--r--src/devices/bus/coco/coco_t4426.h49
-rw-r--r--src/devices/bus/coco/cococart.cpp14
-rw-r--r--src/devices/bus/coco/cococart.h18
-rw-r--r--src/devices/bus/coco/dragon_fdc.cpp25
-rw-r--r--src/devices/bus/coleco/ctrl.cpp7
-rw-r--r--src/devices/bus/coleco/ctrl.h25
-rw-r--r--src/devices/bus/coleco/exp.cpp7
-rw-r--r--src/devices/bus/coleco/exp.h19
-rw-r--r--src/devices/bus/coleco/hand.cpp18
-rw-r--r--src/devices/bus/coleco/hand.h16
-rw-r--r--src/devices/bus/coleco/sac.cpp22
-rw-r--r--src/devices/bus/coleco/sac.h16
-rw-r--r--src/devices/bus/coleco/std.cpp4
-rw-r--r--src/devices/bus/coleco/std.h10
-rw-r--r--src/devices/bus/coleco/xin1.cpp4
-rw-r--r--src/devices/bus/coleco/xin1.h10
-rw-r--r--src/devices/bus/compis/graphics.cpp12
-rw-r--r--src/devices/bus/compis/graphics.h29
-rw-r--r--src/devices/bus/compis/hrg.cpp42
-rw-r--r--src/devices/bus/compis/hrg.h28
-rw-r--r--src/devices/bus/compucolor/floppy.cpp20
-rw-r--r--src/devices/bus/compucolor/floppy.h22
-rw-r--r--src/devices/bus/comx35/clm.cpp4
-rw-r--r--src/devices/bus/comx35/clm.h10
-rw-r--r--src/devices/bus/comx35/eprom.cpp4
-rw-r--r--src/devices/bus/comx35/eprom.h10
-rw-r--r--src/devices/bus/comx35/exp.cpp4
-rw-r--r--src/devices/bus/comx35/exp.h29
-rw-r--r--src/devices/bus/comx35/expbox.cpp4
-rw-r--r--src/devices/bus/comx35/expbox.h10
-rw-r--r--src/devices/bus/comx35/fdc.cpp4
-rw-r--r--src/devices/bus/comx35/fdc.h12
-rw-r--r--src/devices/bus/comx35/joycard.cpp4
-rw-r--r--src/devices/bus/comx35/joycard.h10
-rw-r--r--src/devices/bus/comx35/printer.cpp4
-rw-r--r--src/devices/bus/comx35/printer.h13
-rw-r--r--src/devices/bus/comx35/ram.cpp4
-rw-r--r--src/devices/bus/comx35/ram.h10
-rw-r--r--src/devices/bus/comx35/thermal.cpp4
-rw-r--r--src/devices/bus/comx35/thermal.h10
-rw-r--r--src/devices/bus/cpc/amdrum.cpp4
-rw-r--r--src/devices/bus/cpc/amdrum.h10
-rw-r--r--src/devices/bus/cpc/brunword4.cpp7
-rw-r--r--src/devices/bus/cpc/brunword4.h8
-rw-r--r--src/devices/bus/cpc/cpc_pds.cpp7
-rw-r--r--src/devices/bus/cpc/cpc_pds.h10
-rw-r--r--src/devices/bus/cpc/cpc_rom.cpp44
-rw-r--r--src/devices/bus/cpc/cpc_rom.h29
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp19
-rw-r--r--src/devices/bus/cpc/cpc_rs232.h29
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp8
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.h12
-rw-r--r--src/devices/bus/cpc/cpcexp.cpp23
-rw-r--r--src/devices/bus/cpc/cpcexp.h46
-rw-r--r--src/devices/bus/cpc/ddi1.cpp5
-rw-r--r--src/devices/bus/cpc/ddi1.h12
-rw-r--r--src/devices/bus/cpc/doubler.cpp5
-rw-r--r--src/devices/bus/cpc/doubler.h10
-rw-r--r--src/devices/bus/cpc/hd20.cpp5
-rw-r--r--src/devices/bus/cpc/hd20.h10
-rw-r--r--src/devices/bus/cpc/magicsound.cpp6
-rw-r--r--src/devices/bus/cpc/magicsound.h10
-rw-r--r--src/devices/bus/cpc/mface2.cpp8
-rw-r--r--src/devices/bus/cpc/mface2.h10
-rw-r--r--src/devices/bus/cpc/playcity.cpp7
-rw-r--r--src/devices/bus/cpc/playcity.h13
-rw-r--r--src/devices/bus/cpc/smartwatch.cpp5
-rw-r--r--src/devices/bus/cpc/smartwatch.h13
-rw-r--r--src/devices/bus/cpc/symbfac2.cpp10
-rw-r--r--src/devices/bus/cpc/symbfac2.h13
-rw-r--r--src/devices/bus/cpc/transtape.cpp8
-rw-r--r--src/devices/bus/cpc/transtape.h10
-rw-r--r--src/devices/bus/crvision/rom.cpp35
-rw-r--r--src/devices/bus/crvision/rom.h35
-rw-r--r--src/devices/bus/crvision/slot.cpp10
-rw-r--r--src/devices/bus/crvision/slot.h13
-rw-r--r--src/devices/bus/dmv/dmvbus.cpp16
-rw-r--r--src/devices/bus/dmv/dmvbus.h24
-rw-r--r--src/devices/bus/dmv/k210.cpp17
-rw-r--r--src/devices/bus/dmv/k210.h10
-rw-r--r--src/devices/bus/dmv/k220.cpp17
-rw-r--r--src/devices/bus/dmv/k220.h9
-rw-r--r--src/devices/bus/dmv/k230.cpp37
-rw-r--r--src/devices/bus/dmv/k230.h19
-rw-r--r--src/devices/bus/dmv/k233.cpp12
-rw-r--r--src/devices/bus/dmv/k233.h10
-rw-r--r--src/devices/bus/dmv/k801.cpp37
-rw-r--r--src/devices/bus/dmv/k801.h22
-rw-r--r--src/devices/bus/dmv/k803.cpp12
-rw-r--r--src/devices/bus/dmv/k803.h10
-rw-r--r--src/devices/bus/dmv/k806.cpp19
-rw-r--r--src/devices/bus/dmv/k806.h10
-rw-r--r--src/devices/bus/dmv/ram.cpp29
-rw-r--r--src/devices/bus/dmv/ram.h30
-rw-r--r--src/devices/bus/ecbbus/ecbbus.cpp14
-rw-r--r--src/devices/bus/ecbbus/ecbbus.h30
-rw-r--r--src/devices/bus/ecbbus/grip.cpp93
-rw-r--r--src/devices/bus/ecbbus/grip.h12
-rw-r--r--src/devices/bus/econet/e01.cpp198
-rw-r--r--src/devices/bus/econet/e01.h43
-rw-r--r--src/devices/bus/econet/econet.cpp17
-rw-r--r--src/devices/bus/econet/econet.h27
-rw-r--r--src/devices/bus/electron/exp.cpp6
-rw-r--r--src/devices/bus/electron/exp.h20
-rw-r--r--src/devices/bus/electron/fbjoy.cpp8
-rw-r--r--src/devices/bus/electron/fbjoy.h10
-rw-r--r--src/devices/bus/electron/m2105.cpp20
-rw-r--r--src/devices/bus/electron/m2105.h9
-rw-r--r--src/devices/bus/electron/plus3.cpp16
-rw-r--r--src/devices/bus/electron/plus3.h11
-rw-r--r--src/devices/bus/electron/pwrjoy.cpp10
-rw-r--r--src/devices/bus/electron/pwrjoy.h11
-rw-r--r--src/devices/bus/ep64/exdos.cpp6
-rw-r--r--src/devices/bus/ep64/exdos.h13
-rw-r--r--src/devices/bus/ep64/exp.cpp4
-rw-r--r--src/devices/bus/ep64/exp.h20
-rw-r--r--src/devices/bus/epson_sio/epson_sio.cpp11
-rw-r--r--src/devices/bus/epson_sio/epson_sio.h13
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp4
-rw-r--r--src/devices/bus/epson_sio/pf10.h12
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp4
-rw-r--r--src/devices/bus/epson_sio/tf20.h12
-rw-r--r--src/devices/bus/gameboy/gb_slot.cpp51
-rw-r--r--src/devices/bus/gameboy/gb_slot.h27
-rw-r--r--src/devices/bus/gameboy/mbc.cpp124
-rw-r--r--src/devices/bus/gameboy/mbc.h237
-rw-r--r--src/devices/bus/gameboy/rom.cpp44
-rw-r--r--src/devices/bus/gameboy/rom.h95
-rw-r--r--src/devices/bus/gamegear/ggext.cpp11
-rw-r--r--src/devices/bus/gamegear/ggext.h19
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp5
-rw-r--r--src/devices/bus/gamegear/smsctrladp.h10
-rw-r--r--src/devices/bus/gba/gba_slot.cpp469
-rw-r--r--src/devices/bus/gba/gba_slot.h476
-rw-r--r--src/devices/bus/gba/rom.cpp99
-rw-r--r--src/devices/bus/gba/rom.h160
-rw-r--r--src/devices/bus/generic/carts.cpp3
-rw-r--r--src/devices/bus/generic/carts.h12
-rw-r--r--src/devices/bus/generic/ram.cpp44
-rw-r--r--src/devices/bus/generic/ram.h48
-rw-r--r--src/devices/bus/generic/rom.cpp21
-rw-r--r--src/devices/bus/generic/rom.h27
-rw-r--r--src/devices/bus/generic/slot.cpp21
-rw-r--r--src/devices/bus/generic/slot.h26
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp87
-rw-r--r--src/devices/bus/hp9845_io/98034.h34
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp82
-rw-r--r--src/devices/bus/hp9845_io/98035.h39
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.cpp8
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.h18
-rw-r--r--src/devices/bus/hp_hil/hil_devices.h6
-rw-r--r--src/devices/bus/hp_hil/hlekbd.cpp10
-rw-r--r--src/devices/bus/hp_hil/hlekbd.h11
-rw-r--r--src/devices/bus/hp_hil/hp_hil.cpp8
-rw-r--r--src/devices/bus/hp_hil/hp_hil.h33
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.cpp13
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.h76
-rw-r--r--src/devices/bus/ieee488/c2031.cpp29
-rw-r--r--src/devices/bus/ieee488/c2031.h11
-rw-r--r--src/devices/bus/ieee488/c2040.cpp242
-rw-r--r--src/devices/bus/ieee488/c2040.h45
-rw-r--r--src/devices/bus/ieee488/c2040fdc.cpp74
-rw-r--r--src/devices/bus/ieee488/c2040fdc.h30
-rw-r--r--src/devices/bus/ieee488/c8050.cpp307
-rw-r--r--src/devices/bus/ieee488/c8050.h53
-rw-r--r--src/devices/bus/ieee488/c8050fdc.cpp80
-rw-r--r--src/devices/bus/ieee488/c8050fdc.h34
-rw-r--r--src/devices/bus/ieee488/c8280.cpp76
-rw-r--r--src/devices/bus/ieee488/c8280.h24
-rw-r--r--src/devices/bus/ieee488/d9060.cpp132
-rw-r--r--src/devices/bus/ieee488/d9060.h55
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp17
-rw-r--r--src/devices/bus/ieee488/hardbox.h13
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp4
-rw-r--r--src/devices/bus/ieee488/hp9895.h18
-rw-r--r--src/devices/bus/ieee488/ieee488.cpp38
-rw-r--r--src/devices/bus/ieee488/ieee488.h57
-rw-r--r--src/devices/bus/ieee488/shark.cpp8
-rw-r--r--src/devices/bus/ieee488/shark.h12
-rw-r--r--src/devices/bus/ieee488/softbox.cpp19
-rw-r--r--src/devices/bus/ieee488/softbox.h13
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp4
-rw-r--r--src/devices/bus/imi7000/imi5000h.h11
-rw-r--r--src/devices/bus/imi7000/imi7000.cpp15
-rw-r--r--src/devices/bus/imi7000/imi7000.h18
-rw-r--r--src/devices/bus/intv/ecs.cpp67
-rw-r--r--src/devices/bus/intv/ecs.h76
-rw-r--r--src/devices/bus/intv/rom.cpp23
-rw-r--r--src/devices/bus/intv/rom.h18
-rw-r--r--src/devices/bus/intv/slot.cpp11
-rw-r--r--src/devices/bus/intv/slot.h20
-rw-r--r--src/devices/bus/intv/voice.cpp21
-rw-r--r--src/devices/bus/intv/voice.h26
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.cpp7
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.h12
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.cpp18
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.h24
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.cpp16
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.h10
-rw-r--r--src/devices/bus/iq151/disc2.cpp10
-rw-r--r--src/devices/bus/iq151/disc2.h11
-rw-r--r--src/devices/bus/iq151/grafik.cpp10
-rw-r--r--src/devices/bus/iq151/grafik.h9
-rw-r--r--src/devices/bus/iq151/iq151.cpp21
-rw-r--r--src/devices/bus/iq151/iq151.h26
-rw-r--r--src/devices/bus/iq151/minigraf.cpp9
-rw-r--r--src/devices/bus/iq151/minigraf.h10
-rw-r--r--src/devices/bus/iq151/ms151a.cpp9
-rw-r--r--src/devices/bus/iq151/ms151a.h10
-rw-r--r--src/devices/bus/iq151/rom.cpp34
-rw-r--r--src/devices/bus/iq151/rom.h26
-rw-r--r--src/devices/bus/iq151/staper.cpp14
-rw-r--r--src/devices/bus/iq151/staper.h10
-rw-r--r--src/devices/bus/iq151/video32.cpp13
-rw-r--r--src/devices/bus/iq151/video32.h14
-rw-r--r--src/devices/bus/iq151/video64.cpp15
-rw-r--r--src/devices/bus/iq151/video64.h14
-rw-r--r--src/devices/bus/isa/3c503.cpp10
-rw-r--r--src/devices/bus/isa/3c503.h13
-rw-r--r--src/devices/bus/isa/3c505.cpp16
-rw-r--r--src/devices/bus/isa/3c505.h37
-rw-r--r--src/devices/bus/isa/adlib.cpp8
-rw-r--r--src/devices/bus/isa/adlib.h10
-rw-r--r--src/devices/bus/isa/aga.cpp71
-rw-r--r--src/devices/bus/isa/aga.h32
-rw-r--r--src/devices/bus/isa/aha1542.cpp4
-rw-r--r--src/devices/bus/isa/aha1542.h11
-rw-r--r--src/devices/bus/isa/cga.cpp72
-rw-r--r--src/devices/bus/isa/cga.h32
-rw-r--r--src/devices/bus/isa/com.cpp15
-rw-r--r--src/devices/bus/isa/com.h30
-rw-r--r--src/devices/bus/isa/dectalk.cpp4
-rw-r--r--src/devices/bus/isa/dectalk.h10
-rw-r--r--src/devices/bus/isa/ega.cpp18
-rw-r--r--src/devices/bus/isa/ega.h165
-rw-r--r--src/devices/bus/isa/fdc.cpp24
-rw-r--r--src/devices/bus/isa/fdc.h28
-rw-r--r--src/devices/bus/isa/finalchs.cpp9
-rw-r--r--src/devices/bus/isa/finalchs.h42
-rw-r--r--src/devices/bus/isa/gblaster.cpp12
-rw-r--r--src/devices/bus/isa/gblaster.h42
-rw-r--r--src/devices/bus/isa/gus.cpp29
-rw-r--r--src/devices/bus/isa/gus.h82
-rw-r--r--src/devices/bus/isa/hdc.cpp51
-rw-r--r--src/devices/bus/isa/hdc.h69
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp19
-rw-r--r--src/devices/bus/isa/ibm_mfc.h10
-rw-r--r--src/devices/bus/isa/ide.cpp10
-rw-r--r--src/devices/bus/isa/ide.h10
-rw-r--r--src/devices/bus/isa/isa.cpp110
-rw-r--r--src/devices/bus/isa/isa.h73
-rw-r--r--src/devices/bus/isa/isa_cards.cpp53
-rw-r--r--src/devices/bus/isa/isa_cards.h60
-rw-r--r--src/devices/bus/isa/lpt.cpp4
-rw-r--r--src/devices/bus/isa/lpt.h10
-rw-r--r--src/devices/bus/isa/mach32.cpp40
-rw-r--r--src/devices/bus/isa/mach32.h38
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp12
-rw-r--r--src/devices/bus/isa/mc1502_fdc.h15
-rw-r--r--src/devices/bus/isa/mc1502_rom.cpp4
-rw-r--r--src/devices/bus/isa/mc1502_rom.h10
-rw-r--r--src/devices/bus/isa/mcd.cpp6
-rw-r--r--src/devices/bus/isa/mcd.h12
-rw-r--r--src/devices/bus/isa/mda.cpp27
-rw-r--r--src/devices/bus/isa/mda.h18
-rw-r--r--src/devices/bus/isa/mpu401.cpp8
-rw-r--r--src/devices/bus/isa/mpu401.h32
-rw-r--r--src/devices/bus/isa/mufdc.cpp17
-rw-r--r--src/devices/bus/isa/mufdc.h27
-rw-r--r--src/devices/bus/isa/ne1000.cpp10
-rw-r--r--src/devices/bus/isa/ne1000.h10
-rw-r--r--src/devices/bus/isa/ne2000.cpp10
-rw-r--r--src/devices/bus/isa/ne2000.h10
-rw-r--r--src/devices/bus/isa/num9rev.cpp14
-rw-r--r--src/devices/bus/isa/num9rev.h10
-rw-r--r--src/devices/bus/isa/omti8621.cpp32
-rw-r--r--src/devices/bus/isa/omti8621.h23
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp8
-rw-r--r--src/devices/bus/isa/p1_fdc.h14
-rw-r--r--src/devices/bus/isa/p1_hdc.cpp4
-rw-r--r--src/devices/bus/isa/p1_hdc.h12
-rw-r--r--src/devices/bus/isa/p1_rom.cpp4
-rw-r--r--src/devices/bus/isa/p1_rom.h8
-rw-r--r--src/devices/bus/isa/p1_sound.cpp6
-rw-r--r--src/devices/bus/isa/p1_sound.h12
-rw-r--r--src/devices/bus/isa/pc1640_iga.cpp4
-rw-r--r--src/devices/bus/isa/pc1640_iga.h11
-rw-r--r--src/devices/bus/isa/pds.cpp8
-rw-r--r--src/devices/bus/isa/pds.h29
-rw-r--r--src/devices/bus/isa/pgc.cpp15
-rw-r--r--src/devices/bus/isa/pgc.h13
-rw-r--r--src/devices/bus/isa/s3virge.cpp20
-rw-r--r--src/devices/bus/isa/s3virge.h21
-rw-r--r--src/devices/bus/isa/sb16.cpp4
-rw-r--r--src/devices/bus/isa/sb16.h22
-rw-r--r--src/devices/bus/isa/sblaster.cpp36
-rw-r--r--src/devices/bus/isa/sblaster.h375
-rw-r--r--src/devices/bus/isa/sc499.cpp12
-rw-r--r--src/devices/bus/isa/sc499.h13
-rw-r--r--src/devices/bus/isa/side116.cpp4
-rw-r--r--src/devices/bus/isa/side116.h14
-rw-r--r--src/devices/bus/isa/ssi2001.cpp4
-rw-r--r--src/devices/bus/isa/ssi2001.h16
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp4
-rw-r--r--src/devices/bus/isa/stereo_fx.h17
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp14
-rw-r--r--src/devices/bus/isa/svga_cirrus.h52
-rw-r--r--src/devices/bus/isa/svga_s3.cpp28
-rw-r--r--src/devices/bus/isa/svga_s3.h98
-rw-r--r--src/devices/bus/isa/svga_trident.cpp7
-rw-r--r--src/devices/bus/isa/svga_trident.h28
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp7
-rw-r--r--src/devices/bus/isa/svga_tseng.h30
-rw-r--r--src/devices/bus/isa/trident.cpp12
-rw-r--r--src/devices/bus/isa/trident.h18
-rw-r--r--src/devices/bus/isa/vga.cpp6
-rw-r--r--src/devices/bus/isa/vga.h30
-rw-r--r--src/devices/bus/isa/vga_ati.cpp21
-rw-r--r--src/devices/bus/isa/vga_ati.h76
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.cpp6
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.h10
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp12
-rw-r--r--src/devices/bus/isa/wdxt_gen.h12
-rw-r--r--src/devices/bus/isa/xsu_cards.cpp22
-rw-r--r--src/devices/bus/isa/xsu_cards.h24
-rw-r--r--src/devices/bus/isa/xtide.cpp4
-rw-r--r--src/devices/bus/isa/xtide.h16
-rw-r--r--src/devices/bus/isbx/compis_fdc.cpp4
-rw-r--r--src/devices/bus/isbx/compis_fdc.h10
-rw-r--r--src/devices/bus/isbx/isbc_218a.cpp4
-rw-r--r--src/devices/bus/isbx/isbc_218a.h10
-rw-r--r--src/devices/bus/isbx/isbx.cpp4
-rw-r--r--src/devices/bus/isbx/isbx.h25
-rw-r--r--src/devices/bus/kc/d002.cpp21
-rw-r--r--src/devices/bus/kc/d002.h15
-rw-r--r--src/devices/bus/kc/d004.cpp35
-rw-r--r--src/devices/bus/kc/d004.h35
-rw-r--r--src/devices/bus/kc/kc.cpp27
-rw-r--r--src/devices/bus/kc/kc.h34
-rw-r--r--src/devices/bus/kc/ram.cpp34
-rw-r--r--src/devices/bus/kc/ram.h25
-rw-r--r--src/devices/bus/kc/rom.cpp27
-rw-r--r--src/devices/bus/kc/rom.h19
-rw-r--r--src/devices/bus/lpci/cirrus.cpp20
-rw-r--r--src/devices/bus/lpci/cirrus.h17
-rw-r--r--src/devices/bus/lpci/i82371ab.cpp6
-rw-r--r--src/devices/bus/lpci/i82371ab.h10
-rw-r--r--src/devices/bus/lpci/i82371sb.cpp6
-rw-r--r--src/devices/bus/lpci/i82371sb.h13
-rw-r--r--src/devices/bus/lpci/i82439tx.cpp10
-rw-r--r--src/devices/bus/lpci/i82439tx.h13
-rw-r--r--src/devices/bus/lpci/mpc105.cpp4
-rw-r--r--src/devices/bus/lpci/mpc105.h10
-rw-r--r--src/devices/bus/lpci/northbridge.cpp4
-rw-r--r--src/devices/bus/lpci/northbridge.h28
-rw-r--r--src/devices/bus/lpci/pci.cpp20
-rw-r--r--src/devices/bus/lpci/pci.h22
-rw-r--r--src/devices/bus/lpci/southbridge.cpp7
-rw-r--r--src/devices/bus/lpci/southbridge.h172
-rw-r--r--src/devices/bus/lpci/vt82c505.cpp6
-rw-r--r--src/devices/bus/lpci/vt82c505.h12
-rw-r--r--src/devices/bus/m5/rom.cpp15
-rw-r--r--src/devices/bus/m5/rom.h25
-rw-r--r--src/devices/bus/m5/slot.cpp10
-rw-r--r--src/devices/bus/m5/slot.h15
-rw-r--r--src/devices/bus/macpds/macpds.cpp25
-rw-r--r--src/devices/bus/macpds/macpds.h34
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.cpp19
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.h57
-rw-r--r--src/devices/bus/megadrive/eeprom.cpp70
-rw-r--r--src/devices/bus/megadrive/eeprom.h47
-rw-r--r--src/devices/bus/megadrive/ggenie.cpp11
-rw-r--r--src/devices/bus/megadrive/ggenie.h16
-rw-r--r--src/devices/bus/megadrive/jcart.cpp36
-rw-r--r--src/devices/bus/megadrive/jcart.h31
-rw-r--r--src/devices/bus/megadrive/md_carts.cpp9
-rw-r--r--src/devices/bus/megadrive/md_carts.h16
-rw-r--r--src/devices/bus/megadrive/md_slot.cpp24
-rw-r--r--src/devices/bus/megadrive/md_slot.h23
-rw-r--r--src/devices/bus/megadrive/rom.cpp194
-rw-r--r--src/devices/bus/megadrive/rom.h236
-rw-r--r--src/devices/bus/megadrive/sk.cpp14
-rw-r--r--src/devices/bus/megadrive/sk.h16
-rw-r--r--src/devices/bus/megadrive/stm95.cpp24
-rw-r--r--src/devices/bus/megadrive/stm95.h51
-rw-r--r--src/devices/bus/megadrive/svp.cpp24
-rw-r--r--src/devices/bus/megadrive/svp.h22
-rw-r--r--src/devices/bus/midi/midi.cpp4
-rw-r--r--src/devices/bus/midi/midi.h16
-rw-r--r--src/devices/bus/midi/midiinport.cpp4
-rw-r--r--src/devices/bus/midi/midiinport.h10
-rw-r--r--src/devices/bus/midi/midioutport.cpp4
-rw-r--r--src/devices/bus/midi/midioutport.h10
-rw-r--r--src/devices/bus/msx_cart/arc.cpp22
-rw-r--r--src/devices/bus/msx_cart/arc.h25
-rw-r--r--src/devices/bus/msx_cart/ascii.cpp104
-rw-r--r--src/devices/bus/msx_cart/ascii.h88
-rw-r--r--src/devices/bus/msx_cart/bm_012.cpp18
-rw-r--r--src/devices/bus/msx_cart/bm_012.h19
-rw-r--r--src/devices/bus/msx_cart/cartridge.h20
-rw-r--r--src/devices/bus/msx_cart/crossblaim.cpp22
-rw-r--r--src/devices/bus/msx_cart/crossblaim.h24
-rw-r--r--src/devices/bus/msx_cart/disk.cpp113
-rw-r--r--src/devices/bus/msx_cart/disk.h85
-rw-r--r--src/devices/bus/msx_cart/dooly.cpp18
-rw-r--r--src/devices/bus/msx_cart/dooly.h24
-rw-r--r--src/devices/bus/msx_cart/fmpac.cpp26
-rw-r--r--src/devices/bus/msx_cart/fmpac.h25
-rw-r--r--src/devices/bus/msx_cart/fs_sr022.cpp16
-rw-r--r--src/devices/bus/msx_cart/fs_sr022.h24
-rw-r--r--src/devices/bus/msx_cart/halnote.cpp31
-rw-r--r--src/devices/bus/msx_cart/halnote.h24
-rw-r--r--src/devices/bus/msx_cart/hfox.cpp26
-rw-r--r--src/devices/bus/msx_cart/hfox.h22
-rw-r--r--src/devices/bus/msx_cart/holy_quran.cpp30
-rw-r--r--src/devices/bus/msx_cart/holy_quran.h24
-rw-r--r--src/devices/bus/msx_cart/konami.cpp148
-rw-r--r--src/devices/bus/msx_cart/konami.h105
-rw-r--r--src/devices/bus/msx_cart/korean.cpp85
-rw-r--r--src/devices/bus/msx_cart/korean.h68
-rw-r--r--src/devices/bus/msx_cart/majutsushi.cpp22
-rw-r--r--src/devices/bus/msx_cart/majutsushi.h23
-rw-r--r--src/devices/bus/msx_cart/moonsound.cpp50
-rw-r--r--src/devices/bus/msx_cart/moonsound.h21
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp76
-rw-r--r--src/devices/bus/msx_cart/msx_audio.h47
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.cpp37
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.h27
-rw-r--r--src/devices/bus/msx_cart/msxdos2.cpp20
-rw-r--r--src/devices/bus/msx_cart/msxdos2.h24
-rw-r--r--src/devices/bus/msx_cart/nomapper.cpp12
-rw-r--r--src/devices/bus/msx_cart/nomapper.h15
-rw-r--r--src/devices/bus/msx_cart/rtype.cpp20
-rw-r--r--src/devices/bus/msx_cart/rtype.h24
-rw-r--r--src/devices/bus/msx_cart/super_swangi.cpp22
-rw-r--r--src/devices/bus/msx_cart/super_swangi.h24
-rw-r--r--src/devices/bus/msx_cart/superloderunner.cpp20
-rw-r--r--src/devices/bus/msx_cart/superloderunner.h22
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp44
-rw-r--r--src/devices/bus/msx_cart/yamaha.h31
-rw-r--r--src/devices/bus/msx_slot/bunsetsu.cpp4
-rw-r--r--src/devices/bus/msx_slot/bunsetsu.h16
-rw-r--r--src/devices/bus/msx_slot/cartridge.cpp17
-rw-r--r--src/devices/bus/msx_slot/cartridge.h28
-rw-r--r--src/devices/bus/msx_slot/disk.cpp38
-rw-r--r--src/devices/bus/msx_slot/disk.h68
-rw-r--r--src/devices/bus/msx_slot/fs4600.cpp11
-rw-r--r--src/devices/bus/msx_slot/fs4600.h17
-rw-r--r--src/devices/bus/msx_slot/music.cpp4
-rw-r--r--src/devices/bus/msx_slot/music.h15
-rw-r--r--src/devices/bus/msx_slot/panasonic08.cpp4
-rw-r--r--src/devices/bus/msx_slot/panasonic08.h22
-rw-r--r--src/devices/bus/msx_slot/ram.cpp4
-rw-r--r--src/devices/bus/msx_slot/ram.h13
-rw-r--r--src/devices/bus/msx_slot/ram_mm.cpp4
-rw-r--r--src/devices/bus/msx_slot/ram_mm.h16
-rw-r--r--src/devices/bus/msx_slot/rom.cpp8
-rw-r--r--src/devices/bus/msx_slot/rom.h16
-rw-r--r--src/devices/bus/msx_slot/slot.h8
-rw-r--r--src/devices/bus/msx_slot/sony08.cpp4
-rw-r--r--src/devices/bus/msx_slot/sony08.h12
-rw-r--r--src/devices/bus/nasbus/avc.cpp14
-rw-r--r--src/devices/bus/nasbus/avc.h10
-rw-r--r--src/devices/bus/nasbus/cards.cpp4
-rw-r--r--src/devices/bus/nasbus/cards.h11
-rw-r--r--src/devices/bus/nasbus/floppy.cpp10
-rw-r--r--src/devices/bus/nasbus/floppy.h12
-rw-r--r--src/devices/bus/nasbus/nasbus.cpp19
-rw-r--r--src/devices/bus/nasbus/nasbus.h45
-rw-r--r--src/devices/bus/neogeo/boot_cthd.cpp62
-rw-r--r--src/devices/bus/neogeo/boot_cthd.h60
-rw-r--r--src/devices/bus/neogeo/boot_kof10th.cpp31
-rw-r--r--src/devices/bus/neogeo/boot_kof10th.h28
-rw-r--r--src/devices/bus/neogeo/boot_kof2k2.cpp39
-rw-r--r--src/devices/bus/neogeo/boot_kof2k2.h32
-rw-r--r--src/devices/bus/neogeo/boot_kof2k3.cpp39
-rw-r--r--src/devices/bus/neogeo/boot_kof2k3.h32
-rw-r--r--src/devices/bus/neogeo/boot_misc.cpp143
-rw-r--r--src/devices/bus/neogeo/boot_misc.h108
-rw-r--r--src/devices/bus/neogeo/boot_svc.cpp49
-rw-r--r--src/devices/bus/neogeo/boot_svc.h38
-rw-r--r--src/devices/bus/neogeo/carts.h9
-rw-r--r--src/devices/bus/neogeo/cmc.cpp163
-rw-r--r--src/devices/bus/neogeo/cmc.h148
-rw-r--r--src/devices/bus/neogeo/fatfury2.cpp17
-rw-r--r--src/devices/bus/neogeo/fatfury2.h25
-rw-r--r--src/devices/bus/neogeo/kof2k2.cpp85
-rw-r--r--src/devices/bus/neogeo/kof2k2.h72
-rw-r--r--src/devices/bus/neogeo/kof98.cpp19
-rw-r--r--src/devices/bus/neogeo/kof98.h28
-rw-r--r--src/devices/bus/neogeo/mslugx.cpp17
-rw-r--r--src/devices/bus/neogeo/mslugx.h25
-rw-r--r--src/devices/bus/neogeo/pcm2.cpp70
-rw-r--r--src/devices/bus/neogeo/pcm2.h63
-rw-r--r--src/devices/bus/neogeo/prot_cmc.cpp4
-rw-r--r--src/devices/bus/neogeo/prot_cmc.h10
-rw-r--r--src/devices/bus/neogeo/prot_cthd.cpp7
-rw-r--r--src/devices/bus/neogeo/prot_cthd.h12
-rw-r--r--src/devices/bus/neogeo/prot_fatfury2.cpp4
-rw-r--r--src/devices/bus/neogeo/prot_fatfury2.h16
-rw-r--r--src/devices/bus/neogeo/prot_kof2k2.cpp4
-rw-r--r--src/devices/bus/neogeo/prot_kof2k2.h14
-rw-r--r--src/devices/bus/neogeo/prot_kof2k3bl.cpp7
-rw-r--r--src/devices/bus/neogeo/prot_kof2k3bl.h12
-rw-r--r--src/devices/bus/neogeo/prot_kof98.cpp7
-rw-r--r--src/devices/bus/neogeo/prot_kof98.h12
-rw-r--r--src/devices/bus/neogeo/prot_misc.cpp7
-rw-r--r--src/devices/bus/neogeo/prot_misc.h10
-rw-r--r--src/devices/bus/neogeo/prot_mslugx.cpp7
-rw-r--r--src/devices/bus/neogeo/prot_mslugx.h10
-rw-r--r--src/devices/bus/neogeo/prot_pcm2.cpp4
-rw-r--r--src/devices/bus/neogeo/prot_pcm2.h12
-rw-r--r--src/devices/bus/neogeo/prot_pvc.cpp7
-rw-r--r--src/devices/bus/neogeo/prot_pvc.h12
-rw-r--r--src/devices/bus/neogeo/prot_sma.cpp7
-rw-r--r--src/devices/bus/neogeo/prot_sma.h12
-rw-r--r--src/devices/bus/neogeo/pvc.cpp70
-rw-r--r--src/devices/bus/neogeo/pvc.h63
-rw-r--r--src/devices/bus/neogeo/rom.cpp30
-rw-r--r--src/devices/bus/neogeo/rom.h34
-rw-r--r--src/devices/bus/neogeo/sbp.cpp21
-rw-r--r--src/devices/bus/neogeo/sbp.h23
-rw-r--r--src/devices/bus/neogeo/slot.cpp10
-rw-r--r--src/devices/bus/neogeo/slot.h38
-rw-r--r--src/devices/bus/neogeo/sma.cpp90
-rw-r--r--src/devices/bus/neogeo/sma.h69
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.cpp15
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.h29
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.cpp14
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.h16
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.cpp14
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.h18
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.cpp20
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.h18
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.cpp18
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.h11
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.cpp16
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.h18
-rw-r--r--src/devices/bus/nes/2a03pur.cpp4
-rw-r--r--src/devices/bus/nes/2a03pur.h14
-rw-r--r--src/devices/bus/nes/act53.cpp8
-rw-r--r--src/devices/bus/nes/act53.h20
-rw-r--r--src/devices/bus/nes/aladdin.cpp47
-rw-r--r--src/devices/bus/nes/aladdin.h31
-rw-r--r--src/devices/bus/nes/ave.cpp14
-rw-r--r--src/devices/bus/nes/ave.h35
-rw-r--r--src/devices/bus/nes/bandai.cpp50
-rw-r--r--src/devices/bus/nes/bandai.h60
-rw-r--r--src/devices/bus/nes/benshieng.cpp8
-rw-r--r--src/devices/bus/nes/benshieng.h14
-rw-r--r--src/devices/bus/nes/bootleg.cpp118
-rw-r--r--src/devices/bus/nes/bootleg.h201
-rw-r--r--src/devices/bus/nes/camerica.cpp16
-rw-r--r--src/devices/bus/nes/camerica.h35
-rw-r--r--src/devices/bus/nes/cne.cpp12
-rw-r--r--src/devices/bus/nes/cne.h35
-rw-r--r--src/devices/bus/nes/cony.cpp34
-rw-r--r--src/devices/bus/nes/cony.h34
-rw-r--r--src/devices/bus/nes/datach.cpp49
-rw-r--r--src/devices/bus/nes/datach.h31
-rw-r--r--src/devices/bus/nes/discrete.cpp16
-rw-r--r--src/devices/bus/nes/discrete.h41
-rw-r--r--src/devices/bus/nes/disksys.cpp17
-rw-r--r--src/devices/bus/nes/disksys.h24
-rw-r--r--src/devices/bus/nes/event.cpp18
-rw-r--r--src/devices/bus/nes/event.h27
-rw-r--r--src/devices/bus/nes/ggenie.cpp10
-rw-r--r--src/devices/bus/nes/ggenie.h16
-rw-r--r--src/devices/bus/nes/henggedianzi.cpp14
-rw-r--r--src/devices/bus/nes/henggedianzi.h36
-rw-r--r--src/devices/bus/nes/hes.cpp4
-rw-r--r--src/devices/bus/nes/hes.h16
-rw-r--r--src/devices/bus/nes/hosenkan.cpp20
-rw-r--r--src/devices/bus/nes/hosenkan.h20
-rw-r--r--src/devices/bus/nes/irem.cpp24
-rw-r--r--src/devices/bus/nes/irem.h50
-rw-r--r--src/devices/bus/nes/jaleco.cpp86
-rw-r--r--src/devices/bus/nes/jaleco.h98
-rw-r--r--src/devices/bus/nes/jy.cpp28
-rw-r--r--src/devices/bus/nes/jy.h30
-rw-r--r--src/devices/bus/nes/kaiser.cpp52
-rw-r--r--src/devices/bus/nes/kaiser.h92
-rw-r--r--src/devices/bus/nes/karastudio.cpp32
-rw-r--r--src/devices/bus/nes/karastudio.h33
-rw-r--r--src/devices/bus/nes/konami.cpp38
-rw-r--r--src/devices/bus/nes/konami.h71
-rw-r--r--src/devices/bus/nes/legacy.cpp20
-rw-r--r--src/devices/bus/nes/legacy.h35
-rw-r--r--src/devices/bus/nes/mmc1.cpp24
-rw-r--r--src/devices/bus/nes/mmc1.h30
-rw-r--r--src/devices/bus/nes/mmc2.cpp19
-rw-r--r--src/devices/bus/nes/mmc2.h23
-rw-r--r--src/devices/bus/nes/mmc3.cpp41
-rw-r--r--src/devices/bus/nes/mmc3.h37
-rw-r--r--src/devices/bus/nes/mmc3_clones.cpp176
-rw-r--r--src/devices/bus/nes/mmc3_clones.h216
-rw-r--r--src/devices/bus/nes/mmc5.cpp16
-rw-r--r--src/devices/bus/nes/mmc5.h16
-rw-r--r--src/devices/bus/nes/multigame.cpp222
-rw-r--r--src/devices/bus/nes/multigame.h386
-rw-r--r--src/devices/bus/nes/namcot.cpp48
-rw-r--r--src/devices/bus/nes/namcot.h63
-rw-r--r--src/devices/bus/nes/nanjing.cpp12
-rw-r--r--src/devices/bus/nes/nanjing.h19
-rw-r--r--src/devices/bus/nes/nes_carts.cpp55
-rw-r--r--src/devices/bus/nes/nes_carts.h63
-rw-r--r--src/devices/bus/nes/nes_slot.cpp68
-rw-r--r--src/devices/bus/nes/nes_slot.h15
-rw-r--r--src/devices/bus/nes/ntdec.cpp12
-rw-r--r--src/devices/bus/nes/ntdec.h27
-rw-r--r--src/devices/bus/nes/nxrom.cpp62
-rw-r--r--src/devices/bus/nes/nxrom.h96
-rw-r--r--src/devices/bus/nes/pirate.cpp84
-rw-r--r--src/devices/bus/nes/pirate.h146
-rw-r--r--src/devices/bus/nes/pt554.cpp6
-rw-r--r--src/devices/bus/nes/pt554.h12
-rw-r--r--src/devices/bus/nes/racermate.cpp8
-rw-r--r--src/devices/bus/nes/racermate.h11
-rw-r--r--src/devices/bus/nes/rcm.cpp22
-rw-r--r--src/devices/bus/nes/rcm.h50
-rw-r--r--src/devices/bus/nes/rexsoft.cpp14
-rw-r--r--src/devices/bus/nes/rexsoft.h25
-rw-r--r--src/devices/bus/nes/sachen.cpp70
-rw-r--r--src/devices/bus/nes/sachen.h105
-rw-r--r--src/devices/bus/nes/somari.cpp16
-rw-r--r--src/devices/bus/nes/somari.h18
-rw-r--r--src/devices/bus/nes/subor.cpp20
-rw-r--r--src/devices/bus/nes/subor.h28
-rw-r--r--src/devices/bus/nes/sunsoft.cpp44
-rw-r--r--src/devices/bus/nes/sunsoft.h64
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.cpp29
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.h33
-rw-r--r--src/devices/bus/nes/taito.cpp30
-rw-r--r--src/devices/bus/nes/taito.h45
-rw-r--r--src/devices/bus/nes/tengen.cpp22
-rw-r--r--src/devices/bus/nes/tengen.h34
-rw-r--r--src/devices/bus/nes/txc.cpp24
-rw-r--r--src/devices/bus/nes/txc.h40
-rw-r--r--src/devices/bus/nes/waixing.cpp102
-rw-r--r--src/devices/bus/nes/waixing.h123
-rw-r--r--src/devices/bus/nes/zemina.cpp4
-rw-r--r--src/devices/bus/nes/zemina.h4
-rw-r--r--src/devices/bus/nes_ctrl/4score.cpp29
-rw-r--r--src/devices/bus/nes_ctrl/4score.h20
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.cpp28
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.h21
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.cpp11
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.h17
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.cpp9
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.h21
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.h12
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.h12
-rw-r--r--src/devices/bus/nes_ctrl/hori.cpp26
-rw-r--r--src/devices/bus/nes_ctrl/hori.h18
-rw-r--r--src/devices/bus/nes_ctrl/joypad.cpp34
-rw-r--r--src/devices/bus/nes_ctrl/joypad.h23
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.cpp12
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.h12
-rw-r--r--src/devices/bus/nes_ctrl/miracle.cpp14
-rw-r--r--src/devices/bus/nes_ctrl/miracle.h34
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.h12
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.cpp11
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.h12
-rw-r--r--src/devices/bus/nes_ctrl/partytap.cpp10
-rw-r--r--src/devices/bus/nes_ctrl/partytap.h12
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.cpp10
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.h10
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.cpp4
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.h13
-rw-r--r--src/devices/bus/nes_ctrl/zapper.cpp12
-rw-r--r--src/devices/bus/nes_ctrl/zapper.h11
-rw-r--r--src/devices/bus/newbrain/eim.cpp74
-rw-r--r--src/devices/bus/newbrain/eim.h20
-rw-r--r--src/devices/bus/newbrain/exp.cpp22
-rw-r--r--src/devices/bus/newbrain/exp.h34
-rw-r--r--src/devices/bus/newbrain/fdc.cpp40
-rw-r--r--src/devices/bus/newbrain/fdc.h21
-rw-r--r--src/devices/bus/nubus/nubus.cpp43
-rw-r--r--src/devices/bus/nubus/nubus.h50
-rw-r--r--src/devices/bus/nubus/nubus_48gc.cpp22
-rw-r--r--src/devices/bus/nubus/nubus_48gc.h58
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp16
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.h50
-rw-r--r--src/devices/bus/nubus/nubus_cb264.cpp12
-rw-r--r--src/devices/bus/nubus/nubus_cb264.h46
-rw-r--r--src/devices/bus/nubus/nubus_image.cpp52
-rw-r--r--src/devices/bus/nubus/nubus_image.h59
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.cpp19
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.h60
-rw-r--r--src/devices/bus/nubus/nubus_m2video.cpp19
-rw-r--r--src/devices/bus/nubus/nubus_m2video.h59
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.cpp19
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.h59
-rw-r--r--src/devices/bus/nubus/nubus_spec8.cpp20
-rw-r--r--src/devices/bus/nubus/nubus_spec8.h67
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.cpp23
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.h65
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.cpp12
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.h46
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.cpp19
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.h59
-rw-r--r--src/devices/bus/nubus/pds30_30hr.cpp19
-rw-r--r--src/devices/bus/nubus/pds30_30hr.h59
-rw-r--r--src/devices/bus/nubus/pds30_cb264.cpp19
-rw-r--r--src/devices/bus/nubus/pds30_cb264.h59
-rw-r--r--src/devices/bus/nubus/pds30_mc30.cpp19
-rw-r--r--src/devices/bus/nubus/pds30_mc30.h59
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.cpp19
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.h59
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.cpp19
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.h61
-rw-r--r--src/devices/bus/odyssey2/chess.cpp6
-rw-r--r--src/devices/bus/odyssey2/chess.h19
-rw-r--r--src/devices/bus/odyssey2/rom.cpp24
-rw-r--r--src/devices/bus/odyssey2/rom.h27
-rw-r--r--src/devices/bus/odyssey2/slot.cpp18
-rw-r--r--src/devices/bus/odyssey2/slot.h23
-rw-r--r--src/devices/bus/odyssey2/voice.cpp10
-rw-r--r--src/devices/bus/odyssey2/voice.h20
-rw-r--r--src/devices/bus/oricext/jasmin.cpp6
-rw-r--r--src/devices/bus/oricext/jasmin.h22
-rw-r--r--src/devices/bus/oricext/microdisc.cpp6
-rw-r--r--src/devices/bus/oricext/microdisc.h10
-rw-r--r--src/devices/bus/oricext/oricext.cpp8
-rw-r--r--src/devices/bus/oricext/oricext.h29
-rw-r--r--src/devices/bus/pc1512/mouse.cpp30
-rw-r--r--src/devices/bus/pc1512/mouse.h49
-rw-r--r--src/devices/bus/pc_joy/pc_joy.cpp8
-rw-r--r--src/devices/bus/pc_joy/pc_joy.h23
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.cpp4
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.h10
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp4
-rw-r--r--src/devices/bus/pc_kbd/ec1841.h15
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp4
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.h15
-rw-r--r--src/devices/bus/pc_kbd/keyboards.h8
-rw-r--r--src/devices/bus/pc_kbd/keytro.cpp15
-rw-r--r--src/devices/bus/pc_kbd/keytro.h11
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp87
-rw-r--r--src/devices/bus/pc_kbd/msnat.h32
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp4
-rw-r--r--src/devices/bus/pc_kbd/pc83.h11
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.cpp30
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.h23
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp16
-rw-r--r--src/devices/bus/pc_kbd/pcat84.h17
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp4
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.h16
-rw-r--r--src/devices/bus/pce/pce_rom.cpp25
-rw-r--r--src/devices/bus/pce/pce_rom.h40
-rw-r--r--src/devices/bus/pce/pce_slot.cpp12
-rw-r--r--src/devices/bus/pce/pce_slot.h22
-rw-r--r--src/devices/bus/pet/2joysnd.cpp4
-rw-r--r--src/devices/bus/pet/2joysnd.h20
-rw-r--r--src/devices/bus/pet/64k.cpp4
-rw-r--r--src/devices/bus/pet/64k.h14
-rw-r--r--src/devices/bus/pet/c2n.cpp31
-rw-r--r--src/devices/bus/pet/c2n.h19
-rw-r--r--src/devices/bus/pet/cass.cpp8
-rw-r--r--src/devices/bus/pet/cass.h32
-rw-r--r--src/devices/bus/pet/cb2snd.cpp4
-rw-r--r--src/devices/bus/pet/cb2snd.h14
-rw-r--r--src/devices/bus/pet/diag.cpp8
-rw-r--r--src/devices/bus/pet/diag.h18
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.cpp13
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.h11
-rw-r--r--src/devices/bus/pet/exp.cpp4
-rw-r--r--src/devices/bus/pet/exp.h15
-rw-r--r--src/devices/bus/pet/hsg.cpp42
-rw-r--r--src/devices/bus/pet/hsg.h37
-rw-r--r--src/devices/bus/pet/petuja.cpp4
-rw-r--r--src/devices/bus/pet/petuja.h10
-rw-r--r--src/devices/bus/pet/superpet.cpp4
-rw-r--r--src/devices/bus/pet/superpet.h10
-rw-r--r--src/devices/bus/pet/user.cpp4
-rw-r--r--src/devices/bus/pet/user.h51
-rw-r--r--src/devices/bus/plus4/c1551.cpp107
-rw-r--r--src/devices/bus/plus4/c1551.h18
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.cpp6
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.h13
-rw-r--r--src/devices/bus/plus4/exp.cpp36
-rw-r--r--src/devices/bus/plus4/exp.h27
-rw-r--r--src/devices/bus/plus4/sid.cpp4
-rw-r--r--src/devices/bus/plus4/sid.h10
-rw-r--r--src/devices/bus/plus4/std.cpp4
-rw-r--r--src/devices/bus/plus4/std.h13
-rw-r--r--src/devices/bus/plus4/user.h8
-rw-r--r--src/devices/bus/pofo/ccm.cpp16
-rw-r--r--src/devices/bus/pofo/ccm.h33
-rw-r--r--src/devices/bus/pofo/exp.cpp22
-rw-r--r--src/devices/bus/pofo/exp.h48
-rw-r--r--src/devices/bus/pofo/hpc101.cpp18
-rw-r--r--src/devices/bus/pofo/hpc101.h19
-rw-r--r--src/devices/bus/pofo/hpc102.cpp20
-rw-r--r--src/devices/bus/pofo/hpc102.h23
-rw-r--r--src/devices/bus/pofo/hpc104.cpp48
-rw-r--r--src/devices/bus/pofo/hpc104.h33
-rw-r--r--src/devices/bus/pofo/ram.cpp14
-rw-r--r--src/devices/bus/pofo/ram.h18
-rw-r--r--src/devices/bus/pofo/rom.cpp12
-rw-r--r--src/devices/bus/pofo/rom.h18
-rw-r--r--src/devices/bus/psx/analogue.cpp44
-rw-r--r--src/devices/bus/psx/analogue.h23
-rw-r--r--src/devices/bus/psx/ctlrport.cpp35
-rw-r--r--src/devices/bus/psx/ctlrport.h22
-rw-r--r--src/devices/bus/psx/memcard.cpp8
-rw-r--r--src/devices/bus/psx/memcard.h42
-rw-r--r--src/devices/bus/psx/multitap.cpp4
-rw-r--r--src/devices/bus/psx/multitap.h7
-rw-r--r--src/devices/bus/ql/cst_q_plus4.cpp26
-rw-r--r--src/devices/bus/ql/cst_q_plus4.h28
-rw-r--r--src/devices/bus/ql/cst_qdisc.cpp16
-rw-r--r--src/devices/bus/ql/cst_qdisc.h17
-rw-r--r--src/devices/bus/ql/cumana_fdi.cpp16
-rw-r--r--src/devices/bus/ql/cumana_fdi.h18
-rw-r--r--src/devices/bus/ql/exp.cpp12
-rw-r--r--src/devices/bus/ql/exp.h41
-rw-r--r--src/devices/bus/ql/kempston_di.cpp16
-rw-r--r--src/devices/bus/ql/kempston_di.h19
-rw-r--r--src/devices/bus/ql/miracle_gold_card.cpp16
-rw-r--r--src/devices/bus/ql/miracle_gold_card.h19
-rw-r--r--src/devices/bus/ql/miracle_hd.cpp16
-rw-r--r--src/devices/bus/ql/miracle_hd.h19
-rw-r--r--src/devices/bus/ql/mp_fdi.cpp16
-rw-r--r--src/devices/bus/ql/mp_fdi.h21
-rw-r--r--src/devices/bus/ql/opd_basic_master.cpp16
-rw-r--r--src/devices/bus/ql/opd_basic_master.h20
-rw-r--r--src/devices/bus/ql/pcml_qdisk.cpp16
-rw-r--r--src/devices/bus/ql/pcml_qdisk.h20
-rw-r--r--src/devices/bus/ql/qubide.cpp22
-rw-r--r--src/devices/bus/ql/qubide.h19
-rw-r--r--src/devices/bus/ql/rom.cpp16
-rw-r--r--src/devices/bus/ql/rom.h27
-rw-r--r--src/devices/bus/ql/sandy_superdisk.cpp32
-rw-r--r--src/devices/bus/ql/sandy_superdisk.h17
-rw-r--r--src/devices/bus/ql/sandy_superqboard.cpp85
-rw-r--r--src/devices/bus/ql/sandy_superqboard.h48
-rw-r--r--src/devices/bus/ql/std.cpp12
-rw-r--r--src/devices/bus/ql/std.h18
-rw-r--r--src/devices/bus/ql/trumpcard.cpp64
-rw-r--r--src/devices/bus/ql/trumpcard.h49
-rw-r--r--src/devices/bus/rs232/ie15.cpp5
-rw-r--r--src/devices/bus/rs232/ie15.h4
-rw-r--r--src/devices/bus/rs232/keyboard.cpp8
-rw-r--r--src/devices/bus/rs232/keyboard.h7
-rw-r--r--src/devices/bus/rs232/loopback.cpp6
-rw-r--r--src/devices/bus/rs232/loopback.h8
-rw-r--r--src/devices/bus/rs232/null_modem.cpp4
-rw-r--r--src/devices/bus/rs232/null_modem.h12
-rw-r--r--src/devices/bus/rs232/printer.cpp4
-rw-r--r--src/devices/bus/rs232/printer.h8
-rw-r--r--src/devices/bus/rs232/pty.cpp156
-rw-r--r--src/devices/bus/rs232/pty.h61
-rw-r--r--src/devices/bus/rs232/rs232.cpp20
-rw-r--r--src/devices/bus/rs232/rs232.h36
-rw-r--r--src/devices/bus/rs232/ser_mouse.cpp12
-rw-r--r--src/devices/bus/rs232/ser_mouse.h20
-rw-r--r--src/devices/bus/rs232/sun_kbd.cpp4
-rw-r--r--src/devices/bus/rs232/sun_kbd.h8
-rw-r--r--src/devices/bus/rs232/terminal.cpp4
-rw-r--r--src/devices/bus/rs232/terminal.h2
-rw-r--r--src/devices/bus/rs232/xvd701.cpp4
-rw-r--r--src/devices/bus/rs232/xvd701.h10
-rw-r--r--src/devices/bus/s100/dj2db.cpp4
-rw-r--r--src/devices/bus/s100/dj2db.h13
-rw-r--r--src/devices/bus/s100/djdma.cpp4
-rw-r--r--src/devices/bus/s100/djdma.h11
-rw-r--r--src/devices/bus/s100/mm65k16s.cpp4
-rw-r--r--src/devices/bus/s100/mm65k16s.h11
-rw-r--r--src/devices/bus/s100/nsmdsa.cpp4
-rw-r--r--src/devices/bus/s100/nsmdsa.h12
-rw-r--r--src/devices/bus/s100/nsmdsad.cpp4
-rw-r--r--src/devices/bus/s100/nsmdsad.h12
-rw-r--r--src/devices/bus/s100/s100.cpp41
-rw-r--r--src/devices/bus/s100/s100.h150
-rw-r--r--src/devices/bus/s100/wunderbus.cpp4
-rw-r--r--src/devices/bus/s100/wunderbus.h11
-rw-r--r--src/devices/bus/sat_ctrl/analog.cpp14
-rw-r--r--src/devices/bus/sat_ctrl/analog.h11
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.cpp7
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.h21
-rw-r--r--src/devices/bus/sat_ctrl/joy.cpp8
-rw-r--r--src/devices/bus/sat_ctrl/joy.h11
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.cpp16
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.h20
-rw-r--r--src/devices/bus/sat_ctrl/keybd.cpp14
-rw-r--r--src/devices/bus/sat_ctrl/keybd.h11
-rw-r--r--src/devices/bus/sat_ctrl/mouse.cpp12
-rw-r--r--src/devices/bus/sat_ctrl/mouse.h11
-rw-r--r--src/devices/bus/sat_ctrl/multitap.cpp4
-rw-r--r--src/devices/bus/sat_ctrl/multitap.h11
-rw-r--r--src/devices/bus/sat_ctrl/pointer.cpp12
-rw-r--r--src/devices/bus/sat_ctrl/pointer.h11
-rw-r--r--src/devices/bus/sat_ctrl/racing.cpp10
-rw-r--r--src/devices/bus/sat_ctrl/racing.h11
-rw-r--r--src/devices/bus/sat_ctrl/segatap.cpp4
-rw-r--r--src/devices/bus/sat_ctrl/segatap.h11
-rw-r--r--src/devices/bus/saturn/bram.cpp28
-rw-r--r--src/devices/bus/saturn/bram.h25
-rw-r--r--src/devices/bus/saturn/dram.cpp16
-rw-r--r--src/devices/bus/saturn/dram.h25
-rw-r--r--src/devices/bus/saturn/rom.cpp12
-rw-r--r--src/devices/bus/saturn/rom.h23
-rw-r--r--src/devices/bus/saturn/sat_slot.cpp17
-rw-r--r--src/devices/bus/saturn/sat_slot.h31
-rw-r--r--src/devices/bus/scsi/acb4070.cpp4
-rw-r--r--src/devices/bus/scsi/acb4070.h10
-rw-r--r--src/devices/bus/scsi/cdu76s.cpp4
-rw-r--r--src/devices/bus/scsi/cdu76s.h10
-rw-r--r--src/devices/bus/scsi/d9060hd.cpp4
-rw-r--r--src/devices/bus/scsi/d9060hd.h10
-rw-r--r--src/devices/bus/scsi/omti5100.cpp8
-rw-r--r--src/devices/bus/scsi/omti5100.h10
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.cpp4
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.h10
-rw-r--r--src/devices/bus/scsi/s1410.cpp4
-rw-r--r--src/devices/bus/scsi/s1410.h12
-rw-r--r--src/devices/bus/scsi/sa1403d.cpp4
-rw-r--r--src/devices/bus/scsi/sa1403d.h10
-rw-r--r--src/devices/bus/scsi/scsi.cpp94
-rw-r--r--src/devices/bus/scsi/scsi.h154
-rw-r--r--src/devices/bus/scsi/scsicd.cpp8
-rw-r--r--src/devices/bus/scsi/scsicd.h13
-rw-r--r--src/devices/bus/scsi/scsihd.cpp8
-rw-r--r--src/devices/bus/scsi/scsihd.h15
-rw-r--r--src/devices/bus/scsi/scsihle.cpp4
-rw-r--r--src/devices/bus/scsi/scsihle.h13
-rw-r--r--src/devices/bus/scv/rom.cpp42
-rw-r--r--src/devices/bus/scv/rom.h66
-rw-r--r--src/devices/bus/scv/slot.cpp10
-rw-r--r--src/devices/bus/scv/slot.h23
-rw-r--r--src/devices/bus/sega8/ccatch.cpp5
-rw-r--r--src/devices/bus/sega8/ccatch.h13
-rw-r--r--src/devices/bus/sega8/mgear.cpp5
-rw-r--r--src/devices/bus/sega8/mgear.h13
-rw-r--r--src/devices/bus/sega8/rom.cpp126
-rw-r--r--src/devices/bus/sega8/rom.h131
-rw-r--r--src/devices/bus/sega8/sega8_slot.cpp58
-rw-r--r--src/devices/bus/sega8/sega8_slot.h38
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp4
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.h11
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.cpp8
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.h24
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp4
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.h10
-rw-r--r--src/devices/bus/sms_ctrl/graphic.cpp6
-rw-r--r--src/devices/bus/sms_ctrl/graphic.h10
-rw-r--r--src/devices/bus/sms_ctrl/joypad.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/joypad.h10
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.h10
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp9
-rw-r--r--src/devices/bus/sms_ctrl/multitap.h10
-rw-r--r--src/devices/bus/sms_ctrl/paddle.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/paddle.h8
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp6
-rw-r--r--src/devices/bus/sms_ctrl/rfu.h10
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.cpp12
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.h25
-rw-r--r--src/devices/bus/sms_ctrl/sports.cpp7
-rw-r--r--src/devices/bus/sms_ctrl/sports.h10
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.h10
-rw-r--r--src/devices/bus/sms_exp/gender.cpp12
-rw-r--r--src/devices/bus/sms_exp/gender.h11
-rw-r--r--src/devices/bus/sms_exp/smsexp.cpp63
-rw-r--r--src/devices/bus/sms_exp/smsexp.h71
-rw-r--r--src/devices/bus/snes/bsx.cpp69
-rw-r--r--src/devices/bus/snes/bsx.h96
-rw-r--r--src/devices/bus/snes/event.cpp20
-rw-r--r--src/devices/bus/snes/event.h27
-rw-r--r--src/devices/bus/snes/rom.cpp58
-rw-r--r--src/devices/bus/snes/rom.h113
-rw-r--r--src/devices/bus/snes/rom21.cpp16
-rw-r--r--src/devices/bus/snes/rom21.h33
-rw-r--r--src/devices/bus/snes/sa1.cpp19
-rw-r--r--src/devices/bus/snes/sa1.h19
-rw-r--r--src/devices/bus/snes/sdd1.cpp46
-rw-r--r--src/devices/bus/snes/sdd1.h269
-rw-r--r--src/devices/bus/snes/sfx.cpp6
-rw-r--r--src/devices/bus/snes/sfx.h19
-rw-r--r--src/devices/bus/snes/sgb.cpp12
-rw-r--r--src/devices/bus/snes/sgb.h26
-rw-r--r--src/devices/bus/snes/snes_carts.cpp13
-rw-r--r--src/devices/bus/snes/snes_carts.h20
-rw-r--r--src/devices/bus/snes/snes_slot.cpp33
-rw-r--r--src/devices/bus/snes/snes_slot.h50
-rw-r--r--src/devices/bus/snes/spc7110.cpp101
-rw-r--r--src/devices/bus/snes/spc7110.h167
-rw-r--r--src/devices/bus/snes/sufami.cpp12
-rw-r--r--src/devices/bus/snes/sufami.h25
-rw-r--r--src/devices/bus/snes/upd.cpp65
-rw-r--r--src/devices/bus/snes/upd.h74
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.cpp11
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.h14
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.cpp7
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.h29
-rw-r--r--src/devices/bus/snes_ctrl/joypad.cpp9
-rw-r--r--src/devices/bus/snes_ctrl/joypad.h9
-rw-r--r--src/devices/bus/snes_ctrl/miracle.cpp14
-rw-r--r--src/devices/bus/snes_ctrl/miracle.h37
-rw-r--r--src/devices/bus/snes_ctrl/mouse.cpp16
-rw-r--r--src/devices/bus/snes_ctrl/mouse.h11
-rw-r--r--src/devices/bus/snes_ctrl/multitap.cpp4
-rw-r--r--src/devices/bus/snes_ctrl/multitap.h11
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.cpp11
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.h11
-rw-r--r--src/devices/bus/snes_ctrl/sscope.cpp20
-rw-r--r--src/devices/bus/snes_ctrl/sscope.h11
-rw-r--r--src/devices/bus/snes_ctrl/twintap.cpp9
-rw-r--r--src/devices/bus/snes_ctrl/twintap.h9
-rw-r--r--src/devices/bus/spc1000/exp.cpp7
-rw-r--r--src/devices/bus/spc1000/exp.h27
-rw-r--r--src/devices/bus/spc1000/fdd.cpp17
-rw-r--r--src/devices/bus/spc1000/fdd.h19
-rw-r--r--src/devices/bus/spc1000/vdp.cpp8
-rw-r--r--src/devices/bus/spc1000/vdp.h13
-rw-r--r--src/devices/bus/sunkbd/hlekbd.cpp62
-rw-r--r--src/devices/bus/sunkbd/hlekbd.h26
-rw-r--r--src/devices/bus/sunkbd/sunkbd.cpp11
-rw-r--r--src/devices/bus/sunkbd/sunkbd.h10
-rw-r--r--src/devices/bus/svi3x8/expander/expander.cpp4
-rw-r--r--src/devices/bus/svi3x8/expander/expander.h55
-rw-r--r--src/devices/bus/svi3x8/expander/modules.cpp4
-rw-r--r--src/devices/bus/svi3x8/expander/modules.h12
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.cpp4
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.h10
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.cpp4
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.h10
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.cpp4
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.h10
-rw-r--r--src/devices/bus/svi3x8/slot/cards.cpp8
-rw-r--r--src/devices/bus/svi3x8/slot/cards.h15
-rw-r--r--src/devices/bus/svi3x8/slot/slot.cpp12
-rw-r--r--src/devices/bus/svi3x8/slot/slot.h56
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.h12
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.h10
-rw-r--r--src/devices/bus/svi3x8/slot/sv803.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv803.h10
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.h10
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.h10
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.h10
-rw-r--r--src/devices/bus/ti8x/bitsocket.cpp4
-rw-r--r--src/devices/bus/ti8x/bitsocket.h12
-rw-r--r--src/devices/bus/ti8x/graphlinkhle.cpp4
-rw-r--r--src/devices/bus/ti8x/graphlinkhle.h14
-rw-r--r--src/devices/bus/ti8x/teeconn.cpp4
-rw-r--r--src/devices/bus/ti8x/teeconn.h6
-rw-r--r--src/devices/bus/ti8x/ti8x.cpp11
-rw-r--r--src/devices/bus/ti8x/ti8x.h7
-rw-r--r--src/devices/bus/ti8x/tispeaker.cpp8
-rw-r--r--src/devices/bus/ti8x/tispeaker.h8
-rw-r--r--src/devices/bus/ti99/colorbus/busmouse.cpp (renamed from src/devices/bus/ti99x/busmouse.cpp)23
-rw-r--r--src/devices/bus/ti99/colorbus/busmouse.h (renamed from src/devices/bus/ti99x/busmouse.h)20
-rw-r--r--src/devices/bus/ti99/colorbus/colorbus.cpp (renamed from src/devices/bus/ti99x/colorbus.cpp)24
-rw-r--r--src/devices/bus/ti99/colorbus/colorbus.h (renamed from src/devices/bus/ti99x/colorbus.h)38
-rw-r--r--src/devices/bus/ti99/joyport/handset.cpp (renamed from src/devices/bus/ti99x/handset.cpp)26
-rw-r--r--src/devices/bus/ti99/joyport/handset.h (renamed from src/devices/bus/ti99x/handset.h)28
-rw-r--r--src/devices/bus/ti99/joyport/joyport.cpp (renamed from src/devices/bus/ti99x/joyport.cpp)36
-rw-r--r--src/devices/bus/ti99/joyport/joyport.h87
-rw-r--r--src/devices/bus/ti99/joyport/mecmouse.cpp (renamed from src/devices/bus/ti99x/mecmouse.cpp)18
-rw-r--r--src/devices/bus/ti99/joyport/mecmouse.h (renamed from src/devices/bus/ti99x/mecmouse.h)17
-rw-r--r--src/devices/bus/ti99/peb/bwg.cpp (renamed from src/devices/bus/ti99_peb/bwg.cpp)8
-rw-r--r--src/devices/bus/ti99/peb/bwg.h (renamed from src/devices/bus/ti99_peb/bwg.h)21
-rw-r--r--src/devices/bus/ti99/peb/evpc.cpp (renamed from src/devices/bus/ti99_peb/evpc.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/evpc.h (renamed from src/devices/bus/ti99_peb/evpc.h)38
-rw-r--r--src/devices/bus/ti99/peb/hfdc.cpp (renamed from src/devices/bus/ti99_peb/hfdc.cpp)35
-rw-r--r--src/devices/bus/ti99/peb/hfdc.h (renamed from src/devices/bus/ti99_peb/hfdc.h)11
-rw-r--r--src/devices/bus/ti99/peb/horizon.cpp (renamed from src/devices/bus/ti99_peb/horizon.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/horizon.h (renamed from src/devices/bus/ti99_peb/horizon.h)10
-rw-r--r--src/devices/bus/ti99/peb/hsgpl.cpp (renamed from src/devices/bus/ti99_peb/hsgpl.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/hsgpl.h (renamed from src/devices/bus/ti99_peb/hsgpl.h)16
-rw-r--r--src/devices/bus/ti99/peb/memex.cpp (renamed from src/devices/bus/ti99_peb/memex.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/memex.h (renamed from src/devices/bus/ti99_peb/memex.h)14
-rw-r--r--src/devices/bus/ti99/peb/myarcmem.cpp (renamed from src/devices/bus/ti99_peb/myarcmem.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/myarcmem.h (renamed from src/devices/bus/ti99_peb/myarcmem.h)16
-rw-r--r--src/devices/bus/ti99/peb/pcode.cpp (renamed from src/devices/bus/ti99_peb/pcode.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/pcode.h (renamed from src/devices/bus/ti99_peb/pcode.h)10
-rw-r--r--src/devices/bus/ti99/peb/peribox.cpp (renamed from src/devices/bus/ti99_peb/peribox.cpp)43
-rw-r--r--src/devices/bus/ti99/peb/peribox.h (renamed from src/devices/bus/ti99_peb/peribox.h)67
-rw-r--r--src/devices/bus/ti99/peb/samsmem.cpp (renamed from src/devices/bus/ti99_peb/samsmem.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/samsmem.h (renamed from src/devices/bus/ti99_peb/samsmem.h)15
-rw-r--r--src/devices/bus/ti99/peb/spchsyn.cpp (renamed from src/devices/bus/ti99_peb/spchsyn.cpp)7
-rw-r--r--src/devices/bus/ti99/peb/spchsyn.h (renamed from src/devices/bus/ti99_peb/spchsyn.h)16
-rw-r--r--src/devices/bus/ti99/peb/ti_32kmem.cpp (renamed from src/devices/bus/ti99_peb/ti_32kmem.cpp)7
-rw-r--r--src/devices/bus/ti99/peb/ti_32kmem.h (renamed from src/devices/bus/ti99_peb/ti_32kmem.h)14
-rw-r--r--src/devices/bus/ti99/peb/ti_fdc.cpp (renamed from src/devices/bus/ti99_peb/ti_fdc.cpp)40
-rw-r--r--src/devices/bus/ti99/peb/ti_fdc.h (renamed from src/devices/bus/ti99_peb/ti_fdc.h)14
-rw-r--r--src/devices/bus/ti99/peb/ti_rs232.cpp (renamed from src/devices/bus/ti99_peb/ti_rs232.cpp)136
-rw-r--r--src/devices/bus/ti99/peb/ti_rs232.h (renamed from src/devices/bus/ti99_peb/ti_rs232.h)28
-rw-r--r--src/devices/bus/ti99/peb/tn_ide.cpp (renamed from src/devices/bus/ti99_peb/tn_ide.cpp)6
-rw-r--r--src/devices/bus/ti99/peb/tn_ide.h (renamed from src/devices/bus/ti99_peb/tn_ide.h)17
-rw-r--r--src/devices/bus/ti99/peb/tn_usbsm.cpp (renamed from src/devices/bus/ti99_peb/tn_usbsm.cpp)4
-rw-r--r--src/devices/bus/ti99/peb/tn_usbsm.h (renamed from src/devices/bus/ti99_peb/tn_usbsm.h)14
-rw-r--r--src/devices/bus/ti99x/990_dk.cpp19
-rw-r--r--src/devices/bus/ti99x/990_dk.h35
-rw-r--r--src/devices/bus/ti99x/990_hd.cpp7
-rw-r--r--src/devices/bus/ti99x/990_hd.h22
-rw-r--r--src/devices/bus/ti99x/990_tap.cpp12
-rw-r--r--src/devices/bus/ti99x/990_tap.h29
-rw-r--r--src/devices/bus/ti99x/998board.cpp58
-rw-r--r--src/devices/bus/ti99x/998board.h157
-rw-r--r--src/devices/bus/ti99x/datamux.cpp7
-rw-r--r--src/devices/bus/ti99x/datamux.h18
-rw-r--r--src/devices/bus/ti99x/genboard.cpp16
-rw-r--r--src/devices/bus/ti99x/genboard.h32
-rw-r--r--src/devices/bus/ti99x/gromport.cpp342
-rw-r--r--src/devices/bus/ti99x/gromport.h222
-rw-r--r--src/devices/bus/ti99x/joyport.h89
-rw-r--r--src/devices/bus/ti99x/ti99defs.cpp4
-rw-r--r--src/devices/bus/ti99x/ti99defs.h39
-rw-r--r--src/devices/bus/tiki100/8088.cpp30
-rw-r--r--src/devices/bus/tiki100/8088.h17
-rw-r--r--src/devices/bus/tiki100/exp.cpp36
-rw-r--r--src/devices/bus/tiki100/exp.h83
-rw-r--r--src/devices/bus/tiki100/hdc.cpp18
-rw-r--r--src/devices/bus/tiki100/hdc.h18
-rw-r--r--src/devices/bus/tvc/hbf.cpp10
-rw-r--r--src/devices/bus/tvc/hbf.h12
-rw-r--r--src/devices/bus/tvc/tvc.cpp11
-rw-r--r--src/devices/bus/tvc/tvc.h33
-rw-r--r--src/devices/bus/vboy/rom.cpp14
-rw-r--r--src/devices/bus/vboy/rom.h25
-rw-r--r--src/devices/bus/vboy/slot.cpp11
-rw-r--r--src/devices/bus/vboy/slot.h26
-rw-r--r--src/devices/bus/vc4000/rom.cpp22
-rw-r--r--src/devices/bus/vc4000/rom.h29
-rw-r--r--src/devices/bus/vc4000/slot.cpp15
-rw-r--r--src/devices/bus/vc4000/slot.h20
-rw-r--r--src/devices/bus/vcs/compumat.cpp4
-rw-r--r--src/devices/bus/vcs/compumat.h10
-rw-r--r--src/devices/bus/vcs/dpc.cpp9
-rw-r--r--src/devices/bus/vcs/dpc.h57
-rw-r--r--src/devices/bus/vcs/harmony_melody.cpp7
-rw-r--r--src/devices/bus/vcs/harmony_melody.h20
-rwxr-xr-xsrc/devices/bus/vcs/rom.cpp117
-rwxr-xr-xsrc/devices/bus/vcs/rom.h162
-rw-r--r--src/devices/bus/vcs/scharger.cpp8
-rw-r--r--src/devices/bus/vcs/scharger.h21
-rw-r--r--src/devices/bus/vcs/vcs_slot.cpp8
-rwxr-xr-xsrc/devices/bus/vcs/vcs_slot.h23
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.h15
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.h11
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.h10
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.cpp7
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.h11
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.h11
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.h11
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.h11
-rw-r--r--src/devices/bus/vectrex/rom.cpp20
-rw-r--r--src/devices/bus/vectrex/rom.h36
-rw-r--r--src/devices/bus/vectrex/slot.cpp13
-rw-r--r--src/devices/bus/vectrex/slot.h25
-rw-r--r--src/devices/bus/vic10/exp.cpp17
-rw-r--r--src/devices/bus/vic10/exp.h35
-rw-r--r--src/devices/bus/vic10/std.cpp5
-rw-r--r--src/devices/bus/vic10/std.h11
-rw-r--r--src/devices/bus/vic20/4cga.cpp4
-rw-r--r--src/devices/bus/vic20/4cga.h10
-rw-r--r--src/devices/bus/vic20/exp.cpp15
-rw-r--r--src/devices/bus/vic20/exp.h20
-rw-r--r--src/devices/bus/vic20/fe3.cpp26
-rw-r--r--src/devices/bus/vic20/fe3.h18
-rw-r--r--src/devices/bus/vic20/megacart.cpp10
-rw-r--r--src/devices/bus/vic20/megacart.h12
-rw-r--r--src/devices/bus/vic20/speakeasy.cpp16
-rw-r--r--src/devices/bus/vic20/speakeasy.h18
-rw-r--r--src/devices/bus/vic20/std.cpp5
-rw-r--r--src/devices/bus/vic20/std.h12
-rw-r--r--src/devices/bus/vic20/user.h8
-rw-r--r--src/devices/bus/vic20/vic1010.cpp20
-rw-r--r--src/devices/bus/vic20/vic1010.h31
-rw-r--r--src/devices/bus/vic20/vic1011.cpp8
-rw-r--r--src/devices/bus/vic20/vic1011.h8
-rw-r--r--src/devices/bus/vic20/vic1110.cpp10
-rw-r--r--src/devices/bus/vic20/vic1110.h11
-rw-r--r--src/devices/bus/vic20/vic1111.cpp8
-rw-r--r--src/devices/bus/vic20/vic1111.h12
-rw-r--r--src/devices/bus/vic20/vic1112.cpp33
-rw-r--r--src/devices/bus/vic20/vic1112.h12
-rw-r--r--src/devices/bus/vic20/vic1210.cpp8
-rw-r--r--src/devices/bus/vic20/vic1210.h12
-rw-r--r--src/devices/bus/vic20/videopak.cpp24
-rw-r--r--src/devices/bus/vic20/videopak.h17
-rw-r--r--src/devices/bus/vidbrain/exp.cpp4
-rw-r--r--src/devices/bus/vidbrain/exp.h24
-rw-r--r--src/devices/bus/vidbrain/money_minder.cpp4
-rw-r--r--src/devices/bus/vidbrain/money_minder.h11
-rw-r--r--src/devices/bus/vidbrain/std.cpp4
-rw-r--r--src/devices/bus/vidbrain/std.h11
-rw-r--r--src/devices/bus/vidbrain/timeshare.cpp4
-rw-r--r--src/devices/bus/vidbrain/timeshare.h11
-rw-r--r--src/devices/bus/vip/byteio.cpp9
-rw-r--r--src/devices/bus/vip/byteio.h25
-rw-r--r--src/devices/bus/vip/exp.cpp4
-rw-r--r--src/devices/bus/vip/exp.h39
-rw-r--r--src/devices/bus/vip/vp550.cpp4
-rw-r--r--src/devices/bus/vip/vp550.h11
-rw-r--r--src/devices/bus/vip/vp570.cpp4
-rw-r--r--src/devices/bus/vip/vp570.h10
-rw-r--r--src/devices/bus/vip/vp575.cpp13
-rw-r--r--src/devices/bus/vip/vp575.h23
-rw-r--r--src/devices/bus/vip/vp585.cpp7
-rw-r--r--src/devices/bus/vip/vp585.h11
-rw-r--r--src/devices/bus/vip/vp590.cpp7
-rw-r--r--src/devices/bus/vip/vp590.h11
-rw-r--r--src/devices/bus/vip/vp595.cpp4
-rw-r--r--src/devices/bus/vip/vp595.h11
-rw-r--r--src/devices/bus/vip/vp620.cpp8
-rw-r--r--src/devices/bus/vip/vp620.h13
-rw-r--r--src/devices/bus/vip/vp700.cpp4
-rw-r--r--src/devices/bus/vip/vp700.h11
-rw-r--r--src/devices/bus/vme/vme.cpp50
-rw-r--r--src/devices/bus/vme/vme.h44
-rw-r--r--src/devices/bus/vme/vme_fccpu20.cpp35
-rw-r--r--src/devices/bus/vme/vme_fccpu20.h128
-rw-r--r--src/devices/bus/vme/vme_fcisio.cpp42
-rw-r--r--src/devices/bus/vme/vme_fcisio.h16
-rw-r--r--src/devices/bus/vme/vme_fcscsi.cpp38
-rw-r--r--src/devices/bus/vme/vme_fcscsi.h33
-rw-r--r--src/devices/bus/vme/vme_mvme350.cpp14
-rw-r--r--src/devices/bus/vme/vme_mvme350.h18
-rw-r--r--src/devices/bus/vme/vme_mzr8105.cpp9
-rw-r--r--src/devices/bus/vme/vme_mzr8105.h19
-rw-r--r--src/devices/bus/vme/vme_mzr8300.cpp17
-rw-r--r--src/devices/bus/vme/vme_mzr8300.h16
-rw-r--r--src/devices/bus/vtech/ioexp/carts.cpp10
-rw-r--r--src/devices/bus/vtech/ioexp/carts.h13
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.cpp28
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.h40
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.cpp20
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.h14
-rw-r--r--src/devices/bus/vtech/ioexp/printer.cpp30
-rw-r--r--src/devices/bus/vtech/ioexp/printer.h14
-rw-r--r--src/devices/bus/vtech/memexp/carts.cpp25
-rw-r--r--src/devices/bus/vtech/memexp/carts.h17
-rw-r--r--src/devices/bus/vtech/memexp/floppy.cpp47
-rw-r--r--src/devices/bus/vtech/memexp/floppy.h26
-rw-r--r--src/devices/bus/vtech/memexp/memexp.cpp30
-rw-r--r--src/devices/bus/vtech/memexp/memexp.h60
-rw-r--r--src/devices/bus/vtech/memexp/memory.cpp68
-rw-r--r--src/devices/bus/vtech/memexp/memory.h40
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp32
-rw-r--r--src/devices/bus/vtech/memexp/rs232.h16
-rw-r--r--src/devices/bus/vtech/memexp/rtty.cpp30
-rw-r--r--src/devices/bus/vtech/memexp/rtty.h18
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.cpp20
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.h16
-rw-r--r--src/devices/bus/wangpc/emb.cpp7
-rw-r--r--src/devices/bus/wangpc/emb.h9
-rw-r--r--src/devices/bus/wangpc/lic.cpp4
-rw-r--r--src/devices/bus/wangpc/lic.h11
-rw-r--r--src/devices/bus/wangpc/lvc.cpp4
-rw-r--r--src/devices/bus/wangpc/lvc.h11
-rw-r--r--src/devices/bus/wangpc/mcc.cpp4
-rw-r--r--src/devices/bus/wangpc/mcc.h11
-rw-r--r--src/devices/bus/wangpc/mvc.cpp4
-rw-r--r--src/devices/bus/wangpc/mvc.h11
-rw-r--r--src/devices/bus/wangpc/rtc.cpp4
-rw-r--r--src/devices/bus/wangpc/rtc.h11
-rw-r--r--src/devices/bus/wangpc/tig.cpp4
-rw-r--r--src/devices/bus/wangpc/tig.h13
-rw-r--r--src/devices/bus/wangpc/wangpc.cpp8
-rw-r--r--src/devices/bus/wangpc/wangpc.h67
-rw-r--r--src/devices/bus/wangpc/wdc.cpp4
-rw-r--r--src/devices/bus/wangpc/wdc.h11
-rw-r--r--src/devices/bus/wswan/rom.cpp44
-rw-r--r--src/devices/bus/wswan/rom.h47
-rw-r--r--src/devices/bus/wswan/slot.cpp11
-rw-r--r--src/devices/bus/wswan/slot.h25
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.cpp10
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.h15
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.cpp9
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.h14
-rw-r--r--src/devices/bus/x68k/x68kexp.cpp15
-rw-r--r--src/devices/bus/x68k/x68kexp.h27
-rw-r--r--src/devices/bus/z88/flash.cpp8
-rw-r--r--src/devices/bus/z88/flash.h11
-rw-r--r--src/devices/bus/z88/ram.cpp26
-rw-r--r--src/devices/bus/z88/ram.h19
-rw-r--r--src/devices/bus/z88/rom.cpp22
-rw-r--r--src/devices/bus/z88/rom.h17
-rw-r--r--src/devices/bus/z88/z88.cpp11
-rw-r--r--src/devices/bus/z88/z88.h28
1785 files changed, 22176 insertions, 21555 deletions
diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp
index 39bf0c52489..d1f0bbd7fe0 100644
--- a/src/devices/bus/a1bus/a1bus.cpp
+++ b/src/devices/bus/a1bus/a1bus.cpp
@@ -14,7 +14,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A1BUS_SLOT = device_creator<a1bus_slot_device>;
+DEFINE_DEVICE_TYPE(A1BUS_SLOT, a1bus_slot_device, "a1bus_slot", "Apple I Slot")
//**************************************************************************
// LIVE DEVICE
@@ -23,17 +23,16 @@ const device_type A1BUS_SLOT = device_creator<a1bus_slot_device>;
//-------------------------------------------------
// a1bus_slot_device - constructor
//-------------------------------------------------
-a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A1BUS_SLOT, "Apple I Slot", tag, owner, clock, "a1bus_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_a1bus_tag(nullptr),
- m_a1bus_slottag(nullptr)
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a1bus_slot_device(mconfig, A1BUS_SLOT, tag, owner, clock)
{
}
-a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_slot_interface(mconfig, *this), m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr)
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_slot_interface(mconfig, *this)
+ , m_a1bus_tag(nullptr)
+ , m_a1bus_slottag(nullptr)
{
}
@@ -59,7 +58,7 @@ void a1bus_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A1BUS = device_creator<a1bus_device>;
+DEFINE_DEVICE_TYPE(A1BUS, a1bus_device, "a1bus", "Apple I Bus")
void a1bus_device::static_set_cputag(device_t &device, const char *tag)
{
@@ -75,17 +74,18 @@ void a1bus_device::static_set_cputag(device_t &device, const char *tag)
// a1bus_device - constructor
//-------------------------------------------------
-a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), m_maincpu(nullptr),
- m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a1bus_device(mconfig, A1BUS, tag, owner, clock)
{
}
-a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
- m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , m_maincpu(nullptr)
+ , m_out_irq_cb(*this)
+ , m_out_nmi_cb(*this)
+ , m_device(nullptr)
+ , m_cputag(nullptr)
{
}
//-------------------------------------------------
diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h
index 38830940525..320a2d9bc80 100644
--- a/src/devices/bus/a1bus/a1bus.h
+++ b/src/devices/bus/a1bus/a1bus.h
@@ -6,10 +6,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_BUS_A1BUS_A1BUS_H
+#define MAME_BUS_A1BUS_A1BUS_H
-#ifndef __A1BUS_H__
-#define __A1BUS_H__
+#pragma once
//**************************************************************************
@@ -49,20 +49,22 @@ class a1bus_slot_device : public device_t,
public:
// construction/destruction
a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
- // device-level overrides
- virtual void device_start() override;
// inline configuration
static void static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag);
+
protected:
+ a1bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ // device-level overrides
+ virtual void device_start() override;
+
// configuration
const char *m_a1bus_tag, *m_a1bus_slottag;
};
// device type definition
-extern const device_type A1BUS_SLOT;
+DECLARE_DEVICE_TYPE(A1BUS_SLOT, a1bus_slot_device)
class device_a1bus_card_interface;
@@ -72,12 +74,11 @@ class a1bus_device : public device_t
public:
// construction/destruction
a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
- template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_out_irq_callback(device_t &device, Object &&cb) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_nmi_callback(device_t &device, Object &&cb) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(std::forward<Object>(cb)); }
void add_a1bus_card(device_a1bus_card_interface *card);
device_a1bus_card_interface *get_a1bus_card();
@@ -92,6 +93,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( nmi_w );
protected:
+ a1bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -108,7 +111,7 @@ protected:
// device type definition
-extern const device_type A1BUS;
+DECLARE_DEVICE_TYPE(A1BUS, a1bus_device)
// ======================> device_a1bus_card_interface
@@ -118,7 +121,6 @@ class device_a1bus_card_interface : public device_slot_card_interface
friend class a1bus_device;
public:
// construction/destruction
- device_a1bus_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_a1bus_card_interface();
device_a1bus_card_interface *next() const { return m_next; }
@@ -135,10 +137,13 @@ public:
// inline configuration
static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag);
-public:
+
+protected:
+ device_a1bus_card_interface(const machine_config &mconfig, device_t &device);
+
a1bus_device *m_a1bus;
const char *m_a1bus_tag, *m_a1bus_slottag;
device_a1bus_card_interface *m_next;
};
-#endif /* __A1BUS_H__ */
+#endif // MAME_BUS_A1BUS_A1BUS_H
diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp
index c050a06120e..f7b2012d461 100644
--- a/src/devices/bus/a1bus/a1cassette.cpp
+++ b/src/devices/bus/a1bus/a1cassette.cpp
@@ -21,7 +21,7 @@
#define CASSETTE_ROM_REGION "casrom"
-const device_type A1BUS_CASSETTE = device_creator<a1bus_cassette_device>;
+DEFINE_DEVICE_TYPE(A1BUS_CASSETTE, a1bus_cassette_device, "a1cass", "Apple I cassette board")
/* sound output */
@@ -57,17 +57,17 @@ const tiny_rom_entry *a1bus_cassette_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A1BUS_CASSETTE, "Apple I cassette board", tag, owner, clock, "a1cass", __FILE__),
- device_a1bus_card_interface(mconfig, *this),
- m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a1bus_cassette_device(mconfig, A1BUS_CASSETTE, tag, owner, clock)
{
}
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_a1bus_card_interface(mconfig, *this),
- m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_a1bus_card_interface(mconfig, *this)
+ , m_cassette(*this, "cassette")
+ , m_rom(nullptr),
+ m_cassette_output_flipflop(0)
{
}
diff --git a/src/devices/bus/a1bus/a1cassette.h b/src/devices/bus/a1bus/a1cassette.h
index 408ae5fe4cf..f674559732c 100644
--- a/src/devices/bus/a1bus/a1cassette.h
+++ b/src/devices/bus/a1bus/a1cassette.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A1BUS_CASSETTE__
-#define __A1BUS_CASSETTE__
+#ifndef MAME_BUS_A1BUS_A1CASSETTE_H
+#define MAME_BUS_A1BUS_A1CASSETTE_H
+
+#pragma once
#include "a1bus.h"
#include "imagedev/cassette.h"
@@ -25,29 +27,30 @@ class a1bus_cassette_device:
public:
// construction/destruction
a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- optional_device<cassette_image_device> m_cassette;
-
DECLARE_READ8_MEMBER(cassette_r);
DECLARE_WRITE8_MEMBER(cassette_w);
protected:
+ a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
void cassette_toggle_output();
+ optional_device<cassette_image_device> m_cassette;
+
private:
uint8_t *m_rom;
int m_cassette_output_flipflop;
};
// device type definition
-extern const device_type A1BUS_CASSETTE;
+DECLARE_DEVICE_TYPE(A1BUS_CASSETTE, a1bus_cassette_device)
-#endif /* __A1BUS_CASSETTE__ */
+#endif // MAME_BUS_A1BUS_A1CASSETTE_H
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index f53270cd1df..3fb11381e9a 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -22,7 +22,7 @@
#define CFFA_ROM_REGION "cffa_rom"
#define CFFA_ATA_TAG "cffa_ata"
-const device_type A1BUS_CFFA = device_creator<a1bus_cffa_device>;
+DEFINE_DEVICE_TYPE(A1BUS_CFFA, a1bus_cffa_device, "cffa1", "CFFA Compact Flash for Apple I")
MACHINE_CONFIG_FRAGMENT( cffa )
MCFG_ATA_INTERFACE_ADD(CFFA_ATA_TAG, ata_devices, "hdd", nullptr, false)
@@ -52,17 +52,18 @@ const tiny_rom_entry *a1bus_cffa_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A1BUS_CFFA, "CFFA Compact Flash for Apple I", tag, owner, clock, "cffa1", __FILE__),
- device_a1bus_card_interface(mconfig, *this),
- m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a1bus_cffa_device(mconfig, A1BUS_CFFA, tag, owner, clock)
{
}
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_a1bus_card_interface(mconfig, *this),
- m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_a1bus_card_interface(mconfig, *this)
+ , m_ata(*this, CFFA_ATA_TAG)
+ , m_rom(nullptr)
+ , m_lastdata(0)
+ , m_writeprotect(false)
{
}
diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h
index 1f7925df0f9..e1114a23f05 100644
--- a/src/devices/bus/a1bus/a1cffa.h
+++ b/src/devices/bus/a1bus/a1cffa.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A1BUS_CFFA__
-#define __A1BUS_CFFA__
+#ifndef MAME_BUS_A1BUS_A1CFFA_H
+#define MAME_BUS_A1BUS_A1CFFA_H
+
+#pragma once
#include "a1bus.h"
#include "machine/ataintf.h"
@@ -25,21 +27,22 @@ class a1bus_cffa_device:
public:
// construction/destruction
a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- required_device<ata_interface_device> m_ata;
-
DECLARE_READ8_MEMBER(cffa_r);
DECLARE_WRITE8_MEMBER(cffa_w);
protected:
+ a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
+ required_device<ata_interface_device> m_ata;
+
private:
uint8_t *m_rom;
uint16_t m_lastdata;
@@ -49,4 +52,4 @@ private:
// device type definition
extern const device_type A1BUS_CFFA;
-#endif /* __A1BUS_CFFA__ */
+#endif // MAME_BUS_A1BUS_A1CFFA_H
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index fc28c7900da..aaf8287cd8f 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -22,8 +22,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ALFAM2 = device_creator<a2bus_alfam2_device>;
-const device_type A2BUS_AESMS = device_creator<a2bus_aesms_device>;
+DEFINE_DEVICE_TYPE(A2BUS_ALFAM2, a2bus_alfam2_device, "a2alfam2", "ALF MC1 / Apple Music II")
+DEFINE_DEVICE_TYPE(A2BUS_AESMS, a2bus_aesms_device, "a2aesms", "Applied Engineering Super Music Synthesizer")
#define SN1_TAG "sn76489_1" // left
#define SN2_TAG "sn76489_2" // center
@@ -83,8 +83,8 @@ machine_config_constructor a2bus_aesms_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_sn1(*this, SN1_TAG),
m_sn2(*this, SN2_TAG),
@@ -94,13 +94,13 @@ a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device
}
a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "ALF MC1 / Apple Music II", tag, owner, clock, "a2alfam2", __FILE__)
+ a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, tag, owner, clock)
{
m_has4thsn = false;
}
a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_sn76489_device(mconfig, A2BUS_AESMS, "Applied Engineering Super Music Synthesizer", tag, owner, clock, "a2aesms", __FILE__)
+ a2bus_sn76489_device(mconfig, A2BUS_AESMS, tag, owner, clock)
{
m_has4thsn = true;
}
diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h
index b693ebb6a3f..ec98e87095d 100644
--- a/src/devices/bus/a2bus/a2alfam2.h
+++ b/src/devices/bus/a2bus/a2alfam2.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_ALFAM2__
-#define __A2BUS_ALFAM2__
+#ifndef MAME_BUS_A2BUS_A2ALFAM2_H
+#define MAME_BUS_A2BUS_A2ALFAM2_H
+
+#pragma once
#include "a2bus.h"
#include "sound/sn76496.h"
@@ -23,18 +25,13 @@ class a2bus_sn76489_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
- required_device<sn76489_device> m_sn1;
- required_device<sn76489_device> m_sn2;
- required_device<sn76489_device> m_sn3;
- optional_device<sn76489_device> m_sn4;
-
protected:
+ // construction/destruction
+ a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -43,6 +40,11 @@ protected:
virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
+ required_device<sn76489_device> m_sn1;
+ required_device<sn76489_device> m_sn2;
+ required_device<sn76489_device> m_sn3;
+ optional_device<sn76489_device> m_sn4;
+
private:
uint8_t m_latch0, m_latch1, m_latch2, m_latch3;
@@ -65,7 +67,7 @@ public:
};
// device type definition
-extern const device_type A2BUS_ALFAM2;
-extern const device_type A2BUS_AESMS;
+DECLARE_DEVICE_TYPE(A2BUS_ALFAM2, a2bus_alfam2_device)
+DECLARE_DEVICE_TYPE(A2BUS_AESMS, a2bus_aesms_device)
-#endif /* __A2BUS_ALFAM2__ */
+#endif // MAME_BUS_A2BUS_A2ALFAM2_H
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index f24903138dc..a356f8de706 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -24,7 +24,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_APPLICARD = device_creator<a2bus_applicard_device>;
+DEFINE_DEVICE_TYPE(A2BUS_APPLICARD, a2bus_applicard_device, "a2aplcrd", "PCPI Applicard")
#define Z80_TAG "z80"
#define Z80_ROM_REGION "z80_rom"
@@ -75,17 +75,15 @@ const tiny_rom_entry *a2bus_applicard_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
{
}
a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_APPLICARD, "PCPI Applicard", tag, owner, clock, "a2aplcrd", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
+ a2bus_applicard_device(mconfig, A2BUS_APPLICARD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h
index 89df1bf188e..dfacfbf208f 100644
--- a/src/devices/bus/a2bus/a2applicard.h
+++ b/src/devices/bus/a2bus/a2applicard.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_APPLICARD__
-#define __A2BUS_APPLICARD__
+#ifndef MAME_BUS_A2BUS_A2APPLICARD_H
+#define MAME_BUS_A2BUS_A2APPLICARD_H
+
+#pragma once
#include "a2bus.h"
@@ -23,7 +25,6 @@ class a2bus_applicard_device:
{
public:
// construction/destruction
- a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -35,6 +36,8 @@ public:
DECLARE_WRITE8_MEMBER( z80_io_w );
protected:
+ a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -55,6 +58,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_APPLICARD;
+DECLARE_DEVICE_TYPE(A2BUS_APPLICARD, a2bus_applicard_device)
-#endif /* __A2BUS_APPLICARD__ */
+#endif // MAME_BUS_A2BUS_A2APPLICARD_H
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index 68da2e73426..cff4747f223 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -30,7 +30,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ARCADEBOARD = device_creator<a2bus_arcboard_device>;
+DEFINE_DEVICE_TYPE(A2BUS_ARCADEBOARD, a2bus_arcboard_device, "a2arcbd", "Third Millenium Engineering Arcade Board")
MACHINE_CONFIG_FRAGMENT( arcadeboard )
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
@@ -59,15 +59,12 @@ machine_config_constructor a2bus_arcboard_device::device_mconfig_additions() con
//**************************************************************************
a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_ARCADEBOARD, "Third Millenium Engineering Arcade Board", tag, owner, clock, "a2arcbd", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_tms(*this, TMS_TAG),
- m_ay(*this, AY_TAG)
+ a2bus_arcboard_device(mconfig, A2BUS_ARCADEBOARD, tag, owner, clock)
{
}
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG),
m_ay(*this, AY_TAG)
diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h
index a57894e5830..dcf303f94ae 100644
--- a/src/devices/bus/a2bus/a2arcadebd.h
+++ b/src/devices/bus/a2bus/a2arcadebd.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_ARCADEBOARD__
-#define __A2BUS_ARCADEBOARD__
+#ifndef MAME_BUS_A2BUS_A2ARCADEBD_H
+#define MAME_BUS_A2BUS_A2ARCADEBD_H
+
+#pragma once
#include "a2bus.h"
#include "video/tms9928a.h"
@@ -26,7 +28,6 @@ class a2bus_arcboard_device:
public:
// construction/destruction
a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -34,6 +35,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( tms_irq_w );
protected:
+ a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -46,6 +49,6 @@ protected:
};
// device type definition
-extern const device_type A2BUS_ARCADEBOARD;
+DECLARE_DEVICE_TYPE(A2BUS_ARCADEBOARD, a2bus_arcboard_device)
-#endif /* __A2BUS_ARCADEBOARD__ */
+#endif // MAME_BUS_A2BUS_A2ARCADEBD_H
diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp
index d271c4e2762..d70b0414b9f 100644
--- a/src/devices/bus/a2bus/a2bus.cpp
+++ b/src/devices/bus/a2bus/a2bus.cpp
@@ -78,7 +78,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SLOT = device_creator<a2bus_slot_device>;
+DEFINE_DEVICE_TYPE(A2BUS_SLOT, a2bus_slot_device, "a2bus_slot", "Apple II Slot")
//**************************************************************************
// LIVE DEVICE
@@ -87,15 +87,16 @@ const device_type A2BUS_SLOT = device_creator<a2bus_slot_device>;
//-------------------------------------------------
// a2bus_slot_device - constructor
//-------------------------------------------------
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock, "a2bus_slot", __FILE__),
- device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a2bus_slot_device(mconfig, A2BUS_SLOT, tag, owner, clock)
{
}
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_slot_interface(mconfig, *this)
+ , m_a2bus_tag(nullptr)
+ , m_a2bus_slottag(nullptr)
{
}
@@ -121,7 +122,7 @@ void a2bus_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS = device_creator<a2bus_device>;
+DEFINE_DEVICE_TYPE(A2BUS, a2bus_device, "a2bus", "Apple II Bus")
void a2bus_device::static_set_cputag(device_t &device, const char *tag)
{
@@ -137,19 +138,17 @@ void a2bus_device::static_set_cputag(device_t &device, const char *tag)
// a2bus_device - constructor
//-------------------------------------------------
-a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__), m_maincpu(nullptr), m_maincpu_space(nullptr),
- m_out_irq_cb(*this),
- m_out_nmi_cb(*this),
- m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0)
+a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a2bus_device(mconfig, A2BUS, tag, owner, clock)
{
}
-a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_maincpu_space(nullptr),
- m_out_irq_cb(*this),
- m_out_nmi_cb(*this),
- m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0)
+a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , m_maincpu(nullptr) , m_maincpu_space(nullptr)
+ , m_out_irq_cb(*this) , m_out_nmi_cb(*this) , m_out_inh_cb(*this)
+ , m_cputag(nullptr)
+ , m_slot_irq_mask(0), m_slot_nmi_mask(0)
{
}
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
index 16433f5b814..f76a5e1166c 100644
--- a/src/devices/bus/a2bus/a2bus.h
+++ b/src/devices/bus/a2bus/a2bus.h
@@ -8,10 +8,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_BUS_A2BUS_A2BUS_H
+#define MAME_BUS_A2BUS_A2BUS_H
-#ifndef __A2BUS_H__
-#define __A2BUS_H__
+#pragma once
// /INH special addresses
@@ -63,7 +63,6 @@ class a2bus_slot_device : public device_t,
public:
// construction/destruction
a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -71,12 +70,14 @@ public:
// inline configuration
static void static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag);
protected:
+ a2bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// configuration
const char *m_a2bus_tag, *m_a2bus_slottag;
};
// device type definition
-extern const device_type A2BUS_SLOT;
+DECLARE_DEVICE_TYPE(A2BUS_SLOT, a2bus_slot_device)
class device_a2bus_card_interface;
@@ -88,13 +89,12 @@ class a2bus_device : public device_t
public:
// construction/destruction
a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
- template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_nmi_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_inh_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_inh_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_out_irq_callback(device_t &device, Object &&cb) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_nmi_callback(device_t &device, Object &&cb) { return downcast<a2bus_device &>(device).m_out_nmi_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_inh_callback(device_t &device, Object &&cb) { return downcast<a2bus_device &>(device).m_out_inh_cb.set_callback(std::forward<Object>(cb)); }
void add_a2bus_card(int slot, device_a2bus_card_interface *card);
device_a2bus_card_interface *get_a2bus_card(int slot);
@@ -114,6 +114,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( nmi_w );
protected:
+ a2bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -135,7 +137,7 @@ protected:
// device type definition
-extern const device_type A2BUS;
+DECLARE_DEVICE_TYPE(A2BUS, a2bus_device)
// ======================> device_a2bus_card_interface
@@ -145,7 +147,6 @@ class device_a2bus_card_interface : public device_slot_card_interface
friend class a2bus_device;
public:
// construction/destruction
- device_a2bus_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_a2bus_card_interface();
virtual uint8_t read_c0nx(address_space &space, uint8_t offset) { m_device.logerror("a2bus: unhandled read at C0n%x\n", offset); return 0; } // C0nX - /DEVSEL
@@ -186,11 +187,14 @@ public:
// inline configuration
static void static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag);
-public:
+
+protected:
+ device_a2bus_card_interface(const machine_config &mconfig, device_t &device);
+
a2bus_device *m_a2bus;
const char *m_a2bus_tag, *m_a2bus_slottag;
int m_slot;
device_a2bus_card_interface *m_next;
};
-#endif /* __A2BUS_H__ */
+#endif // MAME_BUS_A2BUS_A2BUS_H
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index a37e33d2779..f4d96f6d436 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -27,8 +27,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CFFA2 = device_creator<a2bus_cffa2_device>;
-const device_type A2BUS_CFFA2_6502 = device_creator<a2bus_cffa2_6502_device>;
+DEFINE_DEVICE_TYPE(A2BUS_CFFA2, a2bus_cffa2_device, "a2cffa2", "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)")
+DEFINE_DEVICE_TYPE(A2BUS_CFFA2_6502, a2bus_cffa2_6502_device, "a2cffa02", "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)")
#define CFFA2_ROM_REGION "cffa2_rom"
#define CFFA2_ATA_TAG "cffa2_ata"
@@ -83,21 +83,21 @@ const tiny_rom_entry *a2bus_cffa2_6502_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_ata(*this, CFFA2_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_lastreaddata(0), m_writeprotect(false), m_inwritecycle(false)
{
}
a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)", tag, owner, clock, "a2cffa2", __FILE__),
+ a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, tag, owner, clock),
device_nvram_interface(mconfig, *this)
{
}
a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_cffa2000_device(mconfig, A2BUS_CFFA2_6502, "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)", tag, owner, clock, "a2cffa02", __FILE__),
+ a2bus_cffa2000_device(mconfig, A2BUS_CFFA2_6502, tag, owner, clock),
device_nvram_interface(mconfig, *this)
{
}
diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h
index 0c7832bbb93..be326ad037b 100644
--- a/src/devices/bus/a2bus/a2cffa.h
+++ b/src/devices/bus/a2bus/a2cffa.h
@@ -9,8 +9,10 @@
*********************************************************************/
-#ifndef __A2BUS_CFFA2__
-#define __A2BUS_CFFA2__
+#ifndef MAME_BUS_A2BUS_A2CFFA_H
+#define MAME_BUS_A2BUS_A2CFFA_H
+
+#pragma once
#include "a2bus.h"
#include "machine/ataintf.h"
@@ -24,14 +26,14 @@ class a2bus_cffa2000_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
+ // construction/destruction
+ a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -79,7 +81,7 @@ protected:
};
// device type definition
-extern const device_type A2BUS_CFFA2;
-extern const device_type A2BUS_CFFA2_6502;
+DECLARE_DEVICE_TYPE(A2BUS_CFFA2, a2bus_cffa2_device)
+DECLARE_DEVICE_TYPE(A2BUS_CFFA2_6502, a2bus_cffa2_6502_device)
-#endif /* __A2BUS_CFFA2__ */
+#endif // MAME_BUS_A2BUS_A2CFFA_H
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index 7c399b215f4..15e734ddfef 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -52,7 +52,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CORVUS = device_creator<a2bus_corvus_device>;
+DEFINE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device, "a2corvus", "Corvus Flat Cable interface")
#define CORVUS_ROM_REGION "corvus_rom"
#define CORVUS_HD_TAG "corvushd"
@@ -101,17 +101,15 @@ const tiny_rom_entry *a2bus_corvus_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
{
}
a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_CORVUS, "Corvus Flat Cable interface", tag, owner, clock, "a2corvus", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
+ a2bus_corvus_device(mconfig, A2BUS_CORVUS, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h
index a221ef51d45..2a58d280a06 100644
--- a/src/devices/bus/a2bus/a2corvus.h
+++ b/src/devices/bus/a2bus/a2corvus.h
@@ -9,8 +9,10 @@
*********************************************************************/
-#ifndef __A2BUS_CORVUS__
-#define __A2BUS_CORVUS__
+#ifndef MAME_A2BUS_A2CORVUS_H
+#define MAME_A2BUS_A2CORVUS_H
+
+#pragma once
#include "a2bus.h"
#include "machine/corvushd.h"
@@ -25,16 +27,15 @@ class a2bus_corvus_device:
{
public:
// construction/destruction
- a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- required_device<corvus_hdc_t> m_corvushd;
-
protected:
+ a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -44,11 +45,13 @@ protected:
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ required_device<corvus_hdc_device> m_corvushd;
+
private:
uint8_t *m_rom;
};
// device type definition
-extern const device_type A2BUS_CORVUS;
+DECLARE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device)
-#endif /* __A2BUS_CORVUS__ */
+#endif // MAME_A2BUS_A2CORVUS_H
diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp
index a28cc19076b..71f6895ea44 100644
--- a/src/devices/bus/a2bus/a2diskii.cpp
+++ b/src/devices/bus/a2bus/a2diskii.cpp
@@ -23,9 +23,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_DISKII = device_creator<a2bus_diskii_device>;
-const device_type A2BUS_IWM_FDC = device_creator<a2bus_iwmflop_device>;
-const device_type A2BUS_AGAT7_FDC = device_creator<a2bus_agat7flop_device>;
+DEFINE_DEVICE_TYPE(A2BUS_DISKII, a2bus_diskii_device, "a2diskii", "Apple Disk II controller")
+DEFINE_DEVICE_TYPE(A2BUS_IWM_FDC, a2bus_iwmflop_device, "a2iwm_flop", "Apple IWM floppy card")
+DEFINE_DEVICE_TYPE(A2BUS_AGAT7_FDC, a2bus_agat7flop_device, "agat7_flop", "Agat-7 140K floppy card")
#define DISKII_ROM_REGION "diskii_rom"
#define FDC_TAG "diskii_fdc"
@@ -100,25 +100,25 @@ const tiny_rom_entry *a2bus_agat7flop_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_a2bus_card_interface(mconfig, *this),
- m_fdc(*this, FDC_TAG), m_rom(nullptr)
+a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
+ device_a2bus_card_interface(mconfig, *this),
+ m_fdc(*this, FDC_TAG), m_rom(nullptr)
{
}
a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock, "a2diskii", __FILE__)
+ a2bus_floppy_device(mconfig, A2BUS_DISKII, tag, owner, clock)
{
}
a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock, "a2iwm_flop", __FILE__)
+ a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, tag, owner, clock)
{
}
a2bus_agat7flop_device::a2bus_agat7flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_floppy_device(mconfig, A2BUS_AGAT7_FDC, "Agat-7 140K floppy card", tag, owner, clock, "agat7_flop", __FILE__)
+ a2bus_floppy_device(mconfig, A2BUS_AGAT7_FDC, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h
index 9d17757a144..b4367fd0aea 100644
--- a/src/devices/bus/a2bus/a2diskii.h
+++ b/src/devices/bus/a2bus/a2diskii.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_DISKII__
-#define __A2BUS_DISKII__
+#ifndef MAME_BUS_A2BUS_A2DISKII_H
+#define MAME_BUS_A2BUS_A2DISKII_H
+
+#pragma once
#include "a2bus.h"
#include "machine/applefdc.h"
@@ -23,14 +25,14 @@ class a2bus_floppy_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
+ // construction/destruction
+ a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -68,8 +70,8 @@ public:
};
// device type definition
-extern const device_type A2BUS_DISKII;
-extern const device_type A2BUS_IWM_FDC;
-extern const device_type A2BUS_AGAT7_FDC;
+DECLARE_DEVICE_TYPE(A2BUS_DISKII, a2bus_diskii_device)
+DECLARE_DEVICE_TYPE(A2BUS_IWM_FDC, a2bus_iwmflop_device)
+DECLARE_DEVICE_TYPE(A2BUS_AGAT7_FDC, a2bus_agat7flop_device)
-#endif /* __A2BUS_DISKII__ */
+#endif // MAME_BUS_A2BUS_A2DISKII_H
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp
index a1ebc3fb3c1..3235f4ec2ba 100644
--- a/src/devices/bus/a2bus/a2diskiing.cpp
+++ b/src/devices/bus/a2bus/a2diskiing.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_DISKIING = device_creator<a2bus_diskiing_device>;
+DEFINE_DEVICE_TYPE(A2BUS_DISKIING, a2bus_diskiing_device, "a2diskiing", "Apple Disk II NG controller")
#define WOZFDC_TAG "wozfdc"
#define DISKII_ROM_REGION "diskii_rom"
@@ -69,11 +69,12 @@ const tiny_rom_entry *a2bus_diskiing_device::device_rom_region() const
//**************************************************************************
a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_DISKIING, "Apple Disk II NG controller", tag, owner, clock, "a2diskiing", __FILE__),
+ device_t(mconfig, A2BUS_DISKIING, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_wozfdc(*this, WOZFDC_TAG),
floppy0(*this, "0"),
- floppy1(*this, "1"), m_rom(nullptr)
+ floppy1(*this, "1"),
+ m_rom(nullptr)
{
}
diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h
index 76e16818700..68c705435e6 100644
--- a/src/devices/bus/a2bus/a2diskiing.h
+++ b/src/devices/bus/a2bus/a2diskiing.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_DISKIING__
-#define __A2BUS_DISKIING__
+#ifndef MAME_BUS_A2BUS_A2DISKIING_H
+#define MAME_BUS_A2BUS_A2DISKIING_H
+
+#pragma once
#include "a2bus.h"
#include "imagedev/floppy.h"
@@ -45,7 +47,7 @@ protected:
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
private:
- required_device<diskii_fdc> m_wozfdc;
+ required_device<diskii_fdc_device> m_wozfdc;
required_device<floppy_connector> floppy0;
required_device<floppy_connector> floppy1;
@@ -53,6 +55,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_DISKIING;
+DECLARE_DEVICE_TYPE(A2BUS_DISKIING, a2bus_diskiing_device)
-#endif /* __A2BUS_DISKIING__ */
+#endif // MAME_BUS_A2BUS_A2DISKIING_H
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index 16b68bb2e81..16ec11d63d0 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_DX1 = device_creator<a2bus_dx1_device>;
+DEFINE_DEVICE_TYPE(A2BUS_DX1, a2bus_dx1_device, "a2dx1", "Decillonix DX-1")
MACHINE_CONFIG_FRAGMENT( a2dx1 )
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -50,8 +50,8 @@ machine_config_constructor a2bus_dx1_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, "dac"),
m_dacvol(*this, "dacvol")
@@ -59,10 +59,7 @@ a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type ty
}
a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_DX1, "Decillonix DX-1", tag, owner, clock, "a2dx1", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_dac(*this, "dac"),
- m_dacvol(*this, "dacvol")
+ a2bus_dx1_device(mconfig, A2BUS_DX1, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h
index a5c60a19ffa..f831e5777a6 100644
--- a/src/devices/bus/a2bus/a2dx1.h
+++ b/src/devices/bus/a2bus/a2dx1.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_DX1__
-#define __A2BUS_DX1__
+#ifndef MAME_BUS_A2BUS_A2DX1_H
+#define MAME_BUS_A2BUS_A2DX1_H
+
+#pragma once
#include "a2bus.h"
#include "sound/dac.h"
@@ -24,25 +26,26 @@ class a2bus_dx1_device:
{
public:
// construction/destruction
- a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
- required_device<dac_byte_interface> m_dac;
- required_device<dac_byte_interface> m_dacvol;
-
protected:
+ a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
// overrides of standard a2bus slot functions
virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
+
+ required_device<dac_byte_interface> m_dac;
+ required_device<dac_byte_interface> m_dacvol;
};
// device type definition
-extern const device_type A2BUS_DX1;
+DECLARE_DEVICE_TYPE(A2BUS_DX1, a2bus_dx1_device)
-#endif /* __A2BUS_DX1__ */
+#endif // MAME_BUS_A2BUS_A2DX1_H
diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp
index 8fc2f7a8137..7e3ba7ca8e3 100644
--- a/src/devices/bus/a2bus/a2eauxslot.cpp
+++ b/src/devices/bus/a2bus/a2eauxslot.cpp
@@ -16,7 +16,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUXSLOT_SLOT = device_creator<a2eauxslot_slot_device>;
+DEFINE_DEVICE_TYPE(A2EAUXSLOT_SLOT, a2eauxslot_slot_device, "a2eauxslot_slot", "Apple IIe AUX Slot")
//**************************************************************************
// LIVE DEVICE
@@ -25,17 +25,16 @@ const device_type A2EAUXSLOT_SLOT = device_creator<a2eauxslot_slot_device>;
//-------------------------------------------------
// a2eauxslot_slot_device - constructor
//-------------------------------------------------
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
- device_slot_interface(mconfig, *this),
- m_a2eauxslot_tag(nullptr),
- m_a2eauxslot_slottag(nullptr)
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a2eauxslot_slot_device(mconfig, A2EAUXSLOT_SLOT, tag, owner, clock)
{
}
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_slot_interface(mconfig, *this), m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr)
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_slot_interface(mconfig, *this)
+ , m_a2eauxslot_tag(nullptr)
+ , m_a2eauxslot_slottag(nullptr)
{
}
@@ -61,7 +60,7 @@ void a2eauxslot_slot_device::device_start()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUXSLOT = device_creator<a2eauxslot_device>;
+DEFINE_DEVICE_TYPE(A2EAUXSLOT, a2eauxslot_device, "a2eauxslot", "Apple IIe AUX Bus")
void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag)
{
@@ -77,17 +76,18 @@ void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag)
// a2eauxslot_device - constructor
//-------------------------------------------------
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__), m_maincpu(nullptr),
- m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : a2eauxslot_device(mconfig, A2EAUXSLOT, tag, owner, clock)
{
}
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
- m_out_irq_cb(*this),
- m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , m_maincpu(nullptr)
+ , m_out_irq_cb(*this)
+ , m_out_nmi_cb(*this)
+ , m_device(nullptr)
+ , m_cputag(nullptr)
{
}
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h
index e697ae17844..b7c3dec55bd 100644
--- a/src/devices/bus/a2bus/a2eauxslot.h
+++ b/src/devices/bus/a2bus/a2eauxslot.h
@@ -8,10 +8,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_BUS_A2BUS_A2EAUXSLOT_H
+#define MAME_BUS_A2BUS_A2EAUXSLOT_H
-#ifndef __A2EAUXSLOT_H__
-#define __A2EAUXSLOT_H__
+#pragma once
#include "a2bus.h"
@@ -47,20 +47,22 @@ class a2eauxslot_slot_device : public device_t,
public:
// construction/destruction
a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// inline configuration
static void static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag);
+
protected:
+ a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// configuration
const char *m_a2eauxslot_tag, *m_a2eauxslot_slottag;
};
// device type definition
-extern const device_type A2EAUXSLOT_SLOT;
+DECLARE_DEVICE_TYPE(A2EAUXSLOT_SLOT, a2eauxslot_slot_device)
class device_a2eauxslot_card_interface;
@@ -71,12 +73,11 @@ class a2eauxslot_device : public device_t
public:
// construction/destruction
a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
- template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_out_irq_callback(device_t &device, Object &&cb) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_nmi_callback(device_t &device, Object &&cb) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(std::forward<Object>(cb)); }
void add_a2eauxslot_card(device_a2eauxslot_card_interface *card);
device_a2eauxslot_card_interface *get_a2eauxslot_card();
@@ -88,6 +89,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( nmi_w );
protected:
+ a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -105,6 +108,7 @@ protected:
// device type definition
extern const device_type A2EAUXSLOT;
+DECLARE_DEVICE_TYPE(A2EAUXSLOT, a2eauxslot_device)
// ======================> device_a2eauxslot_card_interface
@@ -114,7 +118,6 @@ class device_a2eauxslot_card_interface : public device_slot_card_interface
friend class a2eauxslot_device;
public:
// construction/destruction
- device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_a2eauxslot_card_interface();
virtual uint8_t read_auxram(uint16_t offset) { printf("a2eauxslot: unhandled auxram read @ %04x\n", offset); return 0xff; }
@@ -135,11 +138,14 @@ public:
// inline configuration
static void static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag);
-public:
+
+protected:
+ device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device);
+
a2eauxslot_device *m_a2eauxslot;
const char *m_a2eauxslot_tag, *m_a2eauxslot_slottag;
int m_slot;
device_a2eauxslot_card_interface *m_next;
};
-#endif /* __A2EAUXSLOT_H__ */
+#endif // MAME_BUS_A2BUS_A2EAUXSLOT_H
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index 3803af3fce4..6ea4ca68e48 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ECHOII = device_creator<a2bus_echoii_device>;
+DEFINE_DEVICE_TYPE(A2BUS_ECHOII, a2bus_echoii_device, "a2echoii", "Street Electronics Echo II")
#define TMS_TAG "tms5220"
@@ -49,17 +49,15 @@ machine_config_constructor a2bus_echoii_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_ECHOII, "Street Electronics Echo II", tag, owner, clock, "a2echoii", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_tms(*this, TMS_TAG)
+ a2bus_echoii_device(mconfig, A2BUS_ECHOII, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h
index 2dcdf849797..d0781e0c4d9 100644
--- a/src/devices/bus/a2bus/a2echoii.h
+++ b/src/devices/bus/a2bus/a2echoii.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_ECHOII__
-#define __A2BUS_ECHOII__
+#ifndef MAME_BUS_A2BUS_A2ECHOII_H
+#define MAME_BUS_A2BUS_A2ECHOII_H
+
+#pragma once
#include "a2bus.h"
#include "sound/tms5220.h"
@@ -24,7 +26,6 @@ class a2bus_echoii_device:
{
public:
// construction/destruction
- a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -33,6 +34,8 @@ public:
required_device<tms5220_device> m_tms;
protected:
+ a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -44,5 +47,6 @@ protected:
// device type definition
extern const device_type A2BUS_ECHOII;
+DECLARE_DEVICE_TYPE(A2BUS_ECHOII, a2bus_echoii_device)
-#endif /* __A2BUS_ECHOII__ */
+#endif // MAME_BUS_A2BUS_A2ECHOII_H
diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp
index d7732804f58..b98d31c0d5c 100644
--- a/src/devices/bus/a2bus/a2eext80col.cpp
+++ b/src/devices/bus/a2bus/a2eext80col.cpp
@@ -20,20 +20,19 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUX_EXT80COL = device_creator<a2eaux_ext80col_device>;
+DEFINE_DEVICE_TYPE(A2EAUX_EXT80COL, a2eaux_ext80col_device, "a2eext80", "Apple IIe Extended 80-Column Card")
//**************************************************************************
// LIVE DEVICE
//**************************************************************************
a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock, "a2eext80", __FILE__),
- device_a2eauxslot_card_interface(mconfig, *this)
+ a2eaux_ext80col_device(mconfig, A2EAUX_EXT80COL, tag, owner, clock)
{
}
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2eauxslot_card_interface(mconfig, *this)
{
}
diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h
index 09762dce2cc..2aa89586f5b 100644
--- a/src/devices/bus/a2bus/a2eext80col.h
+++ b/src/devices/bus/a2bus/a2eext80col.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2EAUX_EXT80COL__
-#define __A2EAUX_EXT80COL__
+#ifndef MAME_BUS_A2BUS_A2EEXT809COL_H
+#define MAME_BUS_A2BUS_A2EEXT809COL_H
+
+#pragma once
#include "a2eauxslot.h"
@@ -24,9 +26,10 @@ class a2eaux_ext80col_device:
public:
// construction/destruction
a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -41,6 +44,6 @@ private:
};
// device type definition
-extern const device_type A2EAUX_EXT80COL;
+DECLARE_DEVICE_TYPE(A2EAUX_EXT80COL, a2eaux_ext80col_device)
-#endif /* __A2EAUX_EXT80COL__ */
+#endif // MAME_BUS_A2BUS_A2EEXT809COL_H
diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp
index 587165e81e4..e82225cbd27 100644
--- a/src/devices/bus/a2bus/a2eramworks3.cpp
+++ b/src/devices/bus/a2bus/a2eramworks3.cpp
@@ -21,22 +21,21 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUX_RAMWORKS3 = device_creator<a2eaux_ramworks3_device>;
+DEFINE_DEVICE_TYPE(A2EAUX_RAMWORKS3, a2eaux_ramworks3_device, "a2erwks3", "Applied Engineering RamWorks III")
//**************************************************************************
// LIVE DEVICE
//**************************************************************************
a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "a2erwks3", __FILE__),
- device_a2eauxslot_card_interface(mconfig, *this),
- m_bank(0)
+ a2eaux_ramworks3_device(mconfig, A2EAUX_RAMWORKS3, tag, owner, clock)
{
}
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_a2eauxslot_card_interface(mconfig, *this), m_bank(0)
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
+ device_a2eauxslot_card_interface(mconfig, *this),
+ m_bank(0)
{
}
diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h
index 75c8872d1cb..f2b327ebfab 100644
--- a/src/devices/bus/a2bus/a2eramworks3.h
+++ b/src/devices/bus/a2bus/a2eramworks3.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef __A2EAUX_RAMWORKS3__
-#define __A2EAUX_RAMWORKS3__
+#ifndef MAME_BUS_A2BUS_A2ERAMWORKS3_H
+#define MAME_BUS_A2BUS_A2ERAMWORKS3_H
#include "a2eauxslot.h"
@@ -24,9 +24,10 @@ class a2eaux_ramworks3_device:
public:
// construction/destruction
a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -43,6 +44,6 @@ private:
};
// device type definition
-extern const device_type A2EAUX_RAMWORKS3;
+DECLARE_DEVICE_TYPE(A2EAUX_RAMWORKS3, a2eaux_ramworks3_device)
-#endif /* __A2EAUX_RAMWORKS3__ */
+#endif // MAME_BUS_A2BUS_A2ERAMWORKS3_H
diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp
index a32b6750c77..e5a9741e7a0 100644
--- a/src/devices/bus/a2bus/a2estd80col.cpp
+++ b/src/devices/bus/a2bus/a2estd80col.cpp
@@ -20,20 +20,19 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2EAUX_STD80COL = device_creator<a2eaux_std80col_device>;
+DEFINE_DEVICE_TYPE(A2EAUX_STD80COL, a2eaux_std80col_device, "a2estd80", "Apple IIe Standard 80-Column Card")
//**************************************************************************
// LIVE DEVICE
//**************************************************************************
a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock, "a2estd80", __FILE__),
- device_a2eauxslot_card_interface(mconfig, *this)
+ a2eaux_std80col_device(mconfig, A2EAUX_STD80COL, tag, owner, clock)
{
}
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2eauxslot_card_interface(mconfig, *this)
{
}
diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h
index bd483863b1d..6f81860487d 100644
--- a/src/devices/bus/a2bus/a2estd80col.h
+++ b/src/devices/bus/a2bus/a2estd80col.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2EAUX_STD80COL__
-#define __A2EAUX_STD80COL__
+#ifndef MAME_BUS_A2BUS_A2ESTD80COL_H
+#define MAME_BUS_A2BUS_A2ESTD80COL_H
+
+#pragma once
#include "a2eauxslot.h"
@@ -24,9 +26,10 @@ class a2eaux_std80col_device:
public:
// construction/destruction
a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -41,6 +44,6 @@ private:
};
// device type definition
-extern const device_type A2EAUX_STD80COL;
+DECLARE_DEVICE_TYPE(A2EAUX_STD80COL, a2eaux_std80col_device)
-#endif /* __A2EAUX_STD80COL__ */
+#endif // MAME_BUS_A2BUS_A2ESTD80COL_H
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index 7584c73d836..118ad966630 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -51,7 +51,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_HSSCSI = device_creator<a2bus_hsscsi_device>;
+DEFINE_DEVICE_TYPE(A2BUS_HSSCSI, a2bus_hsscsi_device, "a2hsscsi", "Apple II High-Speed SCSI Card")
#define SCSI_ROM_REGION "scsi_rom"
#define SCSI_BUS_TAG "scsibus"
@@ -113,8 +113,8 @@ const tiny_rom_entry *a2bus_hsscsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false), m_c0ne(0), m_c0nf(0)
@@ -122,10 +122,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_t
}
a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_HSSCSI, "Apple II High-Speed SCSI Card", tag, owner, clock, "a2hsscsi", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_ncr5380(*this, SCSI_5380_TAG),
- m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false), m_c0ne(0), m_c0nf(0)
+ a2bus_hsscsi_device(mconfig, A2BUS_HSSCSI, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h
index 344253cd1ef..c4ff4d0a0b1 100644
--- a/src/devices/bus/a2bus/a2hsscsi.h
+++ b/src/devices/bus/a2bus/a2hsscsi.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_HSSCSI__
-#define __A2BUS_HSSCSI__
+#ifndef MAME_BUS_A2BUS_A2HSSCSI_H
+#define MAME_BUS_A2BUS_A2HSSCSI_H
+
+#pragma once
#include "a2bus.h"
#include "machine/ncr5380n.h"
@@ -24,19 +26,17 @@ class a2bus_hsscsi_device:
{
public:
// construction/destruction
- a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- required_device<ncr5380n_device> m_ncr5380;
- required_device<nscsi_bus_device> m_scsibus;
-
DECLARE_WRITE_LINE_MEMBER( drq_w );
protected:
+ a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,6 +48,9 @@ protected:
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
+ required_device<ncr5380n_device> m_ncr5380;
+ required_device<nscsi_bus_device> m_scsibus;
+
private:
uint8_t *m_rom;
uint8_t m_ram[8192]; // 8 banks of 1024 bytes
@@ -59,6 +62,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_HSSCSI;
+DECLARE_DEVICE_TYPE(A2BUS_HSSCSI, a2bus_hsscsi_device)
-#endif /* __A2BUS_HSSCSI__ */
+#endif // MAME_BUS_A2BUS_A2HSSCSI_H
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index 891bc51c0a0..da2459408a0 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -23,7 +23,7 @@ enum
};
-const device_type MCMS = device_creator<mcms_device>;
+DEFINE_DEVICE_TYPE(MCMS, mcms_device, "mcmseng", "Mountain Computer Music System engine")
/***************************************************************************
PARAMETERS
@@ -33,8 +33,8 @@ const device_type MCMS = device_creator<mcms_device>;
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MCMS1 = device_creator<a2bus_mcms1_device>;
-const device_type A2BUS_MCMS2 = device_creator<a2bus_mcms2_device>;
+DEFINE_DEVICE_TYPE(A2BUS_MCMS1, a2bus_mcms1_device, "a2mcms1", "Mountain Computer Music System (card 1)")
+DEFINE_DEVICE_TYPE(A2BUS_MCMS2, a2bus_mcms2_device, "a2mcms2", "Mountain Computer Music System (card 2)")
#define ENGINE_TAG "engine"
@@ -69,17 +69,15 @@ machine_config_constructor a2bus_mcms1_device::device_mconfig_additions() const
// LIVE DEVICE - Card 1
//**************************************************************************
-a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_mcms(*this, ENGINE_TAG)
{
}
a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_MCMS1, "Mountain Computer Music System (card 1)", tag, owner, clock, "a2mcms1", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_mcms(*this, ENGINE_TAG)
+ a2bus_mcms1_device(mconfig, A2BUS_MCMS1, tag, owner, clock)
{
}
@@ -150,15 +148,14 @@ WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w)
// LIVE DEVICE - Card 2
//**************************************************************************
-a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
{
}
a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_MCMS2, "Mountain Computer Music System (card 2)", tag, owner, clock, "a2mcms2", __FILE__),
- device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
+ a2bus_mcms2_device(mconfig, A2BUS_MCMS2, tag, owner, clock)
{
}
@@ -214,7 +211,7 @@ void a2bus_mcms2_device::write_cnxx(address_space &space, uint8_t offset, uint8_
*/
mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MCMS, "Mountain Computer Music System engine", tag, owner, clock, "msmseng", __FILE__),
+ : device_t(mconfig, MCMS, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_write_irq(*this), m_stream(nullptr), m_timer(nullptr), m_clrtimer(nullptr), m_pBusDevice(nullptr), m_enabled(false), m_mastervol(0), m_rand(0)
{
diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h
index 9877b8e945b..e854169bae3 100644
--- a/src/devices/bus/a2bus/a2mcms.h
+++ b/src/devices/bus/a2bus/a2mcms.h
@@ -10,8 +10,8 @@
*********************************************************************/
-#ifndef __A2BUS_MCMS__
-#define __A2BUS_MCMS__
+#ifndef MAME_BUS_A2BUS_A2MCMS_H
+#define MAME_BUS_A2BUS_A2MCMS_H
#include "a2bus.h"
@@ -64,7 +64,6 @@ class a2bus_mcms1_device:
{
public:
// construction/destruction
- a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -78,6 +77,8 @@ public:
required_device<mcms_device> m_mcms;
protected:
+ a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -95,10 +96,11 @@ class a2bus_mcms2_device:
{
public:
// construction/destruction
- a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
+ a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -114,7 +116,7 @@ private:
};
// device type definition
-extern const device_type A2BUS_MCMS1;
-extern const device_type A2BUS_MCMS2;
+DECLARE_DEVICE_TYPE(A2BUS_MCMS1, a2bus_mcms1_device)
+DECLARE_DEVICE_TYPE(A2BUS_MCMS2, a2bus_mcms2_device)
-#endif /* __A2BUS_MCMS__ */
+#endif // MAME_BUS_A2BUS_A2MCMS_H
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index ebd2bb4dc9a..df9d39dbdc8 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -20,8 +20,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MEMEXP = device_creator<a2bus_memexpapple_device>;
-const device_type A2BUS_RAMFACTOR = device_creator<a2bus_ramfactor_device>;
+DEFINE_DEVICE_TYPE(A2BUS_MEMEXP, a2bus_memexpapple_device, "a2memexp", "Apple II Memory Expansion Card")
+DEFINE_DEVICE_TYPE(A2BUS_RAMFACTOR, a2bus_ramfactor_device, "a2ramfac", "Applied Engineering RamFactor")
#define MEMEXP_ROM_REGION "memexp_rom"
@@ -73,14 +73,14 @@ const tiny_rom_entry *a2bus_ramfactor_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_isramfactor(false), m_bankhior(0), m_addrmask(0), m_rom(nullptr), m_wptr(0), m_liveptr(0)
{
}
a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock, "a2memexp", __FILE__)
+ a2bus_memexp_device(mconfig, A2BUS_MEMEXP, tag, owner, clock)
{
m_isramfactor = false;
m_bankhior = 0xf0;
@@ -88,7 +88,7 @@ a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig
}
a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock, "a2ramfac", __FILE__)
+ a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, tag, owner, clock)
{
m_isramfactor = true;
m_bankhior = 0x00;
diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h
index 554ff0c0c13..d3b4e76ef16 100644
--- a/src/devices/bus/a2bus/a2memexp.h
+++ b/src/devices/bus/a2bus/a2memexp.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_MEMEXP__
-#define __A2BUS_MEMEXP__
+#ifndef MAME_BUS_A2BUS_A2MEMEXP_H
+#define MAME_BUS_A2BUS_A2MEMEXP_H
+
+#pragma once
#include "a2bus.h"
@@ -22,9 +24,6 @@ class a2bus_memexp_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -34,6 +33,9 @@ public:
int m_addrmask;
protected:
+ // construction/destruction
+ a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -65,7 +67,7 @@ public:
};
// device type definition
-extern const device_type A2BUS_MEMEXP;
-extern const device_type A2BUS_RAMFACTOR;
+DECLARE_DEVICE_TYPE(A2BUS_MEMEXP, a2bus_memexpapple_device)
+DECLARE_DEVICE_TYPE(A2BUS_RAMFACTOR, a2bus_ramfactor_device)
-#endif /* __A2BUS_MEMEXP__ */
+#endif // MAME_BUS_A2BUS_A2MEMEXP_H
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index f8a9df64e8d..eff2cd8bcbf 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -22,7 +22,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MIDI = device_creator<a2bus_midi_device>;
+DEFINE_DEVICE_TYPE(A2BUS_MIDI, a2bus_midi_device, "a2midi", "6850 MIDI card")
#define MIDI_PTM_TAG "midi_ptm"
#define MIDI_ACIA_TAG "midi_acia"
@@ -60,16 +60,12 @@ machine_config_constructor a2bus_midi_device::device_mconfig_additions() const
//**************************************************************************
a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock, "a2midi", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_ptm(*this, MIDI_PTM_TAG),
- m_acia(*this, MIDI_ACIA_TAG), m_acia_irq(false),
- m_ptm_irq(false)
+ a2bus_midi_device(mconfig, A2BUS_MIDI, tag, owner, clock)
{
}
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_ptm(*this, MIDI_PTM_TAG),
m_acia(*this, MIDI_ACIA_TAG), m_acia_irq(false),
diff --git a/src/devices/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h
index 3442805ed49..7852dbea2f4 100644
--- a/src/devices/bus/a2bus/a2midi.h
+++ b/src/devices/bus/a2bus/a2midi.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_MIDI__
-#define __A2BUS_MIDI__
+#ifndef MAME_BUS_A2BUS_A2MIDI_H
+#define MAME_BUS_A2BUS_A2MIDI_H
+
+#pragma once
#include "a2bus.h"
#include "machine/6840ptm.h"
@@ -26,7 +28,6 @@ class a2bus_midi_device:
public:
// construction/destruction
a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -36,6 +37,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_acia_clock );
protected:
+ a2bus_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -50,6 +53,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_MIDI;
+DECLARE_DEVICE_TYPE(A2BUS_MIDI, a2bus_midi_device)
-#endif /* __A2BUS_MIDI__ */
+#endif // MAME_BUS_A2BUS_A2MIDI_H
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index 98c33c6fd09..9492b2f2060 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -30,9 +30,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_MOCKINGBOARD = device_creator<a2bus_mockingboard_device>;
-const device_type A2BUS_PHASOR = device_creator<a2bus_phasor_device>;
-const device_type A2BUS_ECHOPLUS = device_creator<a2bus_echoplus_device>;
+DEFINE_DEVICE_TYPE(A2BUS_MOCKINGBOARD, a2bus_mockingboard_device, "a2mockbd", "Sweet Micro Systems Mockingboard")
+DEFINE_DEVICE_TYPE(A2BUS_PHASOR, a2bus_phasor_device, "a2phasor", "Applied Engineering Phasor")
+DEFINE_DEVICE_TYPE(A2BUS_ECHOPLUS, a2bus_echoplus_device, "a2echop", "Street Electronics Echo Plus")
MACHINE_CONFIG_FRAGMENT( mockingboard )
MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727)
@@ -121,8 +121,8 @@ machine_config_constructor a2bus_echoplus_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_via1(*this, VIA1_TAG),
m_via2(*this, VIA2_TAG),
@@ -134,21 +134,21 @@ a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device
}
a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock, "a2mockbd", __FILE__)
+ a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, tag, owner, clock)
{
m_isPhasor = false;
m_PhasorNative = false;
}
a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock, "a2phasor", __FILE__)
+ a2bus_ayboard_device(mconfig, A2BUS_PHASOR, tag, owner, clock)
{
m_isPhasor = true;
m_PhasorNative = false;
}
a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock, "a2echop", __FILE__),
+ a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, tag, owner, clock),
m_tms(*this, E2P_TMS_TAG)
{
m_isPhasor = false;
diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h
index 279f06c0110..870e1dd2f15 100644
--- a/src/devices/bus/a2bus/a2mockingboard.h
+++ b/src/devices/bus/a2bus/a2mockingboard.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef __A2BUS_MOCKINGBOARD__
-#define __A2BUS_MOCKINGBOARD__
+#ifndef MAME_BUS_A2BUS_A2MOCKINGBOARD_H
+#define MAME_BUS_A2BUS_A2MOCKINGBOARD_H
#include "a2bus.h"
#include "machine/6522via.h"
@@ -25,9 +25,6 @@ class a2bus_ayboard_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,6 +36,9 @@ public:
DECLARE_WRITE8_MEMBER(via2_out_b);
protected:
+ // construction/destruction
+ a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -80,17 +80,18 @@ class a2bus_echoplus_device : public a2bus_ayboard_device
public:
a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual machine_config_constructor device_mconfig_additions() const override;
+
+protected:
virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<tms5220_device> m_tms;
-
- virtual machine_config_constructor device_mconfig_additions() const override;
};
// device type definition
-extern const device_type A2BUS_MOCKINGBOARD;
-extern const device_type A2BUS_PHASOR;
-extern const device_type A2BUS_ECHOPLUS;
+DECLARE_DEVICE_TYPE(A2BUS_MOCKINGBOARD, a2bus_mockingboard_device)
+DECLARE_DEVICE_TYPE(A2BUS_PHASOR, a2bus_phasor_device)
+DECLARE_DEVICE_TYPE(A2BUS_ECHOPLUS, a2bus_echoplus_device)
-#endif /* __A2BUS_MOCKINGBOARD__ */
+#endif // MAME_BUS_A2BUS_A2MOCKINGBOARD_H
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index d05842a7269..abe7554574f 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_PIC = device_creator<a2bus_pic_device>;
+DEFINE_DEVICE_TYPE(A2BUS_PIC, a2bus_pic_device, "a2pic", "Apple Parallel Interface Card")
#define PIC_ROM_REGION "pic_rom"
#define PIC_CENTRONICS_TAG "pic_ctx"
@@ -100,18 +100,12 @@ const tiny_rom_entry *a2bus_pic_device::device_rom_region() const
//**************************************************************************
a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_PIC, "Apple Parallel Interface Card", tag, owner, clock, "a2pic", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_dsw1(*this, "DSW1"),
- m_ctx(*this, PIC_CENTRONICS_TAG),
- m_ctx_data_in(*this, "ctx_data_in"),
- m_ctx_data_out(*this, "ctx_data_out"), m_rom(nullptr),
- m_started(false), m_ack(0), m_irqenable(false), m_autostrobe(false), m_timer(nullptr)
+ a2bus_pic_device(mconfig, A2BUS_PIC, tag, owner, clock)
{
}
-a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
m_ctx(*this, PIC_CENTRONICS_TAG),
diff --git a/src/devices/bus/a2bus/a2pic.h b/src/devices/bus/a2bus/a2pic.h
index 83ff5bd2fa4..fbc0c24a97e 100644
--- a/src/devices/bus/a2bus/a2pic.h
+++ b/src/devices/bus/a2bus/a2pic.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_PIC__
-#define __A2BUS_PIC__
+#ifndef MAME_BUS_A2BUS_A2PIC_H
+#define MAME_BUS_A2BUS_A2PIC_H
+
+#pragma once
#include "a2bus.h"
#include "bus/centronics/ctronics.h"
@@ -25,18 +27,17 @@ class a2bus_pic_device:
public:
// construction/destruction
a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
- required_ioport m_dsw1;
-
DECLARE_WRITE_LINE_MEMBER( ack_w );
protected:
+ a2bus_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -45,13 +46,15 @@ protected:
virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ void start_strobe();
+ void clear_strobe();
+
+ required_ioport m_dsw1;
+
required_device<centronics_device> m_ctx;
required_device<input_buffer_device> m_ctx_data_in;
required_device<output_latch_device> m_ctx_data_out;
- void start_strobe();
- void clear_strobe();
-
private:
uint8_t *m_rom;
bool m_started;
@@ -62,6 +65,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_PIC;
+DECLARE_DEVICE_TYPE(A2BUS_PIC, a2bus_pic_device)
-#endif /* __A2BUS_PIC__ */
+#endif // MAME_BUS_A2BUS_A2PIC_H
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index 322be844267..3dc70bb326a 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SAM = device_creator<a2bus_sam_device>;
+DEFINE_DEVICE_TYPE(A2BUS_SAM, a2bus_sam_device, "a2sam", "Don't Ask Software SAM")
MACHINE_CONFIG_FRAGMENT( a2sam )
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -49,7 +49,7 @@ machine_config_constructor a2bus_sam_device::device_mconfig_additions() const
//**************************************************************************
a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_SAM, "Don't Ask Software SAM", tag, owner, clock, "a2sam", __FILE__),
+ device_t(mconfig, A2BUS_SAM, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, "dac")
{
diff --git a/src/devices/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h
index 29777e42b60..49e6e40329d 100644
--- a/src/devices/bus/a2bus/a2sam.h
+++ b/src/devices/bus/a2bus/a2sam.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_SAM__
-#define __A2BUS_SAM__
+#ifndef MAME_BUS_A2BUS_A2SAM_H
+#define MAME_BUS_A2BUS_A2SAM_H
+
+#pragma once
#include "a2bus.h"
#include "sound/dac.h"
@@ -29,8 +31,6 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
- required_device<dac_byte_interface> m_dac;
-
protected:
virtual void device_start() override;
virtual void device_reset() override;
@@ -38,9 +38,11 @@ protected:
// overrides of standard a2bus slot functions
virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
+
+ required_device<dac_byte_interface> m_dac;
};
// device type definition
extern const device_type A2BUS_SAM;
-#endif /* __A2BUS_SAM__ */
+#endif // MAME_BUS_A2BUS_A2SAM_H
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index 00e0c27bb11..447a5867bb4 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -44,7 +44,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SCSI = device_creator<a2bus_scsi_device>;
+DEFINE_DEVICE_TYPE(A2BUS_SCSI, a2bus_scsi_device, "a2scsi", "Apple II SCSI Card")
#define SCSI_ROM_REGION "scsi_rom"
#define SCSI_BUS_TAG "scsibus"
@@ -106,8 +106,8 @@ const tiny_rom_entry *a2bus_scsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false)
@@ -115,10 +115,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type
}
a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock, "a2scsi", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_ncr5380(*this, SCSI_5380_TAG),
- m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false)
+ a2bus_scsi_device(mconfig, A2BUS_SCSI, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h
index 4d5fac99a20..35e60eaf89e 100644
--- a/src/devices/bus/a2bus/a2scsi.h
+++ b/src/devices/bus/a2bus/a2scsi.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_SCSI__
-#define __A2BUS_SCSI__
+#ifndef MAME_BUS_A2BUS_A2SCSI_H
+#define MAME_BUS_A2BUS_A2SCSI_H
+
+#pragma once
#include "a2bus.h"
#include "machine/ncr5380n.h"
@@ -24,19 +26,17 @@ class a2bus_scsi_device:
{
public:
// construction/destruction
- a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- required_device<ncr5380n_device> m_ncr5380;
- required_device<nscsi_bus_device> m_scsibus;
-
DECLARE_WRITE_LINE_MEMBER( drq_w );
protected:
+ a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,6 +48,9 @@ protected:
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
+ required_device<ncr5380n_device> m_ncr5380;
+ required_device<nscsi_bus_device> m_scsibus;
+
private:
uint8_t *m_rom;
uint8_t m_ram[8192]; // 8 banks of 1024 bytes
@@ -58,6 +61,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_SCSI;
+DECLARE_DEVICE_TYPE(A2BUS_SCSI, a2bus_scsi_device)
-#endif /* __A2BUS_SCSI__ */
+#endif // MAME_BUS_A2BUS_A2SCSI_H
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index 3051755dc0f..1d8cea0121e 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SOFTCARD = device_creator<a2bus_softcard_device>;
+DEFINE_DEVICE_TYPE(A2BUS_SOFTCARD, a2bus_softcard_device, "a2softcard", "Microsoft SoftCard")
#define Z80_TAG "z80"
@@ -51,17 +51,15 @@ machine_config_constructor a2bus_softcard_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false)
{
}
a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock, "a2softcard", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false)
+ a2bus_softcard_device(mconfig, A2BUS_SOFTCARD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h
index f8545e1ae6a..025686a6645 100644
--- a/src/devices/bus/a2bus/a2softcard.h
+++ b/src/devices/bus/a2bus/a2softcard.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef __A2BUS_SOFTCARD__
-#define __A2BUS_SOFTCARD__
+#ifndef MAME_BUS_A2BUS_A2SOFTCARD_H
+#define MAME_BUS_A2BUS_A2SOFTCARD_H
#include "a2bus.h"
@@ -23,7 +23,6 @@ class a2bus_softcard_device:
{
public:
// construction/destruction
- a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -33,6 +32,8 @@ public:
DECLARE_WRITE8_MEMBER( dma_w );
protected:
+ a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,6 +49,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_SOFTCARD;
+DECLARE_DEVICE_TYPE(A2BUS_SOFTCARD, a2bus_softcard_device)
-#endif /* __A2BUS_SOFTCARD__ */
+#endif // MAME_BUS_A2BUS_A2SOFTCARD_H
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index aa8f28f48be..b84a7f26881 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -21,7 +21,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SSC = device_creator<a2bus_ssc_device>;
+DEFINE_DEVICE_TYPE(A2BUS_SSC, a2bus_ssc_device, "a2ssc", "Apple Super Serial Card")
#define SSC_ROM_REGION "ssc_rom"
#define SSC_ACIA_TAG "ssc_acia"
@@ -129,17 +129,12 @@ const tiny_rom_entry *a2bus_ssc_device::device_rom_region() const
//**************************************************************************
a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_SSC, "Apple Super Serial Card", tag, owner, clock, "a2ssc", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_dsw1(*this, "DSW1"),
- m_dsw2(*this, "DSW2"),
- m_acia(*this, SSC_ACIA_TAG), m_rom(nullptr),
- m_started(false)
+ a2bus_ssc_device(mconfig, A2BUS_SSC, tag, owner, clock)
{
}
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
m_dsw2(*this, "DSW2"),
diff --git a/src/devices/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h
index b130012c52f..fdca90f9346 100644
--- a/src/devices/bus/a2bus/a2ssc.h
+++ b/src/devices/bus/a2bus/a2ssc.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef __A2BUS_SSC__
-#define __A2BUS_SSC__
+#ifndef MAME_BUS_A2BUS_A2SSC_H
+#define MAME_BUS_A2BUS_A2SSC_H
#include "a2bus.h"
#include "machine/mos6551.h"
@@ -25,18 +25,17 @@ class a2bus_ssc_device:
public:
// construction/destruction
a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
- required_ioport m_dsw1, m_dsw2;
-
DECLARE_WRITE_LINE_MEMBER( acia_irq_w );
protected:
+ a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -45,6 +44,8 @@ protected:
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ required_ioport m_dsw1, m_dsw2;
+
required_device<mos6551_device> m_acia;
private:
@@ -53,6 +54,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_SSC;
+DECLARE_DEVICE_TYPE(A2BUS_SSC, a2bus_ssc_device)
-#endif /* __A2BUS_SSC__ */
+#endif // MAME_BUS_A2BUS_A2SSC_H
diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp
index 8ccdf8bb928..1403120c74c 100644
--- a/src/devices/bus/a2bus/a2swyft.cpp
+++ b/src/devices/bus/a2bus/a2swyft.cpp
@@ -20,7 +20,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_SWYFT = device_creator<a2bus_swyft_device>;
+DEFINE_DEVICE_TYPE(A2BUS_SWYFT, a2bus_swyft_device, "a2swyft", "IAI SwyftCard")
#define SWYFT_ROM_REGION "swyft_rom"
@@ -45,13 +45,12 @@ const tiny_rom_entry *a2bus_swyft_device::device_rom_region() const
//**************************************************************************
a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "a2swyft", __FILE__),
- device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0)
+ a2bus_swyft_device(mconfig, A2BUS_SWYFT, tag, owner, clock)
{
}
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0)
{
}
diff --git a/src/devices/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h
index df646038aa9..0215c4623ab 100644
--- a/src/devices/bus/a2bus/a2swyft.h
+++ b/src/devices/bus/a2bus/a2swyft.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_SWYFT__
-#define __A2BUS_SWYFT__
+#ifndef MAME_BUS_A2BUS_A2SWYFT_H
+#define MAME_BUS_A2BUS_A2SWYFT_H
+
+#pragma once
#include "a2bus.h"
@@ -24,11 +26,12 @@ class a2bus_swyft_device:
public:
// construction/destruction
a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
+ a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -46,6 +49,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_SWYFT;
+DECLARE_DEVICE_TYPE(A2BUS_SWYFT, a2bus_swyft_device)
-#endif /* __A2BUS_SWYFT__ */
+#endif // MAME_BUS_A2BUS_A2SWYFT_H
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index dd935cf2554..27a3302d625 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -36,7 +36,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_THEMILL = device_creator<a2bus_themill_device>;
+DEFINE_DEVICE_TYPE(A2BUS_THEMILL, a2bus_themill_device, "a2themill", "Stellation Two The Mill")
#define M6809_TAG "m6809"
@@ -67,17 +67,15 @@ machine_config_constructor a2bus_themill_device::device_mconfig_additions() cons
// LIVE DEVICE
//**************************************************************************
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
{
}
a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock, "a2themill", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
+ a2bus_themill_device(mconfig, A2BUS_THEMILL, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h
index 67f9bc43c7a..aa0c2f180e2 100644
--- a/src/devices/bus/a2bus/a2themill.h
+++ b/src/devices/bus/a2bus/a2themill.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_THEMILL__
-#define __A2BUS_THEMILL__
+#ifndef MAME_BUS_A2BUS_A2THEMILL_H
+#define MAME_BUS_A2BUS_A2THEMILL_H
+
+#pragma once
#include "a2bus.h"
@@ -23,7 +25,6 @@ class a2bus_themill_device:
{
public:
// construction/destruction
- a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -33,6 +34,8 @@ public:
DECLARE_WRITE8_MEMBER( dma_w );
protected:
+ a2bus_themill_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -51,6 +54,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_THEMILL;
+DECLARE_DEVICE_TYPE(A2BUS_THEMILL, a2bus_themill_device)
-#endif /* __A2BUS_THEMILL__ */
+#endif // MAME_BUS_A2BUS_A2THEMILL_H
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index 18a6f22abf1..70642bbdfe8 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -36,7 +36,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_THUNDERCLOCK = device_creator<a2bus_thunderclock_device>;
+DEFINE_DEVICE_TYPE(A2BUS_THUNDERCLOCK, a2bus_thunderclock_device, "a2thunpl", "ThunderWare ThunderClock Plus")
#define THUNDERCLOCK_ROM_REGION "thunclk_rom"
#define THUNDERCLOCK_UPD1990_TAG "thunclk_upd"
@@ -77,17 +77,15 @@ const tiny_rom_entry *a2bus_thunderclock_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0)
{
}
a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock, "a2thunpl", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0)
+ a2bus_thunderclock_device(mconfig, A2BUS_THUNDERCLOCK, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h
index 8188ede7380..5c221151769 100644
--- a/src/devices/bus/a2bus/a2thunderclock.h
+++ b/src/devices/bus/a2bus/a2thunderclock.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_THUNDERCLOCK__
-#define __A2BUS_THUNDERCLOCK__
+#ifndef MAME_BUS_A2BUS_A2THUNDERCLOCK_H
+#define MAME_BUS_A2BUS_A2THUNDERCLOCK_H
+
+#pragma once
#include "a2bus.h"
#include "machine/upd1990a.h"
@@ -24,7 +26,6 @@ class a2bus_thunderclock_device:
{
public:
// construction/destruction
- a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -34,6 +35,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( upd_dataout_w );
protected:
+ a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -51,6 +54,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_THUNDERCLOCK;
+DECLARE_DEVICE_TYPE(A2BUS_THUNDERCLOCK, a2bus_thunderclock_device)
-#endif /* __A2BUS_THUNDERCLOCK__ */
+#endif // MAME_BUS_A2BUS_A2THUNDERCLOCK_H
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index 3edeeaf8cdd..8d8a576834a 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -40,8 +40,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ULTRATERM = device_creator<a2bus_ultraterm_device>;
-const device_type A2BUS_ULTRATERMENH = device_creator<a2bus_ultratermenh_device>;
+DEFINE_DEVICE_TYPE(A2BUS_ULTRATERM, a2bus_ultraterm_device, "a2ulttrm", "Videx UltraTerm (original)")
+DEFINE_DEVICE_TYPE(A2BUS_ULTRATERMENH, a2bus_ultratermenh_device, "a2ultrme", "Videx UltraTerm (enhanced //e)")
#define ULTRATERM_ROM_REGION "uterm_rom"
#define ULTRATERM_GFX_REGION "uterm_gfx"
@@ -139,20 +139,20 @@ const tiny_rom_entry *a2bus_ultratermenh_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), m_ctrl1(0), m_ctrl2(0),
m_crtc(*this, ULTRATERM_MC6845_NAME), m_rambank(0)
{
}
a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx160_device(mconfig, A2BUS_ULTRATERM, "Videx UltraTerm (original)", tag, owner, clock, "a2ulttrm", __FILE__)
+ a2bus_videx160_device(mconfig, A2BUS_ULTRATERM, tag, owner, clock)
{
}
a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx160_device(mconfig, A2BUS_ULTRATERMENH, "Videx UltraTerm (enhanced //e)", tag, owner, clock, "a2ultrme", __FILE__)
+ a2bus_videx160_device(mconfig, A2BUS_ULTRATERMENH, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h
index 3d9c3a67a52..73b012b63c3 100644
--- a/src/devices/bus/a2bus/a2ultraterm.h
+++ b/src/devices/bus/a2bus/a2ultraterm.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_ULTRATERM__
-#define __A2BUS_ULTRATERM__
+#ifndef MAME_BUS_A2BUS_A2ULTRATERM_H
+#define MAME_BUS_A2BUS_A2ULTRATERM_H
+
+#pragma once
#include "a2bus.h"
#include "video/mc6845.h"
@@ -23,21 +25,16 @@ class a2bus_videx160_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
MC6845_UPDATE_ROW(crtc_update_row);
- uint8_t *m_rom, *m_chrrom;
- uint8_t m_ram[256*16];
- int m_framecnt;
- uint8_t m_ctrl1, m_ctrl2;
-
protected:
+ // construction/destruction
+ a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -49,6 +46,11 @@ protected:
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
+ uint8_t *m_rom, *m_chrrom;
+ uint8_t m_ram[256*16];
+ int m_framecnt;
+ uint8_t m_ctrl1, m_ctrl2;
+
required_device<mc6845_device> m_crtc;
private:
@@ -72,7 +74,7 @@ public:
};
// device type definition
-extern const device_type A2BUS_ULTRATERM;
-extern const device_type A2BUS_ULTRATERMENH;
+DECLARE_DEVICE_TYPE(A2BUS_ULTRATERM, a2bus_ultraterm_device)
+DECLARE_DEVICE_TYPE(A2BUS_ULTRATERMENH, a2bus_ultratermenh_device)
-#endif /* __A2BUS_ULTRATERM__ */
+#endif // MAME_BUS_A2BUS_A2ULTRATERM_H
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 1cfb4552313..7bcea832ce0 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -36,12 +36,12 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_VIDEOTERM = device_creator<a2bus_videoterm_device>;
-const device_type A2BUS_IBSAP16 = device_creator<a2bus_ap16_device>;
-const device_type A2BUS_IBSAP16ALT = device_creator<a2bus_ap16alt_device>;
-const device_type A2BUS_VTC1 = device_creator<a2bus_vtc1_device>;
-const device_type A2BUS_VTC2 = device_creator<a2bus_vtc2_device>;
-const device_type A2BUS_AEVIEWMASTER80 = device_creator<a2bus_aevm80_device>;
+DEFINE_DEVICE_TYPE(A2BUS_VIDEOTERM, a2bus_videoterm_device, "a2vidtrm", "Videx VideoTerm")
+DEFINE_DEVICE_TYPE(A2BUS_IBSAP16, a2bus_ap16_device, "a2ap16", "IBS AP-16 80 column card")
+DEFINE_DEVICE_TYPE(A2BUS_IBSAP16ALT, a2bus_ap16alt_device, "a2ap16a", "IBS AP-16 80 column card (alt. version)")
+DEFINE_DEVICE_TYPE(A2BUS_VTC1, a2bus_vtc1_device, "a2vtc1", "Unknown VideoTerm clone #1")
+DEFINE_DEVICE_TYPE(A2BUS_VTC2, a2bus_vtc2_device, "a2vtc2", "Unknown VideoTerm clone #2")
+DEFINE_DEVICE_TYPE(A2BUS_AEVIEWMASTER80, a2bus_aevm80_device, "a2aevm80", "Applied Engineering Viewmaster 80")
#define VIDEOTERM_ROM_REGION "vterm_rom"
#define VIDEOTERM_GFX_REGION "vterm_gfx"
@@ -173,41 +173,41 @@ const tiny_rom_entry *a2bus_aevm80_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0),
- m_crtc(*this, VIDEOTERM_MC6845_NAME), m_rambank(0),
- m_palette(*this, ":palette")
+ m_crtc(*this, VIDEOTERM_MC6845_NAME), m_palette(*this, ":palette"),
+ m_rambank(0)
{
}
a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock, "a2vidtrm", __FILE__)
+ a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, tag, owner, clock)
{
}
a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock, "a2ap16", __FILE__)
+ a2bus_videx80_device(mconfig, A2BUS_IBSAP16, tag, owner, clock)
{
}
a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock, "a2ap16a", __FILE__)
+ a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, tag, owner, clock)
{
}
a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock, "a2vtc1", __FILE__)
+ a2bus_videx80_device(mconfig, A2BUS_VTC1, tag, owner, clock)
{
}
a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock, "a2vtc2", __FILE__)
+ a2bus_videx80_device(mconfig, A2BUS_VTC2, tag, owner, clock)
{
}
a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_videx80_device(mconfig, A2BUS_AEVIEWMASTER80, "Applied Engineering Viewmaster 80", tag, owner, clock, "a2aevm80", __FILE__)
+ a2bus_videx80_device(mconfig, A2BUS_AEVIEWMASTER80, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h
index 5f78b7fe91f..f9d407f785a 100644
--- a/src/devices/bus/a2bus/a2videoterm.h
+++ b/src/devices/bus/a2bus/a2videoterm.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_VIDEOTERM__
-#define __A2BUS_VIDEOTERM__
+#ifndef MAME_BUS_A2BUS_A2VIDEOTERM_H
+#define MAME_BUS_A2BUS_A2VIDEOTERM_H
+
+#pragma once
#include "a2bus.h"
#include "video/mc6845.h"
@@ -23,20 +25,16 @@ class a2bus_videx80_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
MC6845_UPDATE_ROW(crtc_update_row);
- uint8_t *m_rom, *m_chrrom;
- uint8_t m_ram[512*4];
- int m_framecnt;
-
protected:
+ // construction/destruction
+ a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,12 +46,15 @@ protected:
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
+ uint8_t *m_rom, *m_chrrom;
+ uint8_t m_ram[512*4];
+ int m_framecnt;
+
required_device<mc6845_device> m_crtc;
+ required_device<palette_device> m_palette;
private:
int m_rambank;
-public:
- required_device<palette_device> m_palette;
};
class a2bus_videoterm_device : public a2bus_videx80_device
@@ -71,6 +72,7 @@ public:
virtual const tiny_rom_entry *device_rom_region() const override;
+protected:
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
};
@@ -82,6 +84,7 @@ public:
virtual const tiny_rom_entry *device_rom_region() const override;
+protected:
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
};
@@ -110,11 +113,11 @@ public:
};
// device type definition
-extern const device_type A2BUS_VIDEOTERM;
-extern const device_type A2BUS_IBSAP16;
-extern const device_type A2BUS_IBSAP16ALT;
-extern const device_type A2BUS_VTC1;
-extern const device_type A2BUS_VTC2;
-extern const device_type A2BUS_AEVIEWMASTER80;
-
-#endif /* __A2BUS_VIDEOTERM__ */
+DECLARE_DEVICE_TYPE(A2BUS_VIDEOTERM, a2bus_videoterm_device)
+DECLARE_DEVICE_TYPE(A2BUS_IBSAP16, a2bus_ap16_device)
+DECLARE_DEVICE_TYPE(A2BUS_IBSAP16ALT, a2bus_ap16alt_device)
+DECLARE_DEVICE_TYPE(A2BUS_VTC1, a2bus_vtc1_device)
+DECLARE_DEVICE_TYPE(A2BUS_VTC2, a2bus_vtc2_device)
+DECLARE_DEVICE_TYPE(A2BUS_AEVIEWMASTER80, a2bus_aevm80_device)
+
+#endif // MAME_BUS_A2BUS_A2VIDEOTERM_H
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 585a9eadff0..0e0d24f2464 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -62,8 +62,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_VULCAN = device_creator<a2bus_vulcan_device>;
-const device_type A2BUS_VULCANGOLD = device_creator<a2bus_vulcangold_device>;
+DEFINE_DEVICE_TYPE(A2BUS_VULCAN, a2bus_vulcan_device, "a2vulcan", "Applied Engineering Vulcan IDE controller")
+DEFINE_DEVICE_TYPE(A2BUS_VULCANGOLD, a2bus_vulcangold_device, "a2vulgld", "Applied Engineering Vulcan Gold IDE controller")
#define VULCAN_ROM_REGION "vulcan_rom"
#define VULCAN_ATA_TAG "vulcan_ata"
@@ -114,20 +114,20 @@ const tiny_rom_entry *a2bus_vulcangold_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_ata(*this, VULCAN_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_rombank(0), m_rambank(0), m_last_read_was_0(false)
{
}
a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock, "a2vulcan", __FILE__)
+ a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, tag, owner, clock)
{
}
a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_vulcanbase_device(mconfig, A2BUS_VULCANGOLD, "Applied Engineering Vulcan Gold IDE controller", tag, owner, clock, "a2vulgld", __FILE__)
+ a2bus_vulcanbase_device(mconfig, A2BUS_VULCANGOLD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h
index bd2acab26b4..ebb3d75f551 100644
--- a/src/devices/bus/a2bus/a2vulcan.h
+++ b/src/devices/bus/a2bus/a2vulcan.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_VULCAN__
-#define __A2BUS_VULCAN__
+#ifndef MAME_BUS_A2BUS_VULCAN_H
+#define MAME_BUS_A2BUS_VULCAN_H
+
+#pragma once
#include "a2bus.h"
#include "machine/ataintf.h"
@@ -23,13 +25,13 @@ class a2bus_vulcanbase_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
+ // construction/destruction
+ a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -71,7 +73,7 @@ public:
};
// device type definition
-extern const device_type A2BUS_VULCAN;
-extern const device_type A2BUS_VULCANGOLD;
+DECLARE_DEVICE_TYPE(A2BUS_VULCAN, a2bus_vulcan_device)
+DECLARE_DEVICE_TYPE(A2BUS_VULCANGOLD, a2bus_vulcangold_device)
-#endif /* __A2BUS_VULCAN__ */
+#endif // MAME_BUS_A2BUS_VULCAN_H
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index a3220476cda..4c65ac8ec0f 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -28,7 +28,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_ZIPDRIVE = device_creator<a2bus_zipdrive_device>;
+DEFINE_DEVICE_TYPE(A2BUS_ZIPDRIVE, a2bus_zipdrive_device, "a2zipdrv", "Zip Technologies ZipDrive")
#define ZIPDRIVE_ROM_REGION "zipdrive_rom"
#define ZIPDRIVE_ATA_TAG "zipdrive_ata"
@@ -69,15 +69,15 @@ const tiny_rom_entry *a2bus_zipdrivebase_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_ata(*this, ZIPDRIVE_ATA_TAG), m_rom(nullptr), m_lastdata(0)
{
}
a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock, "a2zipdrv", __FILE__)
+ a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h
index 3878c4b7bf0..12b7e6bb574 100644
--- a/src/devices/bus/a2bus/a2zipdrive.h
+++ b/src/devices/bus/a2bus/a2zipdrive.h
@@ -10,8 +10,10 @@
*********************************************************************/
-#ifndef __A2BUS_ZIPDRIVE__
-#define __A2BUS_ZIPDRIVE__
+#ifndef MAME_BUS_A2BUS_ZIPDRIVE_H
+#define MAME_BUS_A2BUS_ZIPDRIVE_H
+
+#pragma once
#include "a2bus.h"
#include "machine/ataintf.h"
@@ -25,14 +27,14 @@ class a2bus_zipdrivebase_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
+ // construction/destruction
+ a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -57,6 +59,6 @@ public:
};
// device type definition
-extern const device_type A2BUS_ZIPDRIVE;
+DECLARE_DEVICE_TYPE(A2BUS_ZIPDRIVE, a2bus_zipdrive_device)
-#endif /* __A2BUS_ZIPDRIVE__ */
+#endif // MAME_BUS_A2BUS_ZIPDRIVE_H
diff --git a/src/devices/bus/a2bus/agat7langcard.cpp b/src/devices/bus/a2bus/agat7langcard.cpp
index fba82f8dcd2..9bb00b38c60 100644
--- a/src/devices/bus/a2bus/agat7langcard.cpp
+++ b/src/devices/bus/a2bus/agat7langcard.cpp
@@ -18,7 +18,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_AGAT7LANGCARD = device_creator<a2bus_agat7langcard_device>;
+DEFINE_DEVICE_TYPE(A2BUS_AGAT7LANGCARD, a2bus_agat7langcard_device, "a7lang", "Agat-7 32K Language Card")
/***************************************************************************
FUNCTION PROTOTYPES
@@ -28,15 +28,14 @@ const device_type A2BUS_AGAT7LANGCARD = device_creator<a2bus_agat7langcard_devic
// LIVE DEVICE
//**************************************************************************
-a2bus_agat7langcard_device::a2bus_agat7langcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_agat7langcard_device::a2bus_agat7langcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
{
}
a2bus_agat7langcard_device::a2bus_agat7langcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_AGAT7LANGCARD, "Agat-7 32K Language Card", tag, owner, clock, "a7lang", __FILE__),
- device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
+ a2bus_agat7langcard_device(mconfig, A2BUS_AGAT7LANGCARD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/agat7langcard.h b/src/devices/bus/a2bus/agat7langcard.h
index ea7b80e5075..13647abfb11 100644
--- a/src/devices/bus/a2bus/agat7langcard.h
+++ b/src/devices/bus/a2bus/agat7langcard.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_AGAT7LANGCARD__
-#define __A2BUS_AGAT7LANGCARD__
+#ifndef MAME_BUS_A2BUS_AGAT7LANGCARD_H
+#define MAME_BUS_A2BUS_AGAT7LANGCARD_H
+
+#pragma once
#include "emu.h"
#include "a2bus.h"
@@ -24,10 +26,11 @@ class a2bus_agat7langcard_device:
{
public:
// construction/destruction
- a2bus_agat7langcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_agat7langcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
+ a2bus_agat7langcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -53,5 +56,6 @@ private:
// device type definition
extern const device_type A2BUS_AGAT7LANGCARD;
+DECLARE_DEVICE_TYPE(A2BUS_AGAT7LANGCARD, a2bus_agat7langcard_device)
-#endif /* __A2BUS_AGAT7LANGCARD__ */
+#endif // MAME_BUS_A2BUS_AGAT7LANGCARD_H
diff --git a/src/devices/bus/a2bus/agat7ram.cpp b/src/devices/bus/a2bus/agat7ram.cpp
index 694d6c65daa..dde0260db3f 100644
--- a/src/devices/bus/a2bus/agat7ram.cpp
+++ b/src/devices/bus/a2bus/agat7ram.cpp
@@ -18,7 +18,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_AGAT7RAM = device_creator<a2bus_agat7ram_device>;
+DEFINE_DEVICE_TYPE(A2BUS_AGAT7RAM, a2bus_agat7ram_device, "a7ram", "Agat-7 32K RAM Card")
/***************************************************************************
FUNCTION PROTOTYPES
@@ -28,15 +28,14 @@ const device_type A2BUS_AGAT7RAM = device_creator<a2bus_agat7ram_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_agat7ram_device::a2bus_agat7ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_agat7ram_device::a2bus_agat7ram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_main_bank(0)
{
}
a2bus_agat7ram_device::a2bus_agat7ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_AGAT7RAM, "Agat-7 32K RAM Card", tag, owner, clock, "a7ram", __FILE__),
- device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_main_bank(0)
+ a2bus_agat7ram_device(mconfig, A2BUS_AGAT7RAM, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/agat7ram.h b/src/devices/bus/a2bus/agat7ram.h
index 451efb08e3e..e30aaf7b94b 100644
--- a/src/devices/bus/a2bus/agat7ram.h
+++ b/src/devices/bus/a2bus/agat7ram.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_AGAT7RAM__
-#define __A2BUS_AGAT7RAM__
+#ifndef MAME_BUS_A2BUS_AGAT7RAM_H
+#define MAME_BUS_A2BUS_AGAT7RAM_H
+
+#pragma once
#include "emu.h"
#include "a2bus.h"
@@ -24,10 +26,11 @@ class a2bus_agat7ram_device:
{
public:
// construction/destruction
- a2bus_agat7ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_agat7ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
+ a2bus_agat7ram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -50,6 +53,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_AGAT7RAM;
+DECLARE_DEVICE_TYPE(A2BUS_AGAT7RAM, a2bus_agat7ram_device)
-#endif /* __A2BUS_AGAT7RAM__ */
+#endif // MAME_BUS_A2BUS_AGAT7RAM_H
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index e6badc3238a..c69315fabf2 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -22,7 +22,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CORVFDC01 = device_creator<a2bus_corvfdc01_device>;
+DEFINE_DEVICE_TYPE(A2BUS_CORVFDC01, a2bus_corvfdc01_device, "crvfdc01", "Corvus Systems Floppy Controller")
#define FDC01_ROM_REGION "fdc01_rom"
#define FDC01_FDC_TAG "fdc01_fdc"
@@ -111,25 +111,20 @@ const tiny_rom_entry *a2bus_corvfdc01_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_wdfdc(*this, FDC01_FDC_TAG),
m_con1(*this, FDC01_FDC_TAG":0"),
m_con2(*this, FDC01_FDC_TAG":1"),
m_con3(*this, FDC01_FDC_TAG":2"),
- m_con4(*this, FDC01_FDC_TAG":3"), m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_curfloppy(nullptr)
+ m_con4(*this, FDC01_FDC_TAG":3"),
+ m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_curfloppy(nullptr)
{
}
a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_CORVFDC01, "Corvus Systems Floppy Controller", tag, owner, clock, "crvfdc01", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_wdfdc(*this, FDC01_FDC_TAG),
- m_con1(*this, FDC01_FDC_TAG":0"),
- m_con2(*this, FDC01_FDC_TAG":1"),
- m_con3(*this, FDC01_FDC_TAG":2"),
- m_con4(*this, FDC01_FDC_TAG":3"), m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_curfloppy(nullptr)
+ a2bus_corvfdc01_device(mconfig, A2BUS_CORVFDC01, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
index 63953dd0acb..fc5395087de 100644
--- a/src/devices/bus/a2bus/corvfdc01.h
+++ b/src/devices/bus/a2bus/corvfdc01.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_CORVFDC01__
-#define __A2BUS_CORVFDC01__
+#ifndef MAME_BUS_A2BUS_CORVFDC01_H
+#define MAME_BUS_A2BUS_CORVFDC01_H
+
+#pragma once
#include "a2bus.h"
#include "machine/wd_fdc.h"
@@ -25,7 +27,6 @@ class a2bus_corvfdc01_device:
{
public:
// construction/destruction
- a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -38,6 +39,8 @@ public:
DECLARE_FLOPPY_FORMATS(corv_floppy_formats);
protected:
+ a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -46,7 +49,7 @@ protected:
virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
- required_device<fd1793_t> m_wdfdc;
+ required_device<fd1793_device> m_wdfdc;
required_device<floppy_connector> m_con1;
required_device<floppy_connector> m_con2;
required_device<floppy_connector> m_con3;
@@ -59,6 +62,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_CORVFDC01;
+DECLARE_DEVICE_TYPE(A2BUS_CORVFDC01, a2bus_corvfdc01_device)
-#endif /* __A2BUS_CORVFDC01__ */
+#endif // MAME_BUS_A2BUS_CORVFDC01_H
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index a65726629cb..f87d793ceb5 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -24,7 +24,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_CORVFDC02 = device_creator<a2bus_corvfdc02_device>;
+DEFINE_DEVICE_TYPE(A2BUS_CORVFDC02, a2bus_corvfdc02_device, "crvfdc02", "Corvus Systems Buffered Floppy Controller")
#define FDC02_ROM_REGION "fdc02_rom"
#define FDC02_FDC_TAG "fdc02_fdc"
@@ -81,8 +81,8 @@ const tiny_rom_entry *a2bus_corvfdc02_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_fdc(*this, FDC02_FDC_TAG),
m_con1(*this, FDC02_FDC_TAG":0"),
@@ -93,13 +93,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, de
}
a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_CORVFDC02, "Corvus Systems Buffered Floppy Controller", tag, owner, clock, "crvfdc02", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_fdc(*this, FDC02_FDC_TAG),
- m_con1(*this, FDC02_FDC_TAG":0"),
- m_con2(*this, FDC02_FDC_TAG":1"),
- m_con3(*this, FDC02_FDC_TAG":2"),
- m_con4(*this, FDC02_FDC_TAG":3"), m_rom(nullptr), m_fdc_local_status(0), m_fdc_local_command(0), m_bufptr(0), m_curfloppy(nullptr), m_in_drq(false), m_timer(nullptr)
+ a2bus_corvfdc02_device(mconfig, A2BUS_CORVFDC02, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
index f6d5d1885ef..089e3c5cc01 100644
--- a/src/devices/bus/a2bus/corvfdc02.h
+++ b/src/devices/bus/a2bus/corvfdc02.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_CORVFDC02__
-#define __A2BUS_CORVFDC02__
+#ifndef MAME_BUS_A2BUS_CORVFDC02_H
+#define MAME_BUS_A2BUS_CORVFDC02_H
+
+#pragma once
#include "a2bus.h"
#include "machine/upd765.h"
@@ -25,7 +27,6 @@ class a2bus_corvfdc02_device:
{
public:
// construction/destruction
- a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -38,6 +39,8 @@ public:
DECLARE_FLOPPY_FORMATS(corv_floppy_formats);
protected:
+ a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -64,6 +67,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_CORVFDC02;
+DECLARE_DEVICE_TYPE(A2BUS_CORVFDC02, a2bus_corvfdc02_device)
-#endif /* __A2BUS_CORVFDC02__ */
+#endif // MAME_BUS_A2BUS_CORVFDC02_H
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index 49cae2b14e8..1fc3ede7399 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -25,9 +25,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_EZCGI = device_creator<a2bus_ezcgi_device>;
-const device_type A2BUS_EZCGI_9938 = device_creator<a2bus_ezcgi_9938_device>;
-const device_type A2BUS_EZCGI_9958 = device_creator<a2bus_ezcgi_9958_device>;
+DEFINE_DEVICE_TYPE(A2BUS_EZCGI, a2bus_ezcgi_device, "a2ezcgi", "E-Z Color Graphics Interface")
+DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9938, a2bus_ezcgi_9938_device, "a2ezcgi3", "E-Z Color Graphics Interface (TMS9938)")
+DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9958, a2bus_ezcgi_9958_device, "a2ezcgi5", "E-Z Color Graphics Interface (TMS9958)")
MACHINE_CONFIG_FRAGMENT( ezcgi )
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
@@ -97,42 +97,36 @@ machine_config_constructor a2bus_ezcgi_9958_device::device_mconfig_additions() c
//**************************************************************************
a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_EZCGI, "E-Z Color Graphics Interface", tag, owner, clock, "a2ezcgi", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_tms(*this, TMS_TAG)
+ a2bus_ezcgi_device(mconfig, A2BUS_EZCGI, tag, owner, clock)
{
}
-a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_EZCGI_9938, "E-Z Color Graphics Interface (TMS9938)", tag, owner, clock, "a2ezcgi3", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_tms(*this, TMS_TAG)
+ a2bus_ezcgi_9938_device(mconfig, A2BUS_EZCGI_9938, tag, owner, clock)
{
}
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_EZCGI_9958, "E-Z Color Graphics Interface (TMS9958)", tag, owner, clock, "a2ezcgi5", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_tms(*this, TMS_TAG)
+ a2bus_ezcgi_9958_device(mconfig, A2BUS_EZCGI_9958, tag, owner, clock)
{
}
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h
index 095c3da9beb..fe8ded273c3 100644
--- a/src/devices/bus/a2bus/ezcgi.h
+++ b/src/devices/bus/a2bus/ezcgi.h
@@ -10,8 +10,10 @@
*********************************************************************/
-#ifndef __A2BUS_EZCGI__
-#define __A2BUS_EZCGI__
+#ifndef MAME_BUS_A2BUS_A2EZCGI_H
+#define MAME_BUS_A2BUS_A2EZCGI_H
+
+#pragma once
#include "a2bus.h"
#include "video/tms9928a.h"
@@ -28,7 +30,6 @@ class a2bus_ezcgi_device:
public:
// construction/destruction
a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -36,6 +37,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( tms_irq_w );
protected:
+ a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -53,7 +56,6 @@ class a2bus_ezcgi_9938_device:
public:
// construction/destruction
a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -61,6 +63,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( tms_irq_w );
protected:
+ a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -78,7 +82,6 @@ class a2bus_ezcgi_9958_device:
public:
// construction/destruction
a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -86,6 +89,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( tms_irq_w );
protected:
+ a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -97,8 +102,8 @@ protected:
};
// device type definition
-extern const device_type A2BUS_EZCGI;
-extern const device_type A2BUS_EZCGI_9938;
-extern const device_type A2BUS_EZCGI_9958;
+DECLARE_DEVICE_TYPE(A2BUS_EZCGI, a2bus_ezcgi_device)
+DECLARE_DEVICE_TYPE(A2BUS_EZCGI_9938, a2bus_ezcgi_9938_device)
+DECLARE_DEVICE_TYPE(A2BUS_EZCGI_9958, a2bus_ezcgi_9958_device)
-#endif /* __A2BUS_EZCGI__ */
+#endif // MAME_BUS_A2BUS_A2EZCGI_H
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index 4cfe11e52ec..947f9df5b5f 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_LASER128 = device_creator<a2bus_laser128_device>;
+DEFINE_DEVICE_TYPE(A2BUS_LASER128, a2bus_laser128_device, "a2laser128", "VTech Laser 128 Internal Device")
MACHINE_CONFIG_FRAGMENT( a2laser128 )
MACHINE_CONFIG_END
@@ -42,16 +42,15 @@ machine_config_constructor a2bus_laser128_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
{
}
a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "a2laser128", __FILE__),
- device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
+ a2bus_laser128_device(mconfig, A2BUS_LASER128, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h
index 22733ea94fa..c324911ea37 100644
--- a/src/devices/bus/a2bus/laser128.h
+++ b/src/devices/bus/a2bus/laser128.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_LASER128__
-#define __A2BUS_LASER128__
+#ifndef MAME_BUS_A2BUS_LASER128_H
+#define MAME_BUS_A2BUS_LASER128_H
+
+#pragma once
#include "a2bus.h"
@@ -23,13 +25,14 @@ class a2bus_laser128_device:
{
public:
// construction/destruction
- a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
+ a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,6 +51,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_LASER128;
+DECLARE_DEVICE_TYPE(A2BUS_LASER128, a2bus_laser128_device)
-#endif /* __A2BUS_LASER128__ */
+#endif // MAME_BUS_A2BUS_LASER128_H
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index c332fce3d65..5380df8894c 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -83,7 +83,7 @@
GLOBAL VARIABLES
***************************************************************************/
-const device_type A2BUS_MOUSE = device_creator<a2bus_mouse_device>;
+DEFINE_DEVICE_TYPE(A2BUS_MOUSE, a2bus_mouse_device, "a2mouse", "Apple II Mouse Card")
static MACHINE_CONFIG_FRAGMENT( mouse )
MCFG_CPU_ADD(MOUSE_MCU_TAG, M68705P3, 2043600)
@@ -161,8 +161,8 @@ const tiny_rom_entry *a2bus_mouse_device::device_rom_region() const
LIVE DEVICE
***************************************************************************/
-a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_pia(*this, MOUSE_PIA_TAG),
m_mcu(*this, MOUSE_MCU_TAG),
@@ -175,7 +175,7 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_typ
}
a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_mouse_device(mconfig, A2BUS_MOUSE, "Apple II Mouse Card", tag, owner, clock, "a2mouse", __FILE__)
+ a2bus_mouse_device(mconfig, A2BUS_MOUSE, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h
index 97a9c00059b..b20513bc4d0 100644
--- a/src/devices/bus/a2bus/mouse.h
+++ b/src/devices/bus/a2bus/mouse.h
@@ -11,6 +11,8 @@
#ifndef MAME_DEVICES_A2BUS_MOUSE_H
#define MAME_DEVICES_A2BUS_MOUSE_H
+#pragma once
+
#include "a2bus.h"
#include "machine/6821pia.h"
#include "cpu/m6805/m68705.h"
@@ -25,7 +27,6 @@ class a2bus_mouse_device:
{
public:
// construction/destruction
- a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -45,6 +46,8 @@ public:
DECLARE_WRITE8_MEMBER(mcu_port_c_w);
protected:
+ a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 158475219bc..f5f267cd883 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -89,7 +89,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_PCXPORTER = device_creator<a2bus_pcxporter_device>;
+DEFINE_DEVICE_TYPE(A2BUS_PCXPORTER, a2bus_pcxporter_device, "a2pcxport", "Applied Engineering PC Transporter")
static ADDRESS_MAP_START( pc_map, AS_PROGRAM, 16, a2bus_pcxporter_device )
ADDRESS_MAP_UNMAP_HIGH
@@ -183,8 +183,8 @@ machine_config_constructor a2bus_pcxporter_device::device_mconfig_additions() co
// LIVE DEVICE
//**************************************************************************
-a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_v30(*this, "v30"),
m_pic8259(*this, "pic8259"),
@@ -197,15 +197,7 @@ a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, de
}
a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_PCXPORTER, "Applied Engineering PC Transporter", tag, owner, clock, "a2pcxport", __FILE__),
- device_a2bus_card_interface(mconfig, *this),
- m_v30(*this, "v30"),
- m_pic8259(*this, "pic8259"),
- m_dma8237(*this, "dma8237"),
- m_pit8253(*this, "pit8253"),
- m_speaker(*this, "speaker"),
- m_isabus(*this, "isa"),
- m_pc_kbdc(*this, "pc_kbdc")
+ a2bus_pcxporter_device(mconfig, A2BUS_PCXPORTER, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h
index 49221a28ce9..5b990adc5a2 100644
--- a/src/devices/bus/a2bus/pc_xporter.h
+++ b/src/devices/bus/a2bus/pc_xporter.h
@@ -8,6 +8,9 @@
*********************************************************************/
+#ifndef MAME_BUS_A2BUS_PC_XPORTER_H
+#define MAME_BUS_A2BUS_PC_XPORTER_H
+
#pragma once
#include "a2bus.h"
@@ -33,7 +36,6 @@ class a2bus_pcxporter_device:
{
public:
// construction/destruction
- a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
@@ -41,14 +43,6 @@ public:
DECLARE_READ16_MEMBER(pc_bios_r);
- required_device<v30_device> m_v30;
- required_device<pic8259_device> m_pic8259;
- required_device<am9517a_device> m_dma8237;
- required_device<pit8253_device> m_pit8253;
- required_device<speaker_sound_device> m_speaker;
- required_device<isa8_device> m_isabus;
- optional_device<pc_kbdc_device> m_pc_kbdc;
-
// overrides of standard a2bus slot functions
virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
@@ -57,16 +51,6 @@ public:
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
- uint8_t m_u73_q2;
- uint8_t m_out1;
- int m_dma_channel;
- uint8_t m_dma_offset[4];
- uint8_t m_pc_spkrdata;
- uint8_t m_pit_out2;
- bool m_cur_eop;
-
- uint8_t m_nmi_enabled;
-
// interface to the keyboard
DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w );
DECLARE_WRITE_LINE_MEMBER( keyboard_data_w );
@@ -98,9 +82,29 @@ public:
DECLARE_WRITE8_MEMBER(nmi_enable_w);
protected:
+ a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
+ required_device<v30_device> m_v30;
+ required_device<pic8259_device> m_pic8259;
+ required_device<am9517a_device> m_dma8237;
+ required_device<pit8253_device> m_pit8253;
+ required_device<speaker_sound_device> m_speaker;
+ required_device<isa8_device> m_isabus;
+ optional_device<pc_kbdc_device> m_pc_kbdc;
+
+ uint8_t m_u73_q2;
+ uint8_t m_out1;
+ int m_dma_channel;
+ uint8_t m_dma_offset[4];
+ uint8_t m_pc_spkrdata;
+ uint8_t m_pit_out2;
+ bool m_cur_eop;
+
+ uint8_t m_nmi_enabled;
+
private:
uint8_t m_ram[768*1024];
uint8_t m_c800_ram[0x400];
@@ -116,3 +120,5 @@ private:
// device type definition
extern const device_type A2BUS_PCXPORTER;
+
+#endif // MAME_BUS_A2BUS_PC_XPORTER_H
diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp
index 6697c6ac9ab..b98d2edfad9 100644
--- a/src/devices/bus/a2bus/ramcard128k.cpp
+++ b/src/devices/bus/a2bus/ramcard128k.cpp
@@ -19,7 +19,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type A2BUS_RAMCARD128K = device_creator<a2bus_ssramcard_device>;
+DEFINE_DEVICE_TYPE(A2BUS_RAMCARD128K, a2bus_ssramcard_device, "ssram128", "Saturn Systems 128K Extended Language Card")
/***************************************************************************
FUNCTION PROTOTYPES
@@ -29,15 +29,14 @@ const device_type A2BUS_RAMCARD128K = device_creator<a2bus_ssramcard_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
+a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock), device_a2bus_card_interface(mconfig, *this),
+ m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
{
}
a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, A2BUS_RAMCARD128K, "Saturn Systems 128K Extended Language Card", tag, owner, clock, "ssram128", __FILE__),
- device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
+ a2bus_ssramcard_device(mconfig, A2BUS_RAMCARD128K, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h
index 922bebbb730..a6ac119f200 100644
--- a/src/devices/bus/a2bus/ramcard128k.h
+++ b/src/devices/bus/a2bus/ramcard128k.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_RAMCARD128K__
-#define __A2BUS_RAMCARD128K__
+#ifndef MAME_BUS_A2BUS_RAMCARD128K_H
+#define MAME_BUS_A2BUS_RAMCARD128K_H
+
+#pragma once
#include "a2bus.h"
@@ -23,10 +25,11 @@ class a2bus_ssramcard_device:
{
public:
// construction/destruction
- a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
+ a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -50,6 +53,6 @@ private:
};
// device type definition
-extern const device_type A2BUS_RAMCARD128K;
+DECLARE_DEVICE_TYPE(A2BUS_RAMCARD128K, a2bus_ssramcard_device)
-#endif /* __A2BUS_RAMCARD128K__ */
+#endif // MAME_BUS_A2BUS_RAMCARD128K_H
diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp
index 3feb4a62bd3..d80bc9f4f6c 100644
--- a/src/devices/bus/a2bus/ramcard16k.cpp
+++ b/