From 6c23897483a0201dd0b65b450253fd9bf8fb8723 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Feb 2017 22:16:07 +1100 Subject: Self-registering devices prep: * Make device_creator a variable template and get rid of the ampersands * Remove screen.h and speaker.h from emu.h and add where necessary * Centralise instantiations of screen and speaker finder templates * Add/standardise #include guards in many hearers * Remove many redundant #includes * Order #includesr to help catch headers that can't be #included alone (nw) This changes #include order to be prefix, unit header if applicable then other stuff roughly in order from most dependent to least dependent library. This helps catch headers that don't #include things that they use. --- scripts/src/bus.lua | 1 + scripts/src/sound.lua | 6 +- src/devices/bus/a1bus/a1bus.cpp | 4 +- src/devices/bus/a1bus/a1cassette.cpp | 2 +- src/devices/bus/a1bus/a1cffa.cpp | 2 +- src/devices/bus/a2bus/a2alfam2.cpp | 5 +- src/devices/bus/a2bus/a2applicard.cpp | 2 +- src/devices/bus/a2bus/a2arcadebd.cpp | 3 +- src/devices/bus/a2bus/a2bus.cpp | 4 +- src/devices/bus/a2bus/a2cffa.cpp | 4 +- src/devices/bus/a2bus/a2corvus.cpp | 2 +- src/devices/bus/a2bus/a2diskii.cpp | 4 +- src/devices/bus/a2bus/a2diskiing.cpp | 2 +- src/devices/bus/a2bus/a2dx1.cpp | 3 +- src/devices/bus/a2bus/a2eauxslot.cpp | 4 +- src/devices/bus/a2bus/a2echoii.cpp | 3 +- src/devices/bus/a2bus/a2eext80col.cpp | 2 +- src/devices/bus/a2bus/a2eramworks3.cpp | 2 +- src/devices/bus/a2bus/a2estd80col.cpp | 2 +- src/devices/bus/a2bus/a2hsscsi.cpp | 2 +- src/devices/bus/a2bus/a2mcms.cpp | 7 +- src/devices/bus/a2bus/a2memexp.cpp | 4 +- src/devices/bus/a2bus/a2midi.cpp | 2 +- src/devices/bus/a2bus/a2mockingboard.cpp | 7 +- src/devices/bus/a2bus/a2pic.cpp | 2 +- src/devices/bus/a2bus/a2sam.cpp | 3 +- src/devices/bus/a2bus/a2scsi.cpp | 2 +- src/devices/bus/a2bus/a2softcard.cpp | 2 +- src/devices/bus/a2bus/a2ssc.cpp | 2 +- src/devices/bus/a2bus/a2swyft.cpp | 2 +- src/devices/bus/a2bus/a2themill.cpp | 2 +- src/devices/bus/a2bus/a2thunderclock.cpp | 2 +- src/devices/bus/a2bus/a2ultraterm.cpp | 5 +- src/devices/bus/a2bus/a2videoterm.cpp | 13 +- src/devices/bus/a2bus/a2vulcan.cpp | 4 +- src/devices/bus/a2bus/a2zipdrive.cpp | 2 +- src/devices/bus/a2bus/corvfdc01.cpp | 2 +- src/devices/bus/a2bus/corvfdc02.cpp | 2 +- src/devices/bus/a2bus/ezcgi.cpp | 6 +- src/devices/bus/a2bus/laser128.cpp | 2 +- src/devices/bus/a2bus/mouse.cpp | 2 +- src/devices/bus/a2bus/pc_xporter.cpp | 3 +- src/devices/bus/a2bus/pc_xporter.h | 2 +- src/devices/bus/a2bus/ramcard128k.cpp | 2 +- src/devices/bus/a2bus/ramcard16k.cpp | 2 +- src/devices/bus/a2bus/timemasterho.cpp | 2 +- src/devices/bus/a7800/a78_slot.cpp | 2 +- src/devices/bus/a7800/cpuwiz.cpp | 7 +- src/devices/bus/a7800/hiscore.cpp | 2 +- src/devices/bus/a7800/rom.cpp | 31 +- src/devices/bus/a7800/xboard.cpp | 5 +- src/devices/bus/a800/a800_slot.cpp | 6 +- src/devices/bus/a800/a8sio.cpp | 4 +- src/devices/bus/a800/cassette.cpp | 2 +- src/devices/bus/a800/oss.cpp | 8 +- src/devices/bus/a800/rom.cpp | 20 +- src/devices/bus/a800/sparta.cpp | 2 +- src/devices/bus/abcbus/abc890.cpp | 12 +- src/devices/bus/abcbus/abcbus.cpp | 2 +- src/devices/bus/abcbus/abcbus.h | 10 +- src/devices/bus/abcbus/fd2.cpp | 2 +- src/devices/bus/abcbus/hdc.cpp | 2 +- src/devices/bus/abcbus/lux10828.cpp | 2 +- src/devices/bus/abcbus/lux21046.cpp | 12 +- src/devices/bus/abcbus/lux21056.cpp | 2 +- src/devices/bus/abcbus/lux4105.cpp | 2 +- src/devices/bus/abcbus/memcard.cpp | 2 +- src/devices/bus/abcbus/ram.cpp | 2 +- src/devices/bus/abcbus/sio.cpp | 2 +- src/devices/bus/abcbus/slutprov.cpp | 2 +- src/devices/bus/abcbus/turbo.cpp | 2 +- src/devices/bus/abcbus/uni800.cpp | 2 +- src/devices/bus/abckb/abc77.cpp | 5 +- src/devices/bus/abckb/abc77.h | 12 +- src/devices/bus/abckb/abc800kb.cpp | 2 +- src/devices/bus/abckb/abc99.cpp | 3 +- src/devices/bus/abckb/abc99.h | 12 +- src/devices/bus/abckb/abckb.cpp | 2 +- src/devices/bus/adam/adamlink.cpp | 2 +- src/devices/bus/adam/exp.cpp | 2 +- src/devices/bus/adam/ide.cpp | 2 +- src/devices/bus/adam/ram.cpp | 2 +- src/devices/bus/adamnet/adamnet.cpp | 4 +- src/devices/bus/adamnet/ddp.cpp | 2 +- src/devices/bus/adamnet/fdc.cpp | 2 +- src/devices/bus/adamnet/kb.cpp | 2 +- src/devices/bus/adamnet/printer.cpp | 2 +- src/devices/bus/adamnet/spi.cpp | 2 +- src/devices/bus/amiga/keyboard/a1200.cpp | 2 +- src/devices/bus/amiga/keyboard/a500.cpp | 20 +- src/devices/bus/amiga/keyboard/keyboard.cpp | 2 +- src/devices/bus/amiga/zorro/a2052.cpp | 2 +- src/devices/bus/amiga/zorro/a2232.cpp | 2 +- src/devices/bus/amiga/zorro/a590.cpp | 4 +- src/devices/bus/amiga/zorro/action_replay.cpp | 6 +- src/devices/bus/amiga/zorro/buddha.cpp | 2 +- src/devices/bus/amiga/zorro/zorro.cpp | 6 +- src/devices/bus/apf/rom.cpp | 6 +- src/devices/bus/apf/slot.cpp | 2 +- src/devices/bus/apricot/expansion/expansion.cpp | 4 +- src/devices/bus/apricot/expansion/ram.cpp | 6 +- src/devices/bus/apricot/keyboard/hle.cpp | 2 +- src/devices/bus/apricot/keyboard/keyboard.cpp | 2 +- src/devices/bus/arcadia/rom.cpp | 4 +- src/devices/bus/arcadia/slot.cpp | 2 +- src/devices/bus/astrocde/exp.cpp | 2 +- src/devices/bus/astrocde/ram.cpp | 12 +- src/devices/bus/astrocde/rom.cpp | 6 +- src/devices/bus/astrocde/slot.cpp | 2 +- src/devices/bus/bbc/1mhzbus/1mhzbus.cpp | 2 +- src/devices/bus/bbc/1mhzbus/opus3.cpp | 2 +- src/devices/bus/bbc/analogue/analogue.cpp | 2 +- src/devices/bus/bbc/analogue/joystick.cpp | 4 +- src/devices/bus/bbc/fdc/acorn.cpp | 4 +- src/devices/bus/bbc/fdc/cumana.cpp | 4 +- src/devices/bus/bbc/fdc/fdc.cpp | 2 +- src/devices/bus/bbc/fdc/opus.cpp | 6 +- src/devices/bus/bbc/fdc/watford.cpp | 4 +- src/devices/bus/bbc/joyport/joyport.cpp | 2 +- src/devices/bus/bbc/joyport/joystick.cpp | 2 +- src/devices/bus/bbc/tube/tube.cpp | 2 +- src/devices/bus/bbc/userport/userport.cpp | 2 +- src/devices/bus/bml3/bml3bus.cpp | 4 +- src/devices/bus/bml3/bml3kanji.cpp | 2 +- src/devices/bus/bml3/bml3mp1802.cpp | 2 +- src/devices/bus/bml3/bml3mp1805.cpp | 2 +- src/devices/bus/bw2/exp.cpp | 2 +- src/devices/bus/bw2/ramcard.cpp | 2 +- src/devices/bus/c64/16kb.cpp | 2 +- src/devices/bus/c64/4dxh.cpp | 2 +- src/devices/bus/c64/4ksa.cpp | 2 +- src/devices/bus/c64/4tba.cpp | 2 +- src/devices/bus/c64/bn1541.cpp | 2 +- src/devices/bus/c64/c128_comal80.cpp | 2 +- src/devices/bus/c64/c128_partner.cpp | 2 +- src/devices/bus/c64/comal80.cpp | 2 +- src/devices/bus/c64/cpm.cpp | 2 +- src/devices/bus/c64/currah_speech.cpp | 3 +- src/devices/bus/c64/dela_ep256.cpp | 2 +- src/devices/bus/c64/dela_ep64.cpp | 2 +- src/devices/bus/c64/dela_ep7x8.cpp | 2 +- src/devices/bus/c64/dinamic.cpp | 2 +- src/devices/bus/c64/dqbb.cpp | 2 +- src/devices/bus/c64/easy_calc_result.cpp | 2 +- src/devices/bus/c64/easyflash.cpp | 2 +- src/devices/bus/c64/epyx_fast_load.cpp | 2 +- src/devices/bus/c64/exos.cpp | 2 +- src/devices/bus/c64/exp.cpp | 2 +- src/devices/bus/c64/fcc.cpp | 2 +- src/devices/bus/c64/final.cpp | 2 +- src/devices/bus/c64/final3.cpp | 2 +- src/devices/bus/c64/fun_play.cpp | 2 +- src/devices/bus/c64/geocable.cpp | 2 +- src/devices/bus/c64/georam.cpp | 2 +- src/devices/bus/c64/ide64.cpp | 2 +- src/devices/bus/c64/ieee488.cpp | 2 +- src/devices/bus/c64/kingsoft.cpp | 2 +- src/devices/bus/c64/mach5.cpp | 2 +- src/devices/bus/c64/magic_desk.cpp | 2 +- src/devices/bus/c64/magic_formel.cpp | 2 +- src/devices/bus/c64/magic_voice.cpp | 3 +- src/devices/bus/c64/midi_maplin.cpp | 2 +- src/devices/bus/c64/midi_namesoft.cpp | 2 +- src/devices/bus/c64/midi_passport.cpp | 2 +- src/devices/bus/c64/midi_sci.cpp | 2 +- src/devices/bus/c64/midi_siel.cpp | 2 +- src/devices/bus/c64/mikro_assembler.cpp | 2 +- src/devices/bus/c64/multiscreen.cpp | 2 +- src/devices/bus/c64/music64.cpp | 2 +- src/devices/bus/c64/neoram.cpp | 2 +- src/devices/bus/c64/ocean.cpp | 2 +- src/devices/bus/c64/pagefox.cpp | 2 +- src/devices/bus/c64/partner.cpp | 2 +- src/devices/bus/c64/prophet64.cpp | 2 +- src/devices/bus/c64/ps64.cpp | 2 +- src/devices/bus/c64/reu.cpp | 6 +- src/devices/bus/c64/rex.cpp | 2 +- src/devices/bus/c64/rex_ep256.cpp | 2 +- src/devices/bus/c64/ross.cpp | 2 +- src/devices/bus/c64/sfx_sound_expander.cpp | 3 +- src/devices/bus/c64/silverrock.cpp | 2 +- src/devices/bus/c64/simons_basic.cpp | 2 +- src/devices/bus/c64/speakeasy.cpp | 3 +- src/devices/bus/c64/stardos.cpp | 2 +- src/devices/bus/c64/std.cpp | 2 +- src/devices/bus/c64/structured_basic.cpp | 2 +- src/devices/bus/c64/super_explode.cpp | 2 +- src/devices/bus/c64/super_games.cpp | 2 +- src/devices/bus/c64/supercpu.cpp | 2 +- src/devices/bus/c64/sw8k.cpp | 2 +- src/devices/bus/c64/swiftlink.cpp | 2 +- src/devices/bus/c64/system3.cpp | 2 +- src/devices/bus/c64/tdos.cpp | 2 +- src/devices/bus/c64/turbo232.cpp | 2 +- src/devices/bus/c64/vizastar.cpp | 2 +- src/devices/bus/c64/vw64.cpp | 2 +- src/devices/bus/c64/warp_speed.cpp | 2 +- src/devices/bus/c64/westermann.cpp | 2 +- src/devices/bus/c64/xl80.cpp | 3 +- src/devices/bus/c64/zaxxon.cpp | 2 +- src/devices/bus/cbm2/24k.cpp | 2 +- src/devices/bus/cbm2/exp.cpp | 2 +- src/devices/bus/cbm2/hrg.cpp | 5 +- src/devices/bus/cbm2/std.cpp | 2 +- src/devices/bus/cbm2/user.cpp | 2 +- src/devices/bus/cbmiec/c1526.cpp | 6 +- src/devices/bus/cbmiec/c1541.cpp | 24 +- src/devices/bus/cbmiec/c1571.cpp | 8 +- src/devices/bus/cbmiec/c1581.cpp | 4 +- src/devices/bus/cbmiec/c64_nl10.cpp | 2 +- src/devices/bus/cbmiec/cbmiec.cpp | 4 +- src/devices/bus/cbmiec/cmdhd.cpp | 2 +- src/devices/bus/cbmiec/diag264_lb_iec.cpp | 2 +- src/devices/bus/cbmiec/fd2000.cpp | 4 +- src/devices/bus/cbmiec/interpod.cpp | 2 +- src/devices/bus/cbmiec/serialbox.cpp | 2 +- src/devices/bus/cbmiec/vic1515.cpp | 2 +- src/devices/bus/cbmiec/vic1520.cpp | 2 +- src/devices/bus/centronics/comxpl80.cpp | 2 +- src/devices/bus/centronics/covox.cpp | 5 +- src/devices/bus/centronics/ctronics.cpp | 2 +- src/devices/bus/centronics/digiblst.cpp | 3 +- src/devices/bus/centronics/dsjoy.cpp | 2 +- src/devices/bus/centronics/epson_ex800.cpp | 3 +- src/devices/bus/centronics/epson_lx800.cpp | 3 +- src/devices/bus/centronics/epson_lx810l.cpp | 6 +- src/devices/bus/centronics/nec_p72.cpp | 2 +- src/devices/bus/centronics/printer.cpp | 2 +- src/devices/bus/cgenie/expansion/expansion.cpp | 2 +- src/devices/bus/cgenie/expansion/floppy.cpp | 2 +- src/devices/bus/cgenie/parallel/joystick.cpp | 2 +- src/devices/bus/cgenie/parallel/parallel.cpp | 2 +- src/devices/bus/cgenie/parallel/printer.cpp | 2 +- src/devices/bus/chanf/rom.cpp | 12 +- src/devices/bus/chanf/slot.cpp | 2 +- src/devices/bus/coco/coco_232.cpp | 2 +- src/devices/bus/coco/coco_dwsock.cpp | 2 +- src/devices/bus/coco/coco_dwsock.h | 8 +- src/devices/bus/coco/coco_fdc.cpp | 8 +- src/devices/bus/coco/coco_multi.cpp | 2 +- src/devices/bus/coco/coco_orch90.cpp | 5 +- src/devices/bus/coco/coco_pak.cpp | 4 +- src/devices/bus/coco/coco_t4426.cpp | 2 +- src/devices/bus/coco/cococart.cpp | 2 +- src/devices/bus/coco/dragon_fdc.cpp | 4 +- src/devices/bus/coleco/ctrl.cpp | 2 +- src/devices/bus/coleco/exp.cpp | 2 +- src/devices/bus/coleco/hand.cpp | 2 +- src/devices/bus/coleco/sac.cpp | 2 +- src/devices/bus/coleco/std.cpp | 2 +- src/devices/bus/coleco/xin1.cpp | 2 +- src/devices/bus/compis/graphics.cpp | 2 +- src/devices/bus/compis/hrg.cpp | 5 +- src/devices/bus/compucolor/floppy.cpp | 4 +- src/devices/bus/comx35/clm.cpp | 3 +- src/devices/bus/comx35/eprom.cpp | 2 +- src/devices/bus/comx35/exp.cpp | 2 +- src/devices/bus/comx35/expbox.cpp | 2 +- src/devices/bus/comx35/fdc.cpp | 2 +- src/devices/bus/comx35/joycard.cpp | 2 +- src/devices/bus/comx35/printer.cpp | 2 +- src/devices/bus/comx35/ram.cpp | 2 +- src/devices/bus/comx35/thermal.cpp | 2 +- src/devices/bus/cpc/amdrum.cpp | 4 +- src/devices/bus/cpc/brunword4.cpp | 2 +- src/devices/bus/cpc/cpc_pds.cpp | 2 +- src/devices/bus/cpc/cpc_rom.cpp | 4 +- src/devices/bus/cpc/cpc_rs232.cpp | 4 +- src/devices/bus/cpc/cpc_ssa1.cpp | 7 +- src/devices/bus/cpc/cpcexp.cpp | 2 +- src/devices/bus/cpc/ddi1.cpp | 2 +- src/devices/bus/cpc/doubler.cpp | 2 +- src/devices/bus/cpc/hd20.cpp | 2 +- src/devices/bus/cpc/magicsound.cpp | 5 +- src/devices/bus/cpc/mface2.cpp | 2 +- src/devices/bus/cpc/playcity.cpp | 5 +- src/devices/bus/cpc/smartwatch.cpp | 2 +- src/devices/bus/cpc/symbfac2.cpp | 2 +- src/devices/bus/cpc/transtape.cpp | 2 +- src/devices/bus/crvision/rom.cpp | 14 +- src/devices/bus/crvision/slot.cpp | 2 +- src/devices/bus/dmv/dmvbus.cpp | 2 +- src/devices/bus/dmv/k210.cpp | 2 +- src/devices/bus/dmv/k220.cpp | 2 +- src/devices/bus/dmv/k230.cpp | 8 +- src/devices/bus/dmv/k233.cpp | 2 +- src/devices/bus/dmv/k801.cpp | 8 +- src/devices/bus/dmv/k803.cpp | 2 +- src/devices/bus/dmv/k806.cpp | 2 +- src/devices/bus/dmv/ram.cpp | 6 +- src/devices/bus/ecbbus/ecbbus.cpp | 4 +- src/devices/bus/ecbbus/grip.cpp | 5 +- src/devices/bus/ecbbus/grip.h | 15 +- src/devices/bus/econet/e01.cpp | 4 +- src/devices/bus/econet/econet.cpp | 4 +- src/devices/bus/electron/exp.cpp | 2 +- src/devices/bus/electron/m2105.cpp | 3 +- src/devices/bus/electron/plus3.cpp | 2 +- src/devices/bus/ep64/exdos.cpp | 2 +- src/devices/bus/ep64/exp.cpp | 2 +- src/devices/bus/epson_sio/epson_sio.cpp | 2 +- src/devices/bus/epson_sio/pf10.cpp | 2 +- src/devices/bus/epson_sio/tf20.cpp | 2 +- src/devices/bus/gameboy/gb_slot.cpp | 4 +- src/devices/bus/gameboy/mbc.cpp | 34 +- src/devices/bus/gameboy/rom.cpp | 16 +- src/devices/bus/gamegear/ggext.cpp | 2 +- src/devices/bus/gamegear/smsctrladp.cpp | 2 +- src/devices/bus/gba/gba_slot.cpp | 2 +- src/devices/bus/gba/rom.cpp | 26 +- src/devices/bus/generic/ram.cpp | 12 +- src/devices/bus/generic/rom.cpp | 6 +- src/devices/bus/generic/slot.cpp | 2 +- src/devices/bus/hp9845_io/98034.cpp | 2 +- src/devices/bus/hp9845_io/98035.cpp | 2 +- src/devices/bus/hp9845_io/hp9845_io.cpp | 2 +- src/devices/bus/hp_optroms/hp_optrom.cpp | 4 +- src/devices/bus/ieee488/c2031.cpp | 2 +- src/devices/bus/ieee488/c2040.cpp | 6 +- src/devices/bus/ieee488/c2040fdc.cpp | 2 +- src/devices/bus/ieee488/c8050.cpp | 8 +- src/devices/bus/ieee488/c8050fdc.cpp | 2 +- src/devices/bus/ieee488/c8280.cpp | 2 +- src/devices/bus/ieee488/d9060.cpp | 4 +- src/devices/bus/ieee488/hardbox.cpp | 2 +- src/devices/bus/ieee488/hp9895.cpp | 2 +- src/devices/bus/ieee488/ieee488.cpp | 4 +- src/devices/bus/ieee488/shark.cpp | 2 +- src/devices/bus/ieee488/softbox.cpp | 2 +- src/devices/bus/imi7000/imi5000h.cpp | 2 +- src/devices/bus/imi7000/imi7000.cpp | 4 +- src/devices/bus/intv/ecs.cpp | 15 +- src/devices/bus/intv/rom.cpp | 8 +- src/devices/bus/intv/slot.cpp | 2 +- src/devices/bus/intv/voice.cpp | 13 +- src/devices/bus/intv_ctrl/ctrl.cpp | 2 +- src/devices/bus/intv_ctrl/ecs_ctrl.cpp | 8 +- src/devices/bus/intv_ctrl/handctrl.cpp | 2 +- src/devices/bus/iq151/disc2.cpp | 2 +- src/devices/bus/iq151/grafik.cpp | 3 +- src/devices/bus/iq151/iq151.cpp | 2 +- src/devices/bus/iq151/minigraf.cpp | 2 +- src/devices/bus/iq151/ms151a.cpp | 2 +- src/devices/bus/iq151/rom.cpp | 10 +- src/devices/bus/iq151/staper.cpp | 2 +- src/devices/bus/iq151/video32.cpp | 3 +- src/devices/bus/iq151/video64.cpp | 4 +- src/devices/bus/isa/3c503.cpp | 2 +- src/devices/bus/isa/3c505.cpp | 2 +- src/devices/bus/isa/adlib.cpp | 7 +- src/devices/bus/isa/aga.cpp | 4 +- src/devices/bus/isa/aha1542.cpp | 2 +- src/devices/bus/isa/cga.cpp | 20 +- src/devices/bus/isa/cga.h | 10 +- src/devices/bus/isa/com.cpp | 4 +- src/devices/bus/isa/dectalk.cpp | 5 +- src/devices/bus/isa/ega.cpp | 5 +- src/devices/bus/isa/fdc.cpp | 10 +- src/devices/bus/isa/finalchs.cpp | 2 +- src/devices/bus/isa/gblaster.cpp | 6 +- src/devices/bus/isa/gus.cpp | 6 +- src/devices/bus/isa/hdc.cpp | 10 +- src/devices/bus/isa/ibm_mfc.cpp | 4 +- src/devices/bus/isa/ide.cpp | 7 +- src/devices/bus/isa/isa.cpp | 8 +- src/devices/bus/isa/lpt.cpp | 2 +- src/devices/bus/isa/mach32.cpp | 11 +- src/devices/bus/isa/mc1502_fdc.cpp | 2 +- src/devices/bus/isa/mc1502_rom.cpp | 2 +- src/devices/bus/isa/mcd.cpp | 2 +- src/devices/bus/isa/mda.cpp | 11 +- src/devices/bus/isa/mpu401.cpp | 2 +- src/devices/bus/isa/mufdc.cpp | 4 +- src/devices/bus/isa/ne1000.cpp | 2 +- src/devices/bus/isa/ne2000.cpp | 2 +- src/devices/bus/isa/num9rev.cpp | 4 +- src/devices/bus/isa/omti8621.cpp | 6 +- src/devices/bus/isa/p1_fdc.cpp | 2 +- src/devices/bus/isa/p1_hdc.cpp | 2 +- src/devices/bus/isa/p1_rom.cpp | 2 +- src/devices/bus/isa/p1_sound.cpp | 5 +- src/devices/bus/isa/pc1640_iga.cpp | 2 +- src/devices/bus/isa/pds.cpp | 2 +- src/devices/bus/isa/pgc.cpp | 6 +- src/devices/bus/isa/s3virge.cpp | 11 +- src/devices/bus/isa/sb16.cpp | 5 +- src/devices/bus/isa/sblaster.cpp | 12 +- src/devices/bus/isa/sc499.cpp | 6 +- src/devices/bus/isa/side116.cpp | 2 +- src/devices/bus/isa/ssi2001.cpp | 5 +- src/devices/bus/isa/stereo_fx.cpp | 5 +- src/devices/bus/isa/svga_cirrus.cpp | 7 +- src/devices/bus/isa/svga_s3.cpp | 11 +- src/devices/bus/isa/svga_trident.cpp | 4 +- src/devices/bus/isa/svga_tseng.cpp | 5 +- src/devices/bus/isa/trident.cpp | 7 +- src/devices/bus/isa/vga.cpp | 2 +- src/devices/bus/isa/vga_ati.cpp | 9 +- src/devices/bus/isa/wd1002a_wx1.cpp | 2 +- src/devices/bus/isa/wdxt_gen.cpp | 2 +- src/devices/bus/isa/xtide.cpp | 2 +- src/devices/bus/isbx/compis_fdc.cpp | 2 +- src/devices/bus/isbx/isbc_218a.cpp | 2 +- src/devices/bus/isbx/isbx.cpp | 2 +- src/devices/bus/kc/d002.cpp | 2 +- src/devices/bus/kc/d004.cpp | 4 +- src/devices/bus/kc/kc.cpp | 4 +- src/devices/bus/kc/ram.cpp | 12 +- src/devices/bus/kc/rom.cpp | 6 +- src/devices/bus/lpci/cirrus.cpp | 2 +- src/devices/bus/lpci/i82371ab.cpp | 2 +- src/devices/bus/lpci/i82371sb.cpp | 2 +- src/devices/bus/lpci/i82439tx.cpp | 2 +- src/devices/bus/lpci/mpc105.cpp | 2 +- src/devices/bus/lpci/pci.cpp | 4 +- src/devices/bus/lpci/southbridge.cpp | 4 +- src/devices/bus/lpci/southbridge.h | 10 +- src/devices/bus/lpci/vt82c505.cpp | 2 +- src/devices/bus/m5/rom.cpp | 4 +- src/devices/bus/m5/slot.cpp | 2 +- src/devices/bus/macpds/macpds.cpp | 4 +- src/devices/bus/macpds/pds_tpdfpd.cpp | 5 +- src/devices/bus/megadrive/eeprom.cpp | 16 +- src/devices/bus/megadrive/ggenie.cpp | 2 +- src/devices/bus/megadrive/jcart.cpp | 6 +- src/devices/bus/megadrive/md_slot.cpp | 6 +- src/devices/bus/megadrive/rom.cpp | 70 ++-- src/devices/bus/megadrive/sk.cpp | 2 +- src/devices/bus/megadrive/stm95.cpp | 2 +- src/devices/bus/megadrive/svp.cpp | 2 +- src/devices/bus/midi/midi.cpp | 2 +- src/devices/bus/midi/midiinport.cpp | 2 +- src/devices/bus/midi/midioutport.cpp | 2 +- src/devices/bus/msx_cart/arc.cpp | 2 +- src/devices/bus/msx_cart/ascii.cpp | 10 +- src/devices/bus/msx_cart/bm_012.cpp | 2 +- src/devices/bus/msx_cart/crossblaim.cpp | 2 +- src/devices/bus/msx_cart/disk.cpp | 8 +- src/devices/bus/msx_cart/dooly.cpp | 2 +- src/devices/bus/msx_cart/fmpac.cpp | 3 +- src/devices/bus/msx_cart/fs_sr022.cpp | 2 +- src/devices/bus/msx_cart/halnote.cpp | 2 +- src/devices/bus/msx_cart/hfox.cpp | 2 +- src/devices/bus/msx_cart/holy_quran.cpp | 2 +- src/devices/bus/msx_cart/konami.cpp | 17 +- src/devices/bus/msx_cart/korean.cpp | 6 +- src/devices/bus/msx_cart/majutsushi.cpp | 5 +- src/devices/bus/msx_cart/moonsound.cpp | 4 +- src/devices/bus/msx_cart/msx_audio.cpp | 8 +- src/devices/bus/msx_cart/msx_audio_kb.cpp | 6 +- src/devices/bus/msx_cart/msxdos2.cpp | 2 +- src/devices/bus/msx_cart/nomapper.cpp | 2 +- src/devices/bus/msx_cart/rtype.cpp | 2 +- src/devices/bus/msx_cart/super_swangi.cpp | 2 +- src/devices/bus/msx_cart/superloderunner.cpp | 2 +- src/devices/bus/msx_cart/yamaha.cpp | 6 +- src/devices/bus/msx_slot/bunsetsu.cpp | 2 +- src/devices/bus/msx_slot/cartridge.cpp | 4 +- src/devices/bus/msx_slot/disk.cpp | 12 +- src/devices/bus/msx_slot/fs4600.cpp | 2 +- src/devices/bus/msx_slot/music.cpp | 2 +- src/devices/bus/msx_slot/panasonic08.cpp | 2 +- src/devices/bus/msx_slot/ram.cpp | 2 +- src/devices/bus/msx_slot/ram_mm.cpp | 2 +- src/devices/bus/msx_slot/rom.cpp | 2 +- src/devices/bus/msx_slot/sony08.cpp | 2 +- src/devices/bus/nasbus/avc.cpp | 4 +- src/devices/bus/nasbus/floppy.cpp | 2 +- src/devices/bus/nasbus/nasbus.cpp | 4 +- src/devices/bus/neogeo/boot_cthd.cpp | 8 +- src/devices/bus/neogeo/boot_kof10th.cpp | 2 +- src/devices/bus/neogeo/boot_kof2k2.cpp | 6 +- src/devices/bus/neogeo/boot_kof2k3.cpp | 6 +- src/devices/bus/neogeo/boot_misc.cpp | 22 +- src/devices/bus/neogeo/boot_svc.cpp | 8 +- src/devices/bus/neogeo/cmc.cpp | 26 +- src/devices/bus/neogeo/fatfury2.cpp | 2 +- src/devices/bus/neogeo/kof2k2.cpp | 12 +- src/devices/bus/neogeo/kof98.cpp | 2 +- src/devices/bus/neogeo/mslugx.cpp | 2 +- src/devices/bus/neogeo/pcm2.cpp | 10 +- src/devices/bus/neogeo/prot_cmc.cpp | 2 +- src/devices/bus/neogeo/prot_cthd.cpp | 2 +- src/devices/bus/neogeo/prot_fatfury2.cpp | 2 +- src/devices/bus/neogeo/prot_kof2k2.cpp | 2 +- src/devices/bus/neogeo/prot_kof2k3bl.cpp | 2 +- src/devices/bus/neogeo/prot_kof98.cpp | 2 +- src/devices/bus/neogeo/prot_misc.cpp | 2 +- src/devices/bus/neogeo/prot_mslugx.cpp | 2 +- src/devices/bus/neogeo/prot_pcm2.cpp | 2 +- src/devices/bus/neogeo/prot_pvc.cpp | 2 +- src/devices/bus/neogeo/prot_sma.cpp | 2 +- src/devices/bus/neogeo/pvc.cpp | 10 +- src/devices/bus/neogeo/rom.cpp | 4 +- src/devices/bus/neogeo/sbp.cpp | 2 +- src/devices/bus/neogeo/slot.cpp | 2 +- src/devices/bus/neogeo/sma.cpp | 12 +- src/devices/bus/neogeo_ctrl/ctrl.cpp | 4 +- src/devices/bus/neogeo_ctrl/dial.cpp | 2 +- src/devices/bus/neogeo_ctrl/irrmaze.cpp | 2 +- src/devices/bus/neogeo_ctrl/joystick.cpp | 4 +- src/devices/bus/neogeo_ctrl/kizuna4p.cpp | 2 +- src/devices/bus/neogeo_ctrl/mahjong.cpp | 4 +- src/devices/bus/nes/2a03pur.cpp | 2 +- src/devices/bus/nes/act53.cpp | 2 +- src/devices/bus/nes/aladdin.cpp | 8 +- src/devices/bus/nes/ave.cpp | 6 +- src/devices/bus/nes/bandai.cpp | 12 +- src/devices/bus/nes/benshieng.cpp | 2 +- src/devices/bus/nes/bootleg.cpp | 43 +-- src/devices/bus/nes/camerica.cpp | 6 +- src/devices/bus/nes/cne.cpp | 6 +- src/devices/bus/nes/cony.cpp | 4 +- src/devices/bus/nes/datach.cpp | 8 +- src/devices/bus/nes/discrete.cpp | 8 +- src/devices/bus/nes/disksys.cpp | 2 +- src/devices/bus/nes/event.cpp | 2 +- src/devices/bus/nes/ggenie.cpp | 2 +- src/devices/bus/nes/henggedianzi.cpp | 6 +- src/devices/bus/nes/hes.cpp | 2 +- src/devices/bus/nes/hosenkan.cpp | 3 +- src/devices/bus/nes/irem.cpp | 10 +- src/devices/bus/nes/jaleco.cpp | 26 +- src/devices/bus/nes/jy.cpp | 6 +- src/devices/bus/nes/kaiser.cpp | 20 +- src/devices/bus/nes/karastudio.cpp | 6 +- src/devices/bus/nes/konami.cpp | 14 +- src/devices/bus/nes/legacy.cpp | 6 +- src/devices/bus/nes/mmc1.cpp | 8 +- src/devices/bus/nes/mmc2.cpp | 4 +- src/devices/bus/nes/mmc3.cpp | 13 +- src/devices/bus/nes/mmc3_clones.cpp | 72 ++--- src/devices/bus/nes/mmc5.cpp | 2 +- src/devices/bus/nes/multigame.cpp | 94 +++--- src/devices/bus/nes/namcot.cpp | 12 +- src/devices/bus/nes/nanjing.cpp | 2 +- src/devices/bus/nes/nes_slot.cpp | 2 +- src/devices/bus/nes/ntdec.cpp | 4 +- src/devices/bus/nes/nxrom.cpp | 24 +- src/devices/bus/nes/pirate.cpp | 35 +- src/devices/bus/nes/pt554.cpp | 3 +- src/devices/bus/nes/racermate.cpp | 2 +- src/devices/bus/nes/rcm.cpp | 10 +- src/devices/bus/nes/rexsoft.cpp | 4 +- src/devices/bus/nes/sachen.cpp | 28 +- src/devices/bus/nes/somari.cpp | 2 +- src/devices/bus/nes/sunsoft.cpp | 14 +- src/devices/bus/nes/sunsoft_dcs.cpp | 6 +- src/devices/bus/nes/taito.cpp | 8 +- src/devices/bus/nes/tengen.cpp | 6 +- src/devices/bus/nes/txc.cpp | 10 +- src/devices/bus/nes/waixing.cpp | 42 +-- src/devices/bus/nes/zemina.cpp | 6 +- src/devices/bus/nes_ctrl/4score.cpp | 4 +- src/devices/bus/nes_ctrl/arkpaddle.cpp | 4 +- src/devices/bus/nes_ctrl/bcbattle.cpp | 2 +- src/devices/bus/nes_ctrl/ctrl.cpp | 2 +- src/devices/bus/nes_ctrl/fckeybrd.cpp | 2 +- src/devices/bus/nes_ctrl/ftrainer.cpp | 2 +- src/devices/bus/nes_ctrl/hori.cpp | 4 +- src/devices/bus/nes_ctrl/joypad.cpp | 10 +- src/devices/bus/nes_ctrl/konamihs.cpp | 2 +- src/devices/bus/nes_ctrl/miracle.cpp | 2 +- src/devices/bus/nes_ctrl/mjpanel.cpp | 2 +- src/devices/bus/nes_ctrl/pachinko.cpp | 2 +- src/devices/bus/nes_ctrl/partytap.cpp | 2 +- src/devices/bus/nes_ctrl/powerpad.cpp | 2 +- src/devices/bus/nes_ctrl/suborkey.cpp | 2 +- src/devices/bus/nes_ctrl/zapper.cpp | 2 +- src/devices/bus/newbrain/eim.cpp | 2 +- src/devices/bus/newbrain/exp.cpp | 2 +- src/devices/bus/newbrain/fdc.cpp | 2 +- src/devices/bus/nubus/nubus.cpp | 4 +- src/devices/bus/nubus/nubus_48gc.cpp | 5 +- src/devices/bus/nubus/nubus_asntmc3b.cpp | 4 +- src/devices/bus/nubus/nubus_cb264.cpp | 3 +- src/devices/bus/nubus/nubus_image.cpp | 6 +- src/devices/bus/nubus/nubus_m2hires.cpp | 3 +- src/devices/bus/nubus/nubus_m2video.cpp | 4 +- src/devices/bus/nubus/nubus_radiustpd.cpp | 4 +- src/devices/bus/nubus/nubus_spec8.cpp | 4 +- src/devices/bus/nubus/nubus_specpdq.cpp | 4 +- src/devices/bus/nubus/nubus_vikbw.cpp | 3 +- src/devices/bus/nubus/nubus_wsportrait.cpp | 3 +- src/devices/bus/nubus/pds30_30hr.cpp | 3 +- src/devices/bus/nubus/pds30_cb264.cpp | 3 +- src/devices/bus/nubus/pds30_mc30.cpp | 3 +- src/devices/bus/nubus/pds30_procolor816.cpp | 3 +- src/devices/bus/nubus/pds30_sigmalview.cpp | 3 +- src/devices/bus/odyssey2/chess.cpp | 2 +- src/devices/bus/odyssey2/rom.cpp | 6 +- src/devices/bus/odyssey2/slot.cpp | 2 +- src/devices/bus/odyssey2/voice.cpp | 3 +- src/devices/bus/oricext/jasmin.cpp | 2 +- src/devices/bus/oricext/microdisc.cpp | 2 +- src/devices/bus/oricext/oricext.cpp | 2 +- src/devices/bus/pc1512/mouse.cpp | 4 +- src/devices/bus/pc_joy/pc_joy.cpp | 4 +- src/devices/bus/pc_joy/pc_joy_sw.cpp | 2 +- src/devices/bus/pc_kbd/ec1841.cpp | 2 +- src/devices/bus/pc_kbd/iskr1030.cpp | 2 +- src/devices/bus/pc_kbd/keytro.cpp | 4 +- src/devices/bus/pc_kbd/msnat.cpp | 2 +- src/devices/bus/pc_kbd/pc83.cpp | 2 +- src/devices/bus/pc_kbd/pc_kbdc.cpp | 4 +- src/devices/bus/pc_kbd/pcat84.cpp | 4 +- src/devices/bus/pc_kbd/pcxt83.cpp | 2 +- src/devices/bus/pce/pce_rom.cpp | 8 +- src/devices/bus/pce/pce_slot.cpp | 2 +- src/devices/bus/pet/2joysnd.cpp | 4 +- src/devices/bus/pet/64k.cpp | 2 +- src/devices/bus/pet/c2n.cpp | 6 +- src/devices/bus/pet/cass.cpp | 2 +- src/devices/bus/pet/cb2snd.cpp | 5 +- src/devices/bus/pet/diag.cpp | 2 +- src/devices/bus/pet/diag264_lb_tape.cpp | 2 +- src/devices/bus/pet/exp.cpp | 2 +- src/devices/bus/pet/hsg.cpp | 6 +- src/devices/bus/pet/petuja.cpp | 2 +- src/devices/bus/pet/superpet.cpp | 2 +- src/devices/bus/pet/user.cpp | 2 +- src/devices/bus/plus4/c1551.cpp | 2 +- src/devices/bus/plus4/diag264_lb_user.cpp | 2 +- src/devices/bus/plus4/exp.cpp | 2 +- src/devices/bus/plus4/sid.cpp | 4 +- src/devices/bus/plus4/std.cpp | 2 +- src/devices/bus/pofo/ccm.cpp | 2 +- src/devices/bus/pofo/exp.cpp | 2 +- src/devices/bus/pofo/hpc101.cpp | 2 +- src/devices/bus/pofo/hpc102.cpp | 2 +- src/devices/bus/pofo/hpc104.cpp | 4 +- src/devices/bus/pofo/ram.cpp | 2 +- src/devices/bus/pofo/rom.cpp | 2 +- src/devices/bus/psx/analogue.cpp | 4 +- src/devices/bus/psx/ctlrport.cpp | 6 +- src/devices/bus/psx/memcard.cpp | 2 +- src/devices/bus/psx/multitap.cpp | 2 +- src/devices/bus/ql/cst_q_plus4.cpp | 2 +- src/devices/bus/ql/cst_qdisc.cpp | 2 +- src/devices/bus/ql/cumana_fdi.cpp | 2 +- src/devices/bus/ql/exp.cpp | 2 +- src/devices/bus/ql/kempston_di.cpp | 2 +- src/devices/bus/ql/miracle_gold_card.cpp | 2 +- src/devices/bus/ql/miracle_hd.cpp | 2 +- src/devices/bus/ql/mp_fdi.cpp | 2 +- src/devices/bus/ql/opd_basic_master.cpp | 2 +- src/devices/bus/ql/pcml_qdisk.cpp | 2 +- src/devices/bus/ql/qubide.cpp | 2 +- src/devices/bus/ql/rom.cpp | 2 +- src/devices/bus/ql/sandy_superdisk.cpp | 2 +- src/devices/bus/ql/sandy_superqboard.cpp | 8 +- src/devices/bus/ql/std.cpp | 2 +- src/devices/bus/ql/trumpcard.cpp | 8 +- src/devices/bus/rs232/keyboard.cpp | 2 +- src/devices/bus/rs232/loopback.cpp | 2 +- src/devices/bus/rs232/null_modem.cpp | 2 +- src/devices/bus/rs232/printer.cpp | 2 +- src/devices/bus/rs232/pty.cpp | 2 +- src/devices/bus/rs232/rs232.cpp | 2 +- src/devices/bus/rs232/ser_mouse.cpp | 4 +- src/devices/bus/rs232/sun_kbd.cpp | 2 +- src/devices/bus/rs232/terminal.cpp | 2 +- src/devices/bus/rs232/xvd701.cpp | 2 +- src/devices/bus/s100/dj2db.cpp | 2 +- src/devices/bus/s100/djdma.cpp | 2 +- src/devices/bus/s100/mm65k16s.cpp | 2 +- src/devices/bus/s100/nsmdsa.cpp | 2 +- src/devices/bus/s100/nsmdsad.cpp | 2 +- src/devices/bus/s100/s100.cpp | 4 +- src/devices/bus/s100/wunderbus.cpp | 2 +- src/devices/bus/sat_ctrl/analog.cpp | 2 +- src/devices/bus/sat_ctrl/ctrl.cpp | 2 +- src/devices/bus/sat_ctrl/joy.cpp | 2 +- src/devices/bus/sat_ctrl/joy_md.cpp | 4 +- src/devices/bus/sat_ctrl/keybd.cpp | 2 +- src/devices/bus/sat_ctrl/mouse.cpp | 2 +- src/devices/bus/sat_ctrl/multitap.cpp | 2 +- src/devices/bus/sat_ctrl/pointer.cpp | 2 +- src/devices/bus/sat_ctrl/racing.cpp | 2 +- src/devices/bus/sat_ctrl/segatap.cpp | 2 +- src/devices/bus/saturn/bram.cpp | 8 +- src/devices/bus/saturn/dram.cpp | 4 +- src/devices/bus/saturn/rom.cpp | 2 +- src/devices/bus/saturn/sat_slot.cpp | 2 +- src/devices/bus/scsi/acb4070.cpp | 2 +- src/devices/bus/scsi/cdu76s.cpp | 2 +- src/devices/bus/scsi/d9060hd.cpp | 2 +- src/devices/bus/scsi/omti5100.cpp | 2 +- src/devices/bus/scsi/pc9801_sasi.cpp | 2 +- src/devices/bus/scsi/s1410.cpp | 2 +- src/devices/bus/scsi/sa1403d.cpp | 2 +- src/devices/bus/scsi/scsi.cpp | 4 +- src/devices/bus/scsi/scsicd.cpp | 2 +- src/devices/bus/scsi/scsihd.cpp | 2 +- src/devices/bus/scv/rom.cpp | 14 +- src/devices/bus/scv/slot.cpp | 2 +- src/devices/bus/sega8/ccatch.cpp | 2 +- src/devices/bus/sega8/mgear.cpp | 2 +- src/devices/bus/sega8/rom.cpp | 36 +-- src/devices/bus/sega8/sega8_slot.cpp | 4 +- src/devices/bus/sg1000_exp/fm_unit.cpp | 2 +- src/devices/bus/sg1000_exp/sg1000exp.cpp | 2 +- src/devices/bus/sg1000_exp/sk1100.cpp | 2 +- src/devices/bus/sms_ctrl/graphic.cpp | 2 +- src/devices/bus/sms_ctrl/joypad.cpp | 2 +- src/devices/bus/sms_ctrl/lphaser.cpp | 4 +- src/devices/bus/sms_ctrl/multitap.cpp | 2 +- src/devices/bus/sms_ctrl/paddle.cpp | 2 +- src/devices/bus/sms_ctrl/rfu.cpp | 2 +- src/devices/bus/sms_ctrl/smsctrl.cpp | 2 +- src/devices/bus/sms_ctrl/sports.cpp | 2 +- src/devices/bus/sms_ctrl/sportsjp.cpp | 2 +- src/devices/bus/sms_exp/gender.cpp | 2 +- src/devices/bus/sms_exp/smsexp.cpp | 2 +- src/devices/bus/snes/bsx.cpp | 8 +- src/devices/bus/snes/event.cpp | 2 +- src/devices/bus/snes/rom.cpp | 20 +- src/devices/bus/snes/rom21.cpp | 4 +- src/devices/bus/snes/sa1.cpp | 2 +- src/devices/bus/snes/sdd1.cpp | 2 +- src/devices/bus/snes/sfx.cpp | 2 +- src/devices/bus/snes/sgb.cpp | 4 +- src/devices/bus/snes/snes_slot.cpp | 6 +- src/devices/bus/snes/spc7110.cpp | 4 +- src/devices/bus/snes/sufami.cpp | 4 +- src/devices/bus/snes/upd.cpp | 24 +- src/devices/bus/snes_ctrl/bcbattle.cpp | 2 +- src/devices/bus/snes_ctrl/ctrl.cpp | 2 +- src/devices/bus/snes_ctrl/joypad.cpp | 2 +- src/devices/bus/snes_ctrl/miracle.cpp | 2 +- src/devices/bus/snes_ctrl/mouse.cpp | 2 +- src/devices/bus/snes_ctrl/multitap.cpp | 2 +- src/devices/bus/snes_ctrl/pachinko.cpp | 2 +- src/devices/bus/snes_ctrl/sscope.cpp | 2 +- src/devices/bus/snes_ctrl/twintap.cpp | 2 +- src/devices/bus/spc1000/exp.cpp | 2 +- src/devices/bus/spc1000/fdd.cpp | 2 +- src/devices/bus/spc1000/vdp.cpp | 2 +- src/devices/bus/sunkbd/hlekbd.cpp | 13 +- src/devices/bus/sunkbd/sunkbd.cpp | 2 +- src/devices/bus/svi3x8/expander/expander.cpp | 2 +- src/devices/bus/svi3x8/expander/sv601.cpp | 2 +- src/devices/bus/svi3x8/expander/sv602.cpp | 2 +- src/devices/bus/svi3x8/expander/sv603.cpp | 4 +- src/devices/bus/svi3x8/slot/slot.cpp | 4 +- src/devices/bus/svi3x8/slot/sv801.cpp | 2 +- src/devices/bus/svi3x8/slot/sv802.cpp | 2 +- src/devices/bus/svi3x8/slot/sv803.cpp | 2 +- src/devices/bus/svi3x8/slot/sv805.cpp | 2 +- src/devices/bus/svi3x8/slot/sv806.cpp | 4 +- src/devices/bus/svi3x8/slot/sv807.cpp | 2 +- src/devices/bus/ti99_peb/bwg.cpp | 2 +- src/devices/bus/ti99_peb/evpc.cpp | 5 +- src/devices/bus/ti99_peb/hfdc.cpp | 2 +- src/devices/bus/ti99_peb/horizon.cpp | 2 +- src/devices/bus/ti99_peb/hsgpl.cpp | 2 +- src/devices/bus/ti99_peb/memex.cpp | 2 +- src/devices/bus/ti99_peb/myarcmem.cpp | 2 +- src/devices/bus/ti99_peb/pcode.cpp | 2 +- src/devices/bus/ti99_peb/peribox.cpp | 12 +- src/devices/bus/ti99_peb/samsmem.cpp | 2 +- src/devices/bus/ti99_peb/spchsyn.cpp | 7 +- src/devices/bus/ti99_peb/ti_32kmem.cpp | 2 +- src/devices/bus/ti99_peb/ti_fdc.cpp | 2 +- src/devices/bus/ti99_peb/ti_rs232.cpp | 6 +- src/devices/bus/ti99_peb/tn_ide.cpp | 2 +- src/devices/bus/ti99_peb/tn_usbsm.cpp | 2 +- src/devices/bus/ti99x/990_dk.cpp | 2 +- src/devices/bus/ti99x/990_hd.cpp | 2 +- src/devices/bus/ti99x/990_tap.cpp | 4 +- src/devices/bus/ti99x/998board.cpp | 10 +- src/devices/bus/ti99x/datamux.cpp | 2 +- src/devices/bus/ti99x/genboard.cpp | 6 +- src/devices/bus/ti99x/gromport.cpp | 10 +- src/devices/bus/ti99x/handset.cpp | 4 +- src/devices/bus/ti99x/joyport.cpp | 2 +- src/devices/bus/ti99x/mecmouse.cpp | 2 +- src/devices/bus/ti99x/ti99defs.cpp | 17 + src/devices/bus/ti99x/ti99defs.h | 10 +- src/devices/bus/tiki100/8088.cpp | 2 +- src/devices/bus/tiki100/exp.cpp | 4 +- src/devices/bus/tiki100/hdc.cpp | 2 +- src/devices/bus/tvc/hbf.cpp | 2 +- src/devices/bus/tvc/tvc.cpp | 2 +- src/devices/bus/vboy/rom.cpp | 4 +- src/devices/bus/vboy/slot.cpp | 2 +- src/devices/bus/vc4000/rom.cpp | 8 +- src/devices/bus/vc4000/slot.cpp | 4 +- src/devices/bus/vcs/compumat.cpp | 2 +- src/devices/bus/vcs/dpc.cpp | 4 +- src/devices/bus/vcs/harmony_melody.cpp | 2 +- src/devices/bus/vcs/rom.cpp | 42 +-- src/devices/bus/vcs/scharger.cpp | 2 +- src/devices/bus/vcs/vcs_slot.cpp | 2 +- src/devices/bus/vcs_ctrl/ctrl.cpp | 2 +- src/devices/bus/vcs_ctrl/joybooster.cpp | 2 +- src/devices/bus/vcs_ctrl/joystick.cpp | 2 +- src/devices/bus/vcs_ctrl/keypad.cpp | 2 +- src/devices/bus/vcs_ctrl/lightpen.cpp | 2 +- src/devices/bus/vcs_ctrl/paddles.cpp | 2 +- src/devices/bus/vcs_ctrl/wheel.cpp | 2 +- src/devices/bus/vectrex/rom.cpp | 6 +- src/devices/bus/vectrex/slot.cpp | 2 +- src/devices/bus/vic10/exp.cpp | 2 +- src/devices/bus/vic10/std.cpp | 2 +- src/devices/bus/vic20/4cga.cpp | 2 +- src/devices/bus/vic20/exp.cpp | 2 +- src/devices/bus/vic20/fe3.cpp | 2 +- src/devices/bus/vic20/megacart.cpp | 2 +- src/devices/bus/vic20/speakeasy.cpp | 4 +- src/devices/bus/vic20/std.cpp | 2 +- src/devices/bus/vic20/vic1010.cpp | 2 +- src/devices/bus/vic20/vic1011.cpp | 2 +- src/devices/bus/vic20/vic1110.cpp | 2 +- src/devices/bus/vic20/vic1111.cpp | 2 +- src/devices/bus/vic20/vic1112.cpp | 2 +- src/devices/bus/vic20/vic1210.cpp | 2 +- src/devices/bus/vic20/videopak.cpp | 4 +- src/devices/bus/vidbrain/exp.cpp | 2 +- src/devices/bus/vidbrain/money_minder.cpp | 2 +- src/devices/bus/vidbrain/std.cpp | 2 +- src/devices/bus/vidbrain/timeshare.cpp | 2 +- src/devices/bus/vip/byteio.cpp | 2 +- src/devices/bus/vip/exp.cpp | 2 +- src/devices/bus/vip/vp550.cpp | 4 +- src/devices/bus/vip/vp570.cpp | 2 +- src/devices/bus/vip/vp575.cpp | 2 +- src/devices/bus/vip/vp585.cpp | 2 +- src/devices/bus/vip/vp590.cpp | 2 +- src/devices/bus/vip/vp595.cpp | 4 +- src/devices/bus/vip/vp620.cpp | 2 +- src/devices/bus/vip/vp700.cpp | 2 +- src/devices/bus/vme/vme.cpp | 4 +- src/devices/bus/vme/vme_fccpu20.cpp | 14 +- src/devices/bus/vme/vme_fcisio.cpp | 2 +- src/devices/bus/vme/vme_fcscsi.cpp | 2 +- src/devices/bus/vme/vme_mvme350.cpp | 2 +- src/devices/bus/vme/vme_mzr8105.cpp | 2 +- src/devices/bus/vme/vme_mzr8300.cpp | 2 +- src/devices/bus/vtech/ioexp/ioexp.cpp | 2 +- src/devices/bus/vtech/ioexp/joystick.cpp | 2 +- src/devices/bus/vtech/ioexp/printer.cpp | 2 +- src/devices/bus/vtech/memexp/floppy.cpp | 2 +- src/devices/bus/vtech/memexp/memexp.cpp | 2 +- src/devices/bus/vtech/memexp/memory.cpp | 8 +- src/devices/bus/vtech/memexp/rs232.cpp | 2 +- src/devices/bus/vtech/memexp/rtty.cpp | 2 +- src/devices/bus/vtech/memexp/wordpro.cpp | 2 +- src/devices/bus/wangpc/emb.cpp | 2 +- src/devices/bus/wangpc/lic.cpp | 2 +- src/devices/bus/wangpc/lvc.cpp | 4 +- src/devices/bus/wangpc/mcc.cpp | 2 +- src/devices/bus/wangpc/mvc.cpp | 4 +- src/devices/bus/wangpc/rtc.cpp | 2 +- src/devices/bus/wangpc/tig.cpp | 4 +- src/devices/bus/wangpc/wangpc.cpp | 4 +- src/devices/bus/wangpc/wdc.cpp | 2 +- src/devices/bus/wswan/rom.cpp | 6 +- src/devices/bus/wswan/slot.cpp | 2 +- src/devices/bus/x68k/x68k_neptunex.cpp | 2 +- src/devices/bus/x68k/x68k_scsiext.cpp | 2 +- src/devices/bus/x68k/x68kexp.cpp | 2 +- src/devices/bus/z88/flash.cpp | 2 +- src/devices/bus/z88/ram.cpp | 8 +- src/devices/bus/z88/rom.cpp | 6 +- src/devices/bus/z88/z88.cpp | 2 +- src/devices/cpu/8x300/8x300.cpp | 2 +- src/devices/cpu/adsp2100/adsp2100.cpp | 12 +- src/devices/cpu/alph8201/alph8201.cpp | 4 +- src/devices/cpu/alto2/alto2cpu.cpp | 2 +- src/devices/cpu/alto2/alto2cpu.h | 14 +- src/devices/cpu/am29000/am29000.cpp | 2 +- src/devices/cpu/amis2000/amis2000.cpp | 6 +- src/devices/cpu/apexc/apexc.cpp | 2 +- src/devices/cpu/arc/arc.cpp | 2 +- src/devices/cpu/arcompact/arcompact.cpp | 2 +- src/devices/cpu/arm/arm.cpp | 4 +- src/devices/cpu/arm7/arm7.cpp | 14 +- src/devices/cpu/arm7/lpc210x.cpp | 2 +- src/devices/cpu/asap/asap.cpp | 2 +- src/devices/cpu/avr8/avr8.cpp | 8 +- src/devices/cpu/ccpu/ccpu.cpp | 2 +- src/devices/cpu/clipper/clipper.cpp | 6 +- src/devices/cpu/cop400/cop400.cpp | 34 +- src/devices/cpu/cosmac/cosmac.cpp | 4 +- src/devices/cpu/cp1610/cp1610.cpp | 2 +- src/devices/cpu/cubeqcpu/cubeqcpu.cpp | 6 +- src/devices/cpu/dsp16/dsp16.cpp | 2 +- src/devices/cpu/dsp32/dsp32.cpp | 2 +- src/devices/cpu/dsp56k/dsp56k.cpp | 2 +- src/devices/cpu/e0c6200/e0c6s46.cpp | 2 +- src/devices/cpu/e132xs/e132xs.cpp | 28 +- src/devices/cpu/es5510/es5510.cpp | 2 +- src/devices/cpu/esrip/esrip.cpp | 6 +- src/devices/cpu/f8/f8.cpp | 2 +- src/devices/cpu/g65816/g65816.cpp | 4 +- src/devices/cpu/h6280/h6280.cpp | 2 +- src/devices/cpu/h8/h83002.cpp | 2 +- src/devices/cpu/h8/h83006.cpp | 4 +- src/devices/cpu/h8/h83008.cpp | 2 +- src/devices/cpu/h8/h83048.cpp | 8 +- src/devices/cpu/h8/h83337.cpp | 6 +- src/devices/cpu/h8/h8_adc.cpp | 12 +- src/devices/cpu/h8/h8_dma.cpp | 4 +- src/devices/cpu/h8/h8_dtc.cpp | 2 +- src/devices/cpu/h8/h8_intc.cpp | 6 +- src/devices/cpu/h8/h8_port.cpp | 2 +- src/devices/cpu/h8/h8_sci.cpp | 2 +- src/devices/cpu/h8/h8_timer16.cpp | 8 +- src/devices/cpu/h8/h8_timer8.cpp | 4 +- src/devices/cpu/h8/h8_watchdog.cpp | 2 +- src/devices/cpu/h8/h8s2245.cpp | 8 +- src/devices/cpu/h8/h8s2320.cpp | 18 +- src/devices/cpu/h8/h8s2357.cpp | 12 +- src/devices/cpu/h8/h8s2655.cpp | 4 +- src/devices/cpu/hcd62121/hcd62121.cpp | 2 +- src/devices/cpu/hd61700/hd61700.cpp | 2 +- src/devices/cpu/hmcs40/hmcs40.cpp | 40 +-- src/devices/cpu/hphybrid/hphybrid.cpp | 4 +- src/devices/cpu/i386/i386.cpp | 20 +- src/devices/cpu/i4004/i4004.cpp | 2 +- src/devices/cpu/i8008/i8008.cpp | 2 +- src/devices/cpu/i8085/i8085.cpp | 6 +- src/devices/cpu/i8089/i8089.cpp | 2 +- src/devices/cpu/i8089/i8089_channel.cpp | 2 +- src/devices/cpu/i86/i186.cpp | 4 +- src/devices/cpu/i86/i286.cpp | 2 +- src/devices/cpu/i86/i86.cpp | 4 +- src/devices/cpu/i860/i860.cpp | 2 +- src/devices/cpu/i960/i960.cpp | 2 +- src/devices/cpu/ie15/ie15.cpp | 6 +- src/devices/cpu/jaguar/jaguar.cpp | 4 +- src/devices/cpu/lc8670/lc8670.cpp | 2 +- src/devices/cpu/lh5801/lh5801.cpp | 2 +- src/devices/cpu/lr35902/lr35902.cpp | 2 +- src/devices/cpu/m37710/m37710.cpp | 6 +- src/devices/cpu/m6502/deco16.cpp | 2 +- src/devices/cpu/m6502/m3745x.cpp | 2 +- src/devices/cpu/m6502/m4510.cpp | 2 +- src/devices/cpu/m6502/m5074x.cpp | 4 +- src/devices/cpu/m6502/m6502.cpp | 2 +- src/devices/cpu/m6502/m6504.cpp | 2 +- src/devices/cpu/m6502/m6507.cpp | 2 +- src/devices/cpu/m6502/m6509.cpp | 2 +- src/devices/cpu/m6502/m6510.cpp | 2 +- src/devices/cpu/m6502/m6510t.cpp | 2 +- src/devices/cpu/m6502/m65c02.cpp | 2 +- src/devices/cpu/m6502/m65ce02.cpp | 2 +- src/devices/cpu/m6502/m65sc02.cpp | 2 +- src/devices/cpu/m6502/m740.cpp | 2 +- src/devices/cpu/m6502/m7501.cpp | 2 +- src/devices/cpu/m6502/m8502.cpp | 2 +- src/devices/cpu/m6502/n2a03.cpp | 2 +- src/devices/cpu/m6502/r65c02.cpp | 2 +- src/devices/cpu/m6800/m6800.cpp | 20 +- src/devices/cpu/m68000/m68kcpu.cpp | 38 +-- src/devices/cpu/m6805/m6805.cpp | 6 +- src/devices/cpu/m6805/m68705.cpp | 8 +- src/devices/cpu/m6805/m68hc05.cpp | 6 +- src/devices/cpu/m6809/hd6309.cpp | 2 +- src/devices/cpu/m6809/konami.cpp | 2 +- src/devices/cpu/m6809/m6809.cpp | 4 +- src/devices/cpu/mb86233/mb86233.cpp | 2 +- src/devices/cpu/mb86235/mb86235.cpp | 2 +- src/devices/cpu/mb88xx/mb88xx.cpp | 14 +- src/devices/cpu/mc68hc11/mc68hc11.cpp | 2 +- src/devices/cpu/mcs48/mcs48.cpp | 38 +-- src/devices/cpu/mcs51/mcs51.cpp | 28 +- src/devices/cpu/mcs96/i8x9x.cpp | 4 +- src/devices/cpu/melps4/m58846.cpp | 2 +- src/devices/cpu/minx/minx.cpp | 2 +- src/devices/cpu/mips/mips3.cpp | 32 +- src/devices/cpu/mips/r3000.cpp | 10 +- src/devices/cpu/mn10200/mn10200.cpp | 2 +- src/devices/cpu/nanoprocessor/nanoprocessor.cpp | 2 +- src/devices/cpu/nec/nec.cpp | 8 +- src/devices/cpu/nec/v25.cpp | 4 +- src/devices/cpu/nec/v53.cpp | 4 +- src/devices/cpu/patinhofeio/patinho_feio.cpp | 2 +- src/devices/cpu/patinhofeio/patinhofeio_cpu.h | 4 +- src/devices/cpu/pdp1/pdp1.cpp | 2 +- src/devices/cpu/pdp1/tx0.cpp | 4 +- src/devices/cpu/pdp8/pdp8.cpp | 2 +- src/devices/cpu/pic16c5x/pic16c5x.cpp | 16 +- src/devices/cpu/pic16c62x/pic16c62x.cpp | 12 +- src/devices/cpu/powerpc/ppccom.cpp | 20 +- src/devices/cpu/pps4/pps4.cpp | 4 +- src/devices/cpu/psx/dma.cpp | 2 +- src/devices/cpu/psx/irq.cpp | 2 +- src/devices/cpu/psx/mdec.cpp | 2 +- src/devices/cpu/psx/psx.cpp | 15 +- src/devices/cpu/psx/psx.h | 19 +- src/devices/cpu/psx/rcnt.cpp | 2 +- src/devices/cpu/psx/sio.cpp | 4 +- src/devices/cpu/rsp/rsp.cpp | 2 +- src/devices/cpu/s2650/s2650.cpp | 2 +- src/devices/cpu/saturn/saturn.cpp | 2 +- src/devices/cpu/sc61860/sc61860.cpp | 2 +- src/devices/cpu/scmp/scmp.cpp | 4 +- src/devices/cpu/score/score.cpp | 2 +- src/devices/cpu/scudsp/scudsp.cpp | 2 +- src/devices/cpu/se3208/se3208.cpp | 2 +- src/devices/cpu/sh2/sh2.cpp | 6 +- src/devices/cpu/sh2/sh7604_bus.cpp | 2 +- src/devices/cpu/sh2/sh7604_sci.cpp | 2 +- src/devices/cpu/sh2/sh7604_wdt.cpp | 2 +- src/devices/cpu/sh4/sh4.cpp | 8 +- src/devices/cpu/sharc/sharc.cpp | 2 +- src/devices/cpu/sm510/kb1013vk1-2core.cpp | 2 +- src/devices/cpu/sm510/sm500core.cpp | 2 +- src/devices/cpu/sm510/sm510core.cpp | 2 +- src/devices/cpu/sm510/sm511core.cpp | 4 +- src/devices/cpu/sm8500/sm8500.cpp | 2 +- src/devices/cpu/sparc/mb86901.cpp | 2 +- src/devices/cpu/spc700/spc700.cpp | 2 +- src/devices/cpu/ssem/ssem.cpp | 2 +- src/devices/cpu/ssp1601/ssp1601.cpp | 2 +- src/devices/cpu/superfx/superfx.cpp | 2 +- src/devices/cpu/t11/t11.cpp | 4 +- src/devices/cpu/tlcs870/tlcs870.cpp | 2 +- src/devices/cpu/tlcs90/tlcs90.cpp | 10 +- src/devices/cpu/tlcs900/tlcs900.cpp | 4 +- src/devices/cpu/tms1000/tms0270.cpp | 2 +- src/devices/cpu/tms1000/tms0970.cpp | 6 +- src/devices/cpu/tms1000/tms0980.cpp | 4 +- src/devices/cpu/tms1000/tms1000.cpp | 12 +- src/devices/cpu/tms1000/tms1100.cpp | 8 +- src/devices/cpu/tms1000/tms1400.cpp | 8 +- src/devices/cpu/tms1000/tp0320.cpp | 2 +- src/devices/cpu/tms32010/tms32010.cpp | 6 +- src/devices/cpu/tms32025/tms32025.cpp | 4 +- src/devices/cpu/tms32031/tms32031.cpp | 4 +- src/devices/cpu/tms32051/tms32051.cpp | 4 +- src/devices/cpu/tms32082/tms32082.cpp | 4 +- src/devices/cpu/tms34010/tms34010.cpp | 8 +- src/devices/cpu/tms57002/tms57002.cpp | 2 +- src/devices/cpu/tms7000/tms7000.cpp | 24 +- src/devices/cpu/tms9900/ti990_10.cpp | 2 +- src/devices/cpu/tms9900/tms9900.cpp | 2 +- src/devices/cpu/tms9900/tms9980a.cpp | 2 +- src/devices/cpu/tms9900/tms9995.cpp | 4 +- src/devices/cpu/ucom4/ucom4.cpp | 8 +- src/devices/cpu/unsp/unsp.cpp | 2 +- src/devices/cpu/upd7725/upd7725.cpp | 4 +- src/devices/cpu/upd7810/upd7810.cpp | 10 +- src/devices/cpu/v30mz/v30mz.cpp | 2 +- src/devices/cpu/v60/v60.cpp | 4 +- src/devices/cpu/v810/v810.cpp | 2 +- src/devices/cpu/z180/z180.cpp | 2 +- src/devices/cpu/z8/z8.cpp | 6 +- src/devices/cpu/z80/kl5c80a12.cpp | 2 +- src/devices/cpu/z80/tmpz84c011.cpp | 2 +- src/devices/cpu/z80/tmpz84c015.cpp | 2 +- src/devices/cpu/z80/z80.cpp | 4 +- src/devices/cpu/z8000/z8000.cpp | 4 +- src/devices/imagedev/bitbngr.cpp | 2 +- src/devices/imagedev/cassette.cpp | 2 +- src/devices/imagedev/cassette.h | 2 +- src/devices/imagedev/chd_cd.cpp | 2 +- src/devices/imagedev/diablo.cpp | 2 +- src/devices/imagedev/flopdrv.cpp | 2 +- src/devices/imagedev/floppy.cpp | 122 +++---- src/devices/imagedev/harddriv.cpp | 2 +- src/devices/imagedev/mfmhd.cpp | 10 +- src/devices/imagedev/midiin.cpp | 2 +- src/devices/imagedev/midiin.h | 2 +- src/devices/imagedev/midiout.cpp | 2 +- src/devices/imagedev/midiout.h | 2 +- src/devices/imagedev/printer.cpp | 2 +- src/devices/imagedev/snapquik.cpp | 4 +- src/devices/machine/40105.cpp | 4 +- src/devices/machine/53c7xx.cpp | 2 +- src/devices/machine/53c810.cpp | 2 +- src/devices/machine/64h156.cpp | 2 +- src/devices/machine/6522via.cpp | 2 +- src/devices/machine/6525tpi.cpp | 2 +- src/devices/machine/6532riot.cpp | 2 +- src/devices/machine/68153bim.cpp | 6 +- src/devices/machine/6821pia.cpp | 2 +- src/devices/machine/68230pit.cpp | 2 +- src/devices/machine/68307.cpp | 3 + src/devices/machine/68307.h | 2 +- src/devices/machine/68340.cpp | 2 +- src/devices/machine/68340.h | 14 +- src/devices/machine/6840ptm.cpp | 2 +- src/devices/machine/6850acia.cpp | 2 +- src/devices/machine/68561mpcc.cpp | 10 +- src/devices/machine/7200fifo.cpp | 2 +- src/devices/machine/7400.cpp | 2 +- src/devices/machine/7404.cpp | 2 +- src/devices/machine/74123.cpp | 2 +- src/devices/machine/74145.cpp | 2 +- src/devices/machine/74148.cpp | 2 +- src/devices/machine/74153.cpp | 2 +- src/devices/machine/74157.cpp | 4 +- src/devices/machine/74161.cpp | 8 +- src/devices/machine/74175.cpp | 4 +- src/devices/machine/74181.cpp | 2 +- src/devices/machine/7474.cpp | 2 +- src/devices/machine/8042kbdc.cpp | 2 +- src/devices/machine/82s129.cpp | 4 +- src/devices/machine/8364_paula.cpp | 2 +- src/devices/machine/8530scc.cpp | 2 +- src/devices/machine/aakart.cpp | 2 +- src/devices/machine/adc0808.cpp | 2 +- src/devices/machine/adc083x.cpp | 8 +- src/devices/machine/adc1038.cpp | 2 +- src/devices/machine/adc1213x.cpp | 6 +- src/devices/machine/aicartc.cpp | 2 +- src/devices/machine/akiko.cpp | 2 +- src/devices/machine/am2847.cpp | 6 +- src/devices/machine/am53cf96.cpp | 2 +- src/devices/machine/am9517a.cpp | 6 +- src/devices/machine/amigafdc.cpp | 2 +- src/devices/machine/appldriv.cpp | 2 +- src/devices/machine/applefdc.cpp | 4 +- src/devices/machine/at28c16.cpp | 2 +- src/devices/machine/at29x.cpp | 6 +- src/devices/machine/at45dbxx.cpp | 6 +- src/devices/machine/at_keybc.cpp | 2 +- src/devices/machine/ataflash.cpp | 8 +- src/devices/machine/ataintf.cpp | 4 +- src/devices/machine/atapicdr.cpp | 4 +- src/devices/machine/ay31015.cpp | 4 +- src/devices/machine/bankdev.cpp | 2 +- src/devices/machine/bcreader.cpp | 2 +- src/devices/machine/bcreader.h | 2 +- src/devices/machine/buffer.cpp | 2 +- src/devices/machine/cdp1852.cpp | 2 +- src/devices/machine/cdp1871.cpp | 2 +- src/devices/machine/cdp1879.cpp | 2 +- src/devices/machine/clock.cpp | 2 +- src/devices/machine/com8116.cpp | 2 +- src/devices/machine/corvushd.cpp | 2 +- src/devices/machine/cr511b.cpp | 2 +- src/devices/machine/cr589.cpp | 2 +- src/devices/machine/cs4031.cpp | 2 +- src/devices/machine/cs8221.cpp | 2 +- src/devices/machine/diablo_hd.cpp | 2 +- src/devices/machine/dm9334.cpp | 2 +- src/devices/machine/dmac.cpp | 2 +- src/devices/machine/dp8390.cpp | 4 +- src/devices/machine/ds1204.cpp | 2 +- src/devices/machine/ds128x.cpp | 2 +- src/devices/machine/ds1302.cpp | 2 +- src/devices/machine/ds1315.cpp | 6 +- src/devices/machine/ds1386.cpp | 4 +- src/devices/machine/ds2401.cpp | 2 +- src/devices/machine/ds2404.cpp | 2 +- src/devices/machine/ds75160a.cpp | 2 +- src/devices/machine/ds75161a.cpp | 2 +- src/devices/machine/e0516.cpp | 2 +- src/devices/machine/e05a03.cpp | 2 +- src/devices/machine/e05a30.cpp | 2 +- src/devices/machine/eeprompar.cpp | 2 +- src/devices/machine/eepromser.cpp | 2 +- src/devices/machine/er2055.cpp | 2 +- src/devices/machine/f3853.cpp | 2 +- src/devices/machine/fdc37c665gt.cpp | 2 +- src/devices/machine/fga002.cpp | 2 +- src/devices/machine/gayle.cpp | 2 +- src/devices/machine/gen_latch.cpp | 4 +- src/devices/machine/genpc.cpp | 15 +- src/devices/machine/genpc.h | 22 +- src/devices/machine/gt64xxx.cpp | 2 +- src/devices/machine/hd63450.cpp | 2 +- src/devices/machine/hd64610.cpp | 2 +- src/devices/machine/hdc92x4.cpp | 4 +- src/devices/machine/hp_taco.cpp | 2 +- src/devices/machine/i2cmem.cpp | 2 +- src/devices/machine/i6300esb.cpp | 4 +- src/devices/machine/i80130.cpp | 2 +- src/devices/machine/i8155.cpp | 4 +- src/devices/machine/i8212.cpp | 2 +- src/devices/machine/i8214.cpp | 2 +- src/devices/machine/i82371sb.cpp | 6 +- src/devices/machine/i82371sb.h | 2 +- src/devices/machine/i8243.cpp | 2 +- src/devices/machine/i82439hx.cpp | 2 +- src/devices/machine/i82439tx.cpp | 2 +- src/devices/machine/i8251.cpp | 4 +- src/devices/machine/i82541.cpp | 2 +- src/devices/machine/i8255.cpp | 4 +- src/devices/machine/i8257.cpp | 2 +- src/devices/machine/i8271.cpp | 2 +- src/devices/machine/i8279.cpp | 2 +- src/devices/machine/i82875p.cpp | 6 +- src/devices/machine/i8355.cpp | 2 +- src/devices/machine/idectrl.cpp | 6 +- src/devices/machine/idehd.cpp | 2 +- src/devices/machine/im6402.cpp | 2 +- src/devices/machine/input_merger.cpp | 4 +- src/devices/machine/ins8154.cpp | 2 +- src/devices/machine/ins8250.cpp | 8 +- src/devices/machine/intelfsh.cpp | 64 ++-- src/devices/machine/k033906.cpp | 2 +- src/devices/machine/k053252.cpp | 4 +- src/devices/machine/k053252.h | 24 +- src/devices/machine/k056230.cpp | 2 +- src/devices/machine/kb3600.cpp | 2 +- src/devices/machine/keyboard.cpp | 2 +- src/devices/machine/kr2376.cpp | 2 +- src/devices/machine/laserdsc.h | 7 +- src/devices/machine/latch.cpp | 2 +- src/devices/machine/latch8.cpp | 2 +- src/devices/machine/lc89510.cpp | 2 +- src/devices/machine/ldp1000.cpp | 2 +- src/devices/machine/ldp1450.cpp | 2 +- src/devices/machine/ldpr8210.cpp | 4 +- src/devices/machine/ldstub.cpp | 4 +- src/devices/machine/ldv1000.cpp | 2 +- src/devices/machine/ldvp931.cpp | 2 +- src/devices/machine/lh5810.cpp | 2 +- src/devices/machine/linflash.cpp | 6 +- src/devices/machine/lpc-acpi.cpp | 2 +- src/devices/machine/lpc-pit.cpp | 2 +- src/devices/machine/lpc-rtc.cpp | 2 +- src/devices/machine/lpci.cpp | 2 +- src/devices/machine/m6m80011ap.cpp | 2 +- src/devices/machine/mb14241.cpp | 2 +- src/devices/machine/mb3773.cpp | 2 +- src/devices/machine/mb8421.cpp | 2 +- src/devices/machine/mb87078.cpp | 2 +- src/devices/machine/mb8795.cpp | 2 +- src/devices/machine/mb89352.cpp | 2 +- src/devices/machine/mb89363b.cpp | 2 +- src/devices/machine/mb89371.cpp | 2 +- src/devices/machine/mc146818.cpp | 2 +- src/devices/machine/mc2661.cpp | 2 +- src/devices/machine/mc68328.cpp | 2 +- src/devices/machine/mc6843.cpp | 2 +- src/devices/machine/mc6846.cpp | 2 +- src/devices/machine/mc6852.cpp | 2 +- src/devices/machine/mc6854.cpp | 2 +- src/devices/machine/mc68681.cpp | 6 +- src/devices/machine/mc68901.cpp | 2 +- src/devices/machine/mccs1850.cpp | 2 +- src/devices/machine/mcf5206e.cpp | 2 +- src/devices/machine/microtch.cpp | 2 +- src/devices/machine/mm5740.cpp | 3 +- src/devices/machine/mm58167.cpp | 2 +- src/devices/machine/mm58274c.cpp | 2 +- src/devices/machine/mm74c922.cpp | 4 +- src/devices/machine/mos6526.cpp | 8 +- src/devices/machine/mos6529.cpp | 2 +- src/devices/machine/mos6530.cpp | 2 +- src/devices/machine/mos6530n.cpp | 4 +- src/devices/machine/mos6551.cpp | 2 +- src/devices/machine/mos6702.cpp | 2 +- src/devices/machine/mos8706.cpp | 2 +- src/devices/machine/mos8722.cpp | 2 +- src/devices/machine/mos8726.cpp | 2 +- src/devices/machine/mpu401.cpp | 2 +- src/devices/machine/msm5832.cpp | 2 +- src/devices/machine/msm58321.cpp | 2 +- src/devices/machine/msm6242.cpp | 10 +- src/devices/machine/ncr5380.cpp | 2 +- src/devices/machine/ncr5380n.cpp | 2 +- src/devices/machine/ncr5390.cpp | 2 +- src/devices/machine/ncr539x.cpp | 2 +- src/devices/machine/netlist.cpp | 22 +- src/devices/machine/nmc9306.cpp | 2 +- src/devices/machine/nsc810.cpp | 2 +- src/devices/machine/nscsi_bus.cpp | 4 +- src/devices/machine/nscsi_cb.cpp | 2 +- src/devices/machine/nscsi_cd.cpp | 2 +- src/devices/machine/nscsi_hd.cpp | 2 +- src/devices/machine/nscsi_s1410.cpp | 2 +- src/devices/machine/nvram.cpp | 2 +- src/devices/machine/pc_fdc.cpp | 4 +- src/devices/machine/pc_lpt.cpp | 2 +- src/devices/machine/pccard.cpp | 2 +- src/devices/machine/pcf8593.cpp | 2 +- src/devices/machine/pci-apic.cpp | 2 +- src/devices/machine/pci-ide.cpp | 2 +- src/devices/machine/pci-sata.cpp | 2 +- src/devices/machine/pci-smbus.cpp | 2 +- src/devices/machine/pci-usb.cpp | 4 +- src/devices/machine/pci.cpp | 4 +- src/devices/machine/pci9050.cpp | 2 +- src/devices/machine/pckeybrd.cpp | 4 +- src/devices/machine/pdc.cpp | 2 +- src/devices/machine/phi.cpp | 2 +- src/devices/machine/pic8259.cpp | 2 +- src/devices/machine/pit8253.cpp | 4 +- src/devices/machine/pla.cpp | 2 +- src/devices/machine/r10696.cpp | 2 +- src/devices/machine/r10788.cpp | 2 +- src/devices/machine/ra17xx.cpp | 2 +- src/devices/machine/ram.cpp | 2 +- src/devices/machine/ram.h | 2 +- src/devices/machine/rf5c296.cpp | 2 +- src/devices/machine/roc10937.cpp | 10 +- src/devices/machine/rp5c01.cpp | 2 +- src/devices/machine/rp5c15.cpp | 2 +- src/devices/machine/rp5h01.cpp | 2 +- src/devices/machine/rtc4543.cpp | 4 +- src/devices/machine/rtc65271.cpp | 2 +- src/devices/machine/rtc9701.cpp | 2 +- src/devices/machine/s2636.cpp | 4 +- src/devices/machine/s3520cf.cpp | 2 +- src/devices/machine/s3c2400.cpp | 7 +- src/devices/machine/s3c2410.cpp | 7 +- src/devices/machine/s3c2440.cpp | 15 +- src/devices/machine/s3c44b0.cpp | 8 +- src/devices/machine/scnxx562.cpp | 12 +- src/devices/machine/serflash.cpp | 2 +- src/devices/machine/smartmed.cpp | 4 +- src/devices/machine/smc91c9x.cpp | 4 +- src/devices/machine/smpc.cpp | 8 +- src/devices/machine/sonydriv.cpp | 2 +- src/devices/machine/spchrom.cpp | 2 +- src/devices/machine/steppers.cpp | 2 +- src/devices/machine/strata.cpp | 2 +- src/devices/machine/tc009xlvc.cpp | 5 +- src/devices/machine/terminal.cpp | 4 +- src/devices/machine/timekpr.cpp | 12 +- src/devices/machine/tmc0430.cpp | 2 +- src/devices/machine/tmp68301.cpp | 2 +- src/devices/machine/tms1024.cpp | 4 +- src/devices/machine/tms5501.cpp | 2 +- src/devices/machine/tms6100.cpp | 4 +- src/devices/machine/tms9901.cpp | 2 +- src/devices/machine/tms9902.cpp | 2 +- src/devices/machine/upd1990a.cpp | 4 +- src/devices/machine/upd4701.cpp | 2 +- src/devices/machine/upd4992.cpp | 2 +- src/devices/machine/upd7002.cpp | 2 +- src/devices/machine/upd71071.cpp | 2 +- src/devices/machine/upd765.cpp | 24 +- src/devices/machine/v3021.cpp | 2 +- src/devices/machine/vrc4373.cpp | 2 +- src/devices/machine/vt82c496.cpp | 2 +- src/devices/machine/vt83c461.cpp | 2 +- src/devices/machine/watchdog.cpp | 6 +- src/devices/machine/wd11c00_17.cpp | 2 +- src/devices/machine/wd2010.cpp | 2 +- src/devices/machine/wd33c93.cpp | 2 +- src/devices/machine/wd7600.cpp | 2 +- src/devices/machine/wd_fdc.cpp | 46 +-- src/devices/machine/wozfdc.cpp | 4 +- src/devices/machine/x2212.cpp | 4 +- src/devices/machine/x76f041.cpp | 2 +- src/devices/machine/x76f100.cpp | 2 +- src/devices/machine/ym2148.cpp | 2 +- src/devices/machine/z80ctc.cpp | 2 +- src/devices/machine/z80dart.cpp | 18 +- src/devices/machine/z80dma.cpp | 2 +- src/devices/machine/z80pio.cpp | 2 +- src/devices/machine/z80scc.cpp | 20 +- src/devices/machine/z80sio.cpp | 6 +- src/devices/machine/z80sti.cpp | 2 +- src/devices/machine/z8536.cpp | 2 +- src/devices/sound/2203intf.cpp | 2 +- src/devices/sound/2608intf.cpp | 2 +- src/devices/sound/2610intf.cpp | 4 +- src/devices/sound/2612intf.cpp | 4 +- src/devices/sound/262intf.cpp | 2 +- src/devices/sound/315-5641.cpp | 2 +- src/devices/sound/3526intf.cpp | 2 +- src/devices/sound/3812intf.cpp | 2 +- src/devices/sound/8950intf.cpp | 2 +- src/devices/sound/ad1848.cpp | 3 + src/devices/sound/aica.cpp | 2 +- src/devices/sound/asc.cpp | 2 +- src/devices/sound/astrocde.cpp | 2 +- src/devices/sound/awacs.cpp | 2 +- src/devices/sound/ay8910.cpp | 18 +- src/devices/sound/beep.cpp | 2 +- src/devices/sound/bsmt2000.cpp | 2 +- src/devices/sound/c140.cpp | 2 +- src/devices/sound/c352.cpp | 2 +- src/devices/sound/c6280.cpp | 2 +- src/devices/sound/cdda.cpp | 2 +- src/devices/sound/cdp1863.cpp | 2 +- src/devices/sound/cdp1864.cpp | 2 +- src/devices/sound/cdp1864.h | 12 +- src/devices/sound/cdp1869.cpp | 2 +- src/devices/sound/cdp1869.h | 9 +- src/devices/sound/cem3394.cpp | 2 +- src/devices/sound/dac.cpp | 2 +- src/devices/sound/dac76.cpp | 2 +- src/devices/sound/dave.cpp | 2 +- src/devices/sound/dave.h | 12 +- src/devices/sound/digitalk.cpp | 2 +- src/devices/sound/discrete.cpp | 2 +- src/devices/sound/dmadac.cpp | 2 +- src/devices/sound/es1373.cpp | 7 +- src/devices/sound/es5503.cpp | 2 +- src/devices/sound/es5506.cpp | 4 +- src/devices/sound/es8712.cpp | 2 +- src/devices/sound/esqpump.cpp | 2 +- src/devices/sound/flt_rc.cpp | 2 +- src/devices/sound/flt_vol.cpp | 2 +- src/devices/sound/gaelco.cpp | 4 +- src/devices/sound/gb.cpp | 8 +- src/devices/sound/hc55516.cpp | 6 +- src/devices/sound/i5000.cpp | 2 +- src/devices/sound/ics2115.cpp | 2 +- src/devices/sound/iremga20.cpp | 2 +- src/devices/sound/k005289.cpp | 2 +- src/devices/sound/k007232.cpp | 2 +- src/devices/sound/k051649.cpp | 2 +- src/devices/sound/k053260.cpp | 2 +- src/devices/sound/k054539.cpp | 2 +- src/devices/sound/k056800.cpp | 2 +- src/devices/sound/l7a1045_l6028_dsp_a.cpp | 2 +- src/devices/sound/lmc1992.cpp | 2 +- src/devices/sound/mas3507d.cpp | 2 +- src/devices/sound/mea8000.cpp | 2 +- src/devices/sound/mm5837.cpp | 2 +- src/devices/sound/mos6560.cpp | 6 +- src/devices/sound/mos6560.h | 10 +- src/devices/sound/mos6581.cpp | 4 +- src/devices/sound/mos7360.cpp | 4 +- src/devices/sound/msm5205.cpp | 4 +- src/devices/sound/msm5232.cpp | 2 +- src/devices/sound/multipcm.cpp | 2 +- src/devices/sound/n63701x.cpp | 2 +- src/devices/sound/namco.cpp | 6 +- src/devices/sound/nes_apu.cpp | 4 +- src/devices/sound/nile.cpp | 2 +- src/devices/sound/okim6258.cpp | 2 +- src/devices/sound/okim6295.cpp | 2 +- src/devices/sound/okim6376.cpp | 2 +- src/devices/sound/okim9810.cpp | 2 +- src/devices/sound/pcd3311.cpp | 2 +- src/devices/sound/pci-ac97.cpp | 2 +- src/devices/sound/pokey.cpp | 2 +- src/devices/sound/qs1000.cpp | 2 +- src/devices/sound/qsound.cpp | 2 +- src/devices/sound/rf5c400.cpp | 2 +- src/devices/sound/rf5c68.cpp | 2 +- src/devices/sound/s14001a.cpp | 2 +- src/devices/sound/saa1099.cpp | 2 +- src/devices/sound/samples.cpp | 2 +- src/devices/sound/samples.h | 2 +- src/devices/sound/sb0400.cpp | 2 +- src/devices/sound/scsp.cpp | 2 +- src/devices/sound/segapcm.cpp | 2 +- src/devices/sound/sn76477.cpp | 2 +- src/devices/sound/sn76496.cpp | 20 +- src/devices/sound/snkwave.cpp | 2 +- src/devices/sound/sp0250.cpp | 2 +- src/devices/sound/sp0256.cpp | 2 +- src/devices/sound/speaker.cpp | 413 ----------------------- src/devices/sound/speaker.h | 95 ------ src/devices/sound/spkrdev.cpp | 414 ++++++++++++++++++++++++ src/devices/sound/spkrdev.h | 95 ++++++ src/devices/sound/spu.cpp | 2 +- src/devices/sound/st0016.cpp | 2 +- src/devices/sound/t6721a.cpp | 2 +- src/devices/sound/t6w28.cpp | 2 +- src/devices/sound/tc8830f.cpp | 2 +- src/devices/sound/tiaintf.cpp | 2 +- src/devices/sound/tms3615.cpp | 2 +- src/devices/sound/tms36xx.cpp | 2 +- src/devices/sound/tms5110.cpp | 20 +- src/devices/sound/tms5220.cpp | 10 +- src/devices/sound/upd1771.cpp | 2 +- src/devices/sound/upd7752.cpp | 2 +- src/devices/sound/upd7759.cpp | 4 +- src/devices/sound/vlm5030.cpp | 2 +- src/devices/sound/volt_reg.cpp | 2 +- src/devices/sound/votrax.cpp | 2 +- src/devices/sound/vrc6.cpp | 2 +- src/devices/sound/vrender0.cpp | 2 +- src/devices/sound/wave.cpp | 5 +- src/devices/sound/x1_010.cpp | 2 +- src/devices/sound/ym2151.cpp | 2 +- src/devices/sound/ym2413.cpp | 2 +- src/devices/sound/ymf271.cpp | 2 +- src/devices/sound/ymf278b.cpp | 2 +- src/devices/sound/ymz280b.cpp | 2 +- src/devices/sound/ymz770.cpp | 2 +- src/devices/sound/zsg2.cpp | 2 +- src/devices/video/315_5124.cpp | 6 +- src/devices/video/315_5124.h | 10 +- src/devices/video/315_5313.cpp | 2 +- src/devices/video/bufsprite.cpp | 8 +- src/devices/video/cdp1861.cpp | 2 +- src/devices/video/cdp1861.h | 11 +- src/devices/video/cdp1862.cpp | 4 +- src/devices/video/cesblit.cpp | 5 +- src/devices/video/clgd542x.cpp | 9 +- src/devices/video/crt9007.cpp | 4 +- src/devices/video/crt9021.cpp | 4 +- src/devices/video/crt9212.cpp | 2 +- src/devices/video/crtc_ega.cpp | 37 ++- src/devices/video/dl1416.cpp | 6 +- src/devices/video/dm9368.cpp | 2 +- src/devices/video/ef9340_1.cpp | 4 +- src/devices/video/ef9345.cpp | 5 +- src/devices/video/ef9364.cpp | 5 +- src/devices/video/ef9365.cpp | 5 +- src/devices/video/ef9369.cpp | 2 +- src/devices/video/epic12.cpp | 2 +- src/devices/video/fixfreq.cpp | 2 +- src/devices/video/fixfreq.h | 8 +- src/devices/video/gb_lcd.cpp | 11 +- src/devices/video/gba_lcd.cpp | 6 +- src/devices/video/gf4500.cpp | 2 +- src/devices/video/gf7600gs.cpp | 2 +- src/devices/video/hd44102.cpp | 2 +- src/devices/video/hd44352.cpp | 2 +- src/devices/video/hd44780.cpp | 4 +- src/devices/video/hd61830.cpp | 6 +- src/devices/video/hd63484.cpp | 5 +- src/devices/video/hd66421.cpp | 2 +- src/devices/video/hlcd0515.cpp | 4 +- src/devices/video/huc6202.cpp | 2 +- src/devices/video/huc6260.cpp | 5 +- src/devices/video/huc6261.cpp | 5 +- src/devices/video/huc6270.cpp | 2 +- src/devices/video/huc6271.cpp | 2 +- src/devices/video/huc6272.cpp | 2 +- src/devices/video/i8244.cpp | 7 +- src/devices/video/i82730.cpp | 4 +- src/devices/video/i8275.cpp | 4 +- src/devices/video/jangou_blitter.cpp | 2 +- src/devices/video/m50458.cpp | 3 +- src/devices/video/mb90082.cpp | 2 +- src/devices/video/mb_vcu.cpp | 2 +- src/devices/video/mc6845.cpp | 28 +- src/devices/video/mc6847.cpp | 16 +- src/devices/video/mc6847.h | 7 +- src/devices/video/mga2064w.cpp | 2 +- src/devices/video/mos6566.cpp | 16 +- src/devices/video/msm6222b.cpp | 4 +- src/devices/video/msm6255.cpp | 2 +- src/devices/video/pc_vga.cpp | 36 ++- src/devices/video/pc_vga.h | 36 ++- src/devices/video/pcd8544.cpp | 5 +- src/devices/video/poly.h | 9 +- src/devices/video/ppu2c0x.cpp | 18 +- src/devices/video/psx.cpp | 19 +- src/devices/video/ramdac.cpp | 2 +- src/devices/video/saa5050.cpp | 16 +- src/devices/video/scn2674.cpp | 5 +- src/devices/video/sed1200.cpp | 8 +- src/devices/video/sed1330.cpp | 2 +- src/devices/video/sed1520.cpp | 4 +- src/devices/video/snes_ppu.cpp | 2 +- src/devices/video/snes_ppu.h | 8 +- src/devices/video/stvvdp1.cpp | 3 +- src/devices/video/stvvdp2.cpp | 14 +- src/devices/video/t6a04.cpp | 2 +- src/devices/video/tea1002.cpp | 2 +- src/devices/video/tlc34076.cpp | 2 +- src/devices/video/tms34061.cpp | 4 +- src/devices/video/tms3556.cpp | 6 +- src/devices/video/tms9927.cpp | 10 +- src/devices/video/tms9928a.cpp | 16 +- src/devices/video/tms9928a.h | 9 +- src/devices/video/upd3301.cpp | 4 +- src/devices/video/upd7220.cpp | 4 +- src/devices/video/upd7227.cpp | 2 +- src/devices/video/v9938.cpp | 4 +- src/devices/video/v9938.h | 9 +- src/devices/video/vector.cpp | 2 +- src/devices/video/vic4567.cpp | 5 +- src/devices/video/vooddefs.h | 8 + src/devices/video/voodoo.cpp | 12 +- src/devices/video/voodoo_pci.cpp | 5 +- src/devices/video/zeus2.cpp | 2 +- src/emu/crsshair.h | 3 + src/emu/debug/debugcpu.cpp | 14 +- src/emu/debug/dvstate.cpp | 6 +- src/emu/device.cpp | 4 +- src/emu/device.h | 38 ++- src/emu/diexec.cpp | 1 + src/emu/diimage.h | 2 +- src/emu/disound.cpp | 1 + src/emu/divideo.cpp | 1 + src/emu/drawgfx.cpp | 2 +- src/emu/driver.h | 9 +- src/emu/drivers/empty.cpp | 5 +- src/emu/emu.h | 2 - src/emu/emupal.cpp | 3 +- src/emu/emupal.h | 2 +- src/emu/machine.cpp | 2 +- src/emu/mconfig.cpp | 40 ++- src/emu/mconfig.h | 4 +- src/emu/render.h | 2 +- src/emu/screen.cpp | 5 +- src/emu/screen.h | 16 +- src/emu/softlist_dev.cpp | 2 +- src/emu/softlist_dev.h | 2 +- src/emu/sound.cpp | 1 + src/emu/speaker.cpp | 6 +- src/emu/speaker.h | 17 +- src/emu/tilemap.cpp | 3 +- src/emu/timer.cpp | 3 +- src/frontend/mame/clifront.cpp | 8 +- src/frontend/mame/info.cpp | 11 +- src/frontend/mame/info.h | 7 +- src/frontend/mame/mameopts.cpp | 3 + src/frontend/mame/ui/devctrl.h | 2 +- src/mame/audio/alesis.cpp | 3 +- src/mame/audio/arcadia.cpp | 2 +- src/mame/audio/astrof.cpp | 1 + src/mame/audio/atarijsa.cpp | 8 +- src/mame/audio/bwidow.cpp | 4 +- src/mame/audio/bzone.cpp | 3 + src/mame/audio/cage.cpp | 15 +- src/mame/audio/cclimber.cpp | 2 +- src/mame/audio/channelf.cpp | 2 +- src/mame/audio/cinemat.cpp | 5 +- src/mame/audio/cliffhgr.cpp | 3 +- src/mame/audio/cliffhgr.h | 8 + src/mame/audio/cps3.cpp | 2 +- src/mame/audio/crbaloon.cpp | 1 + src/mame/audio/csd.cpp | 2 +- src/mame/audio/dai_snd.cpp | 2 +- src/mame/audio/dcs.cpp | 17 +- src/mame/audio/decobsmt.cpp | 3 +- src/mame/audio/dkong.cpp | 6 +- src/mame/audio/dsbz80.cpp | 2 +- src/mame/audio/efo_zsu.cpp | 7 +- src/mame/audio/exidy.cpp | 10 +- src/mame/audio/exidy440.cpp | 6 +- src/mame/audio/galaxian.cpp | 2 +- src/mame/audio/gamate.cpp | 2 +- src/mame/audio/geebee.cpp | 2 +- src/mame/audio/gomoku.cpp | 2 +- src/mame/audio/gottlieb.cpp | 8 +- src/mame/audio/gridlee.cpp | 2 +- src/mame/audio/harddriv.cpp | 3 +- src/mame/audio/hng64.cpp | 2 + src/mame/audio/hyprolyb.cpp | 2 +- src/mame/audio/irem.cpp | 11 +- src/mame/audio/jedi.cpp | 3 +- src/mame/audio/leland.cpp | 10 +- src/mame/audio/lynx.cpp | 4 +- src/mame/audio/m72.cpp | 2 +- src/mame/audio/mario.cpp | 6 +- src/mame/audio/micro3d.cpp | 2 +- src/mame/audio/midway.cpp | 8 +- src/mame/audio/mw8080bw.cpp | 1 + src/mame/audio/n8080.cpp | 6 +- src/mame/audio/namco52.cpp | 2 +- src/mame/audio/namco54.cpp | 2 +- src/mame/audio/phoenix.cpp | 2 +- src/mame/audio/pleiads.cpp | 6 +- src/mame/audio/polepos.cpp | 2 +- src/mame/audio/qix.cpp | 11 +- src/mame/audio/rax.cpp | 3 +- src/mame/audio/redalert.cpp | 6 +- src/mame/audio/redbaron.cpp | 2 +- src/mame/audio/s11c_bg.cpp | 2 +- src/mame/audio/scramble.cpp | 4 +- src/mame/audio/segag80r.cpp | 2 +- src/mame/audio/segam1audio.cpp | 3 +- src/mame/audio/segasnd.cpp | 6 +- src/mame/audio/seibu.cpp | 6 +- src/mame/audio/snes_snd.cpp | 2 +- src/mame/audio/snk6502.cpp | 2 +- src/mame/audio/socrates.cpp | 2 +- src/mame/audio/spacefb.cpp | 2 + src/mame/audio/special.cpp | 2 +- src/mame/audio/spiders.cpp | 6 +- src/mame/audio/svis_snd.cpp | 2 +- src/mame/audio/t5182.cpp | 2 +- src/mame/audio/taito_en.cpp | 3 +- src/mame/audio/taito_zm.cpp | 2 +- src/mame/audio/taitosnd.cpp | 2 +- src/mame/audio/targ.cpp | 1 + src/mame/audio/tiamc1.cpp | 2 +- src/mame/audio/timeplt.cpp | 4 +- src/mame/audio/trackfld.cpp | 2 +- src/mame/audio/turbo.cpp | 1 + src/mame/audio/turrett.cpp | 1 + src/mame/audio/tvc.cpp | 2 +- src/mame/audio/tx1.cpp | 4 +- src/mame/audio/vboy.cpp | 2 +- src/mame/audio/vc4000.cpp | 2 +- src/mame/audio/warpwarp.cpp | 2 +- src/mame/audio/williams.cpp | 6 +- src/mame/audio/wiping.cpp | 2 +- src/mame/audio/wpcsnd.cpp | 2 +- src/mame/audio/wswan.cpp | 2 +- src/mame/audio/zaccaria.cpp | 4 +- src/mame/drivers/1942.cpp | 7 +- src/mame/drivers/1943.cpp | 5 +- src/mame/drivers/1945kiii.cpp | 2 + src/mame/drivers/20pacgal.cpp | 2 + src/mame/drivers/2mindril.cpp | 4 +- src/mame/drivers/30test.cpp | 2 + src/mame/drivers/39in1.cpp | 2 + src/mame/drivers/3do.cpp | 4 +- src/mame/drivers/3x3puzzl.cpp | 2 + src/mame/drivers/4004clk.cpp | 2 + src/mame/drivers/40love.cpp | 4 + src/mame/drivers/4dpi.cpp | 1 + src/mame/drivers/4enlinea.cpp | 23 +- src/mame/drivers/4enraya.cpp | 5 +- src/mame/drivers/4roses.cpp | 14 +- src/mame/drivers/5clown.cpp | 10 +- src/mame/drivers/8080bw.cpp | 6 +- src/mame/drivers/88games.cpp | 8 +- src/mame/drivers/a2600.cpp | 2 + src/mame/drivers/a5105.cpp | 14 +- src/mame/drivers/a51xx.cpp | 2 + src/mame/drivers/a6809.cpp | 2 + src/mame/drivers/a7150.cpp | 1 + src/mame/drivers/a7800.cpp | 2 + src/mame/drivers/aa310.cpp | 4 +- src/mame/drivers/abc80.cpp | 2 + src/mame/drivers/abc80x.cpp | 1 + src/mame/drivers/ac1.cpp | 8 +- src/mame/drivers/ace.cpp | 1 + src/mame/drivers/acefruit.cpp | 1 + src/mame/drivers/aces1.cpp | 5 +- src/mame/drivers/acommand.cpp | 2 + src/mame/drivers/acrnsys1.cpp | 2 + src/mame/drivers/actfancr.cpp | 5 +- src/mame/drivers/adam.cpp | 2 + src/mame/drivers/adp.cpp | 8 +- src/mame/drivers/advision.cpp | 4 + src/mame/drivers/aeroboto.cpp | 6 +- src/mame/drivers/aerofgt.cpp | 5 +- src/mame/drivers/age_candy.cpp | 1 + src/mame/drivers/aim65.cpp | 3 + src/mame/drivers/airbustr.cpp | 5 +- src/mame/drivers/airraid.cpp | 23 +- src/mame/drivers/ajax.cpp | 7 +- src/mame/drivers/albazc.cpp | 2 + src/mame/drivers/albazg.cpp | 2 + src/mame/drivers/aleck64.cpp | 6 +- src/mame/drivers/aleisttl.cpp | 1 + src/mame/drivers/alesis.cpp | 1 + src/mame/drivers/alg.cpp | 5 +- src/mame/drivers/alien.cpp | 2 + src/mame/drivers/aliens.cpp | 6 +- src/mame/drivers/alinvade.cpp | 4 + src/mame/drivers/alpha68k.cpp | 4 +- src/mame/drivers/alphasma.cpp | 1 + src/mame/drivers/alphatro.cpp | 10 +- src/mame/drivers/alto2.cpp | 5 +- src/mame/drivers/amaticmg.cpp | 16 +- src/mame/drivers/amazonlf.cpp | 1 + src/mame/drivers/ambush.cpp | 2 + src/mame/drivers/amerihok.cpp | 1 + src/mame/drivers/amiga.cpp | 1 + src/mame/drivers/ampoker2.cpp | 8 +- src/mame/drivers/amspdwy.cpp | 4 +- src/mame/drivers/amstrad.cpp | 1 + src/mame/drivers/amusco.cpp | 27 +- src/mame/drivers/amust.cpp | 10 +- src/mame/drivers/angelkds.cpp | 8 +- src/mame/drivers/anzterm.cpp | 1 + src/mame/drivers/apc.cpp | 10 +- src/mame/drivers/apexc.cpp | 7 +- src/mame/drivers/apf.cpp | 16 +- src/mame/drivers/apogee.cpp | 16 +- src/mame/drivers/apollo.cpp | 12 +- src/mame/drivers/apple1.cpp | 1 + src/mame/drivers/apple2.cpp | 55 ++-- src/mame/drivers/apple2e.cpp | 29 +- src/mame/drivers/apple2gs.cpp | 22 +- src/mame/drivers/apple3.cpp | 5 +- src/mame/drivers/applix.cpp | 15 +- src/mame/drivers/appoooh.cpp | 5 +- src/mame/drivers/apricot.cpp | 22 +- src/mame/drivers/apricotf.cpp | 7 +- src/mame/drivers/apricotp.cpp | 6 +- src/mame/drivers/aquarium.cpp | 4 +- src/mame/drivers/aquarius.cpp | 3 + src/mame/drivers/arabian.cpp | 8 +- src/mame/drivers/arachnid.cpp | 5 +- src/mame/drivers/arcadecl.cpp | 3 +- src/mame/drivers/arcadia.cpp | 1 + src/mame/drivers/argo.cpp | 3 +- src/mame/drivers/argus.cpp | 4 +- src/mame/drivers/aristmk4.cpp | 2 + src/mame/drivers/aristmk5.cpp | 6 +- src/mame/drivers/aristmk6.cpp | 1 + src/mame/drivers/arkanoid.cpp | 3 + src/mame/drivers/armedf.cpp | 3 + src/mame/drivers/arsystems.cpp | 4 +- src/mame/drivers/artmagic.cpp | 10 +- src/mame/drivers/ashnojoe.cpp | 6 +- src/mame/drivers/asst128.cpp | 2 +- src/mame/drivers/asterix.cpp | 8 +- src/mame/drivers/asteroid.cpp | 14 +- src/mame/drivers/astinvad.cpp | 2 + src/mame/drivers/astrcorp.cpp | 5 +- src/mame/drivers/astrocde.cpp | 5 +- src/mame/drivers/astrof.cpp | 2 +- src/mame/drivers/astrohome.cpp | 15 +- src/mame/drivers/asuka.cpp | 15 +- src/mame/drivers/at.cpp | 17 +- src/mame/drivers/atari400.cpp | 2 + src/mame/drivers/atari_s1.cpp | 3 + src/mame/drivers/atari_s2.cpp | 3 + src/mame/drivers/atarifb.cpp | 3 +- src/mame/drivers/atarig1.cpp | 4 +- src/mame/drivers/atarig42.cpp | 4 +- src/mame/drivers/atarigx2.cpp | 4 +- src/mame/drivers/atarist.cpp | 2 + src/mame/drivers/atarisy1.cpp | 3 +- src/mame/drivers/atarisy2.cpp | 1 + src/mame/drivers/atarisy4.cpp | 1 + src/mame/drivers/atarittl.cpp | 1 + src/mame/drivers/atetris.cpp | 1 + src/mame/drivers/atm.cpp | 6 +- src/mame/drivers/atom.cpp | 2 + src/mame/drivers/atronic.cpp | 1 + src/mame/drivers/attache.cpp | 17 +- src/mame/drivers/attckufo.cpp | 1 + src/mame/drivers/atvtrack.cpp | 1 + src/mame/drivers/aussiebyte.cpp | 3 + src/mame/drivers/avalnche.cpp | 4 +- src/mame/drivers/avigo.cpp | 4 + src/mame/drivers/avt.cpp | 12 +- src/mame/drivers/ax20.cpp | 3 +- src/mame/drivers/aztarac.cpp | 8 +- src/mame/drivers/b16.cpp | 3 +- src/mame/drivers/b2m.cpp | 2 + src/mame/drivers/backfire.cpp | 4 +- src/mame/drivers/badlands.cpp | 3 +- src/mame/drivers/bagman.cpp | 5 +- src/mame/drivers/balsente.cpp | 4 +- src/mame/drivers/banctec.cpp | 3 +- src/mame/drivers/bankp.cpp | 5 +- src/mame/drivers/baraduke.cpp | 5 +- src/mame/drivers/barata.cpp | 8 +- src/mame/drivers/bartop52.cpp | 8 +- src/mame/drivers/batman.cpp | 3 +- src/mame/drivers/battlane.cpp | 6 +- src/mame/drivers/battlera.cpp | 3 +- src/mame/drivers/battlex.cpp | 5 +- src/mame/drivers/battlnts.cpp | 7 +- src/mame/drivers/bbc.cpp | 9 +- src/mame/drivers/bbusters.cpp | 7 +- src/mame/drivers/bcs3.cpp | 2 + src/mame/drivers/beaminv.cpp | 2 + src/mame/drivers/beathead.cpp | 1 + src/mame/drivers/bebox.cpp | 1 + src/mame/drivers/beehive.cpp | 1 + src/mame/drivers/beezer.cpp | 2 + src/mame/drivers/belatra.cpp | 1 + src/mame/drivers/berzerk.cpp | 5 +- src/mame/drivers/bestleag.cpp | 2 + src/mame/drivers/beta.cpp | 4 +- src/mame/drivers/bfcobra.cpp | 12 +- src/mame/drivers/bfm_ad5.cpp | 1 + src/mame/drivers/bfm_sc1.cpp | 1 + src/mame/drivers/bfm_sc2.cpp | 8 +- src/mame/drivers/bfm_sc4.cpp | 16 +- src/mame/drivers/bfm_sc5.cpp | 8 +- src/mame/drivers/bfm_swp.cpp | 2 + src/mame/drivers/bfmsys83.cpp | 1 + src/mame/drivers/bfmsys85.cpp | 1 + src/mame/drivers/big10.cpp | 2 + src/mame/drivers/bigbord2.cpp | 12 +- src/mame/drivers/bigevglf.cpp | 6 +- src/mame/drivers/bigstrkb.cpp | 5 +- src/mame/drivers/binbug.cpp | 5 +- src/mame/drivers/bingoc.cpp | 2 + src/mame/drivers/bingoman.cpp | 2 + src/mame/drivers/bingor.cpp | 2 + src/mame/drivers/bionicc.cpp | 5 +- src/mame/drivers/bishi.cpp | 5 +- src/mame/drivers/bitgraph.cpp | 3 + src/mame/drivers/bk.cpp | 10 +- src/mame/drivers/bking.cpp | 2 + src/mame/drivers/blackt96.cpp | 2 + src/mame/drivers/bladestl.cpp | 7 +- src/mame/drivers/blitz.cpp | 13 +- src/mame/drivers/blitz68k.cpp | 7 +- src/mame/drivers/blktiger.cpp | 7 +- src/mame/drivers/blmbycar.cpp | 5 +- src/mame/drivers/blockade.cpp | 5 +- src/mame/drivers/blockhl.cpp | 7 +- src/mame/drivers/blockout.cpp | 5 +- src/mame/drivers/bloodbro.cpp | 5 +- src/mame/drivers/blstroid.cpp | 6 +- src/mame/drivers/blueprnt.cpp | 7 +- src/mame/drivers/bmcbowl.cpp | 2 + src/mame/drivers/bmcpokr.cpp | 2 + src/mame/drivers/bmjr.cpp | 4 +- src/mame/drivers/bml3.cpp | 11 +- src/mame/drivers/bnstars.cpp | 7 +- src/mame/drivers/bntyhunt.cpp | 1 + src/mame/drivers/bogeyman.cpp | 5 +- src/mame/drivers/bombjack.cpp | 5 +- src/mame/drivers/boogwing.cpp | 6 +- src/mame/drivers/bottom9.cpp | 7 +- src/mame/drivers/bowltry.cpp | 1 + src/mame/drivers/boxer.cpp | 1 + src/mame/drivers/br8641.cpp | 1 + src/mame/drivers/brkthru.cpp | 5 +- src/mame/drivers/bsktball.cpp | 2 + src/mame/drivers/btime.cpp | 4 +- src/mame/drivers/btoads.cpp | 2 + src/mame/drivers/bublbobl.cpp | 7 +- src/mame/drivers/buggychl.cpp | 4 +- src/mame/drivers/busicom.cpp | 4 +- src/mame/drivers/buster.cpp | 2 + src/mame/drivers/bw12.cpp | 2 + src/mame/drivers/bw2.cpp | 1 + src/mame/drivers/bwidow.cpp | 4 +- src/mame/drivers/bwing.cpp | 3 + src/mame/drivers/by35.cpp | 8 +- src/mame/drivers/byvid.cpp | 3 +- src/mame/drivers/bzone.cpp | 5 +- src/mame/drivers/c10.cpp | 3 +- src/mame/drivers/c128.cpp | 2 + src/mame/drivers/c64.cpp | 2 + src/mame/drivers/c64dtv.cpp | 1 + src/mame/drivers/c65.cpp | 2 + src/mame/drivers/c80.cpp | 4 + src/mame/drivers/cabal.cpp | 6 +- src/mame/drivers/cabaret.cpp | 2 + src/mame/drivers/calchase.cpp | 2 + src/mame/drivers/calomega.cpp | 20 +- src/mame/drivers/calorie.cpp | 2 + src/mame/drivers/camplynx.cpp | 12 +- src/mame/drivers/canyon.cpp | 4 +- src/mame/drivers/capbowl.cpp | 4 +- src/mame/drivers/capr1.cpp | 1 + src/mame/drivers/cardline.cpp | 3 + src/mame/drivers/carjmbre.cpp | 4 +- src/mame/drivers/carpolo.cpp | 4 +- src/mame/drivers/carrera.cpp | 2 + src/mame/drivers/casloopy.cpp | 3 +- src/mame/drivers/caswin.cpp | 2 + src/mame/drivers/cat.cpp | 20 +- src/mame/drivers/cave.cpp | 7 +- src/mame/drivers/cavepc.cpp | 2 +- src/mame/drivers/cb2001.cpp | 4 +- src/mame/drivers/cball.cpp | 1 + src/mame/drivers/cbasebal.cpp | 5 +- src/mame/drivers/cbm2.cpp | 2 + src/mame/drivers/cbuster.cpp | 6 +- src/mame/drivers/cc40.cpp | 3 + src/mame/drivers/ccastles.cpp | 4 +- src/mame/drivers/cchance.cpp | 6 +- src/mame/drivers/cchasm.cpp | 2 + src/mame/drivers/cclimber.cpp | 7 +- src/mame/drivers/cd2650.cpp | 8 +- src/mame/drivers/cdc721.cpp | 6 +- src/mame/drivers/cdi.cpp | 18 +- src/mame/drivers/cedar_magnet.cpp | 3 + src/mame/drivers/centiped.cpp | 4 +- src/mame/drivers/cesclass.cpp | 15 +- src/mame/drivers/cfx9850.cpp | 1 + src/mame/drivers/cgc7900.cpp | 1 + src/mame/drivers/cgenie.cpp | 3 + src/mame/drivers/chaknpop.cpp | 6 +- src/mame/drivers/cham24.cpp | 2 + src/mame/drivers/champbas.cpp | 2 + src/mame/drivers/champbwl.cpp | 4 +- src/mame/drivers/chanbara.cpp | 2 + src/mame/drivers/chance32.cpp | 2 + src/mame/drivers/changela.cpp | 1 + src/mame/drivers/channelf.cpp | 2 + src/mame/drivers/cheekyms.cpp | 2 + src/mame/drivers/chessmst.cpp | 12 +- src/mame/drivers/chexx.cpp | 5 +- src/mame/drivers/chihiro.cpp | 27 +- src/mame/drivers/chinagat.cpp | 11 +- src/mame/drivers/chinsan.cpp | 2 + src/mame/drivers/chqflag.cpp | 7 +- src/mame/drivers/chsuper.cpp | 4 + src/mame/drivers/cinemat.cpp | 1 - src/mame/drivers/circus.cpp | 6 +- src/mame/drivers/circusc.cpp | 4 + src/mame/drivers/cischeat.cpp | 4 +- src/mame/drivers/citycon.cpp | 5 +- src/mame/drivers/clayshoo.cpp | 1 + src/mame/drivers/clcd.cpp | 4 +- src/mame/drivers/cliffhgr.cpp | 9 +- src/mame/drivers/cloak.cpp | 5 +- src/mame/drivers/cloud9.cpp | 4 +- src/mame/drivers/clowndwn.cpp | 1 + src/mame/drivers/clshroad.cpp | 8 +- src/mame/drivers/cmi.cpp | 20 +- src/mame/drivers/cmmb.cpp | 1 + src/mame/drivers/cninja.cpp | 4 +- src/mame/drivers/cntsteer.cpp | 2 + src/mame/drivers/cobra.cpp | 5 +- src/mame/drivers/coco12.cpp | 15 +- src/mame/drivers/cocoloco.cpp | 16 +- src/mame/drivers/coinmstr.cpp | 11 +- src/mame/drivers/coinmvga.cpp | 14 +- src/mame/drivers/coleco.cpp | 2 + src/mame/drivers/combatsc.cpp | 4 +- src/mame/drivers/comebaby.cpp | 1 + src/mame/drivers/commando.cpp | 5 +- src/mame/drivers/compgolf.cpp | 3 + src/mame/drivers/compucolor.cpp | 11 +- src/mame/drivers/comquest.cpp | 5 +- src/mame/drivers/comx35.cpp | 1 + src/mame/drivers/concept.cpp | 5 +- src/mame/drivers/contra.cpp | 6 +- src/mame/drivers/coolpool.cpp | 3 + src/mame/drivers/coolridr.cpp | 8 +- src/mame/drivers/cop01.cpp | 5 +- src/mame/drivers/cops.cpp | 2 +- src/mame/drivers/copsnrob.cpp | 5 +- src/mame/drivers/corona.cpp | 21 +- src/mame/drivers/cosmic.cpp | 2 + src/mame/drivers/cosmicos.cpp | 4 + src/mame/drivers/cps1.cpp | 4 +- src/mame/drivers/cps2.cpp | 1 + src/mame/drivers/cps3.cpp | 2 + src/mame/drivers/craft.cpp | 2 + src/mame/drivers/crbaloon.cpp | 4 +- src/mame/drivers/crgolf.cpp | 5 +- src/mame/drivers/crimfght.cpp | 6 +- src/mame/drivers/crospang.cpp | 5 +- src/mame/drivers/crshrace.cpp | 6 +- src/mame/drivers/crvision.cpp | 3 + src/mame/drivers/crystal.cpp | 8 +- src/mame/drivers/csplayh5.cpp | 1 + src/mame/drivers/cswat.cpp | 4 +- src/mame/drivers/ct486.cpp | 15 +- src/mame/drivers/cubeqst.cpp | 1 + src/mame/drivers/cubo.cpp | 1 + src/mame/drivers/cultures.cpp | 4 +- src/mame/drivers/cupidon.cpp | 3 +- src/mame/drivers/cv1k.cpp | 10 +- src/mame/drivers/cvs.cpp | 1 + src/mame/drivers/cxgz80.cpp | 1 + src/mame/drivers/cxhumax.cpp | 3 + src/mame/drivers/cyberbal.cpp | 3 + src/mame/drivers/cybertnk.cpp | 4 +- src/mame/drivers/cybiko.cpp | 5 +- src/mame/drivers/cyclemb.cpp | 5 +- src/mame/drivers/d6800.cpp | 6 +- src/mame/drivers/d9final.cpp | 2 + src/mame/drivers/dacholer.cpp | 2 + src/mame/drivers/dai.cpp | 2 + src/mame/drivers/dai3wksi.cpp | 6 +- src/mame/drivers/dambustr.cpp | 5 +- src/mame/drivers/darius.cpp | 10 +- src/mame/drivers/darkmist.cpp | 3 +- src/mame/drivers/darkseal.cpp | 6 +- src/mame/drivers/daruma.cpp | 3 +- src/mame/drivers/dassault.cpp | 6 +- src/mame/drivers/dblcrown.cpp | 2 + src/mame/drivers/dblewing.cpp | 12 +- src/mame/drivers/dbz.cpp | 4 +- src/mame/drivers/dccons.cpp | 13 +- src/mame/drivers/dcheese.cpp | 6 +- src/mame/drivers/dcon.cpp | 5 +- src/mame/drivers/dct11em.cpp | 2 + src/mame/drivers/dday.cpp | 4 +- src/mame/drivers/ddayjlc.cpp | 2 + src/mame/drivers/ddealer.cpp | 2 + src/mame/drivers/ddenlovr.cpp | 5 +- src/mame/drivers/ddragon.cpp | 7 +- src/mame/drivers/ddragon3.cpp | 5 +- src/mame/drivers/ddribble.cpp | 7 +- src/mame/drivers/de_2.cpp | 8 +- src/mame/drivers/deadang.cpp | 5 +- src/mame/drivers/dec0.cpp | 5 +- src/mame/drivers/dec8.cpp | 12 +- src/mame/drivers/deco156.cpp | 2 + src/mame/drivers/deco32.cpp | 4 +- src/mame/drivers/deco_ld.cpp | 1 + src/mame/drivers/deco_mlc.cpp | 4 +- src/mame/drivers/decocass.cpp | 6 +- src/mame/drivers/dectalk.cpp | 1 + src/mame/drivers/decwritr.cpp | 4 +- src/mame/drivers/deniam.cpp | 5 +- src/mame/drivers/deshoros.cpp | 2 + src/mame/drivers/destroyr.cpp | 1 + src/mame/drivers/dfruit.cpp | 8 +- src/mame/drivers/dgn_beta.cpp | 9 +- src/mame/drivers/dgpix.cpp | 3 +- src/mame/drivers/didact.cpp | 10 +- src/mame/drivers/dietgo.cpp | 5 +- src/mame/drivers/digel804.cpp | 26 +- src/mame/drivers/dim68k.cpp | 6 +- src/mame/drivers/discoboy.cpp | 4 +- src/mame/drivers/divebomb.cpp | 2 + src/mame/drivers/diverboy.cpp | 2 + src/mame/drivers/djboy.cpp | 5 +- src/mame/drivers/djmain.cpp | 6 +- src/mame/drivers/dkong.cpp | 4 +- src/mame/drivers/dlair.cpp | 7 +- src/mame/drivers/dlair2.cpp | 2 + src/mame/drivers/dm7000.cpp | 1 + src/mame/drivers/dmndrby.cpp | 4 +- src/mame/drivers/dms5000.cpp | 1 + src/mame/drivers/dmv.cpp | 14 +- src/mame/drivers/docastle.cpp | 5 +- src/mame/drivers/dogfgt.cpp | 4 +- src/mame/drivers/dolphunk.cpp | 4 +- src/mame/drivers/dominob.cpp | 2 + src/mame/drivers/dooyong.cpp | 10 +- src/mame/drivers/dorachan.cpp | 1 + src/mame/drivers/dotrikun.cpp | 1 + src/mame/drivers/dragrace.cpp | 3 +- src/mame/drivers/dreambal.cpp | 8 +- src/mame/drivers/dreamwld.cpp | 2 + src/mame/drivers/drgnmst.cpp | 5 +- src/mame/drivers/dribling.cpp | 4 +- src/mame/drivers/drmicro.cpp | 5 +- src/mame/drivers/drtomy.cpp | 2 + src/mame/drivers/drw80pkr.cpp | 4 +- src/mame/drivers/dunhuang.cpp | 3 + src/mame/drivers/dvk_kcgd.cpp | 2 + src/mame/drivers/dvk_ksm.cpp | 2 + src/mame/drivers/dwarfd.cpp | 4 +- src/mame/drivers/dynadice.cpp | 6 +- src/mame/drivers/dynax.cpp | 8 +- src/mame/drivers/dynduke.cpp | 5 +- src/mame/drivers/ec65.cpp | 1 + src/mame/drivers/ecoinf3.cpp | 8 +- src/mame/drivers/egghunt.cpp | 2 + src/mame/drivers/einstein.cpp | 8 +- src/mame/drivers/electron.cpp | 2 + src/mame/drivers/elwro800.cpp | 5 +- src/mame/drivers/embargo.cpp | 1 + src/mame/drivers/enigma2.cpp | 2 + src/mame/drivers/enmirage.cpp | 1 + src/mame/drivers/eolith.cpp | 6 +- src/mame/drivers/eolith16.cpp | 6 +- src/mame/drivers/ep64.cpp | 16 +- src/mame/drivers/epos.cpp | 6 +- src/mame/drivers/eprom.cpp | 4 +- src/mame/drivers/equites.cpp | 2 + src/mame/drivers/ertictac.cpp | 1 + src/mame/drivers/esd16.cpp | 9 +- src/mame/drivers/esh.cpp | 1 + src/mame/drivers/espial.cpp | 4 +- src/mame/drivers/esq1.cpp | 6 +- src/mame/drivers/esq5505.cpp | 20 +- src/mame/drivers/esqasr.cpp | 9 +- src/mame/drivers/esqkt.cpp | 22 +- src/mame/drivers/esqmr.cpp | 11 +- src/mame/drivers/esripsys.cpp | 2 + src/mame/drivers/et3400.cpp | 2 + src/mame/drivers/eti660.cpp | 2 + src/mame/drivers/ettrivia.cpp | 4 +- src/mame/drivers/excali64.cpp | 25 +- src/mame/drivers/exedexes.cpp | 5 +- src/mame/drivers/exelv.cpp | 12 +- src/mame/drivers/exerion.cpp | 4 +- src/mame/drivers/exp85.cpp | 2 + src/mame/drivers/expro02.cpp | 6 +- src/mame/drivers/exprraid.cpp | 5 +- src/mame/drivers/exterm.cpp | 3 + src/mame/drivers/exzisus.cpp | 7 +- src/mame/drivers/f-32.cpp | 3 + src/mame/drivers/f1gp.cpp | 6 +- src/mame/drivers/famibox.cpp | 2 + src/mame/drivers/fantland.cpp | 3 + src/mame/drivers/fanucspmg.cpp | 11 +- src/mame/drivers/fastfred.cpp | 5 +- src/mame/drivers/fastinvaders.cpp | 7 +- src/mame/drivers/fastlane.cpp | 8 +- src/mame/drivers/fb01.cpp | 13 +- src/mame/drivers/fc100.cpp | 18 +- src/mame/drivers/fcombat.cpp | 5 +- src/mame/drivers/fcrash.cpp | 5 +- src/mame/drivers/feversoc.cpp | 2 + src/mame/drivers/fidel6502.cpp | 2 + src/mame/drivers/fidel68k.cpp | 2 + src/mame/drivers/fidelz80.cpp | 2 + src/mame/drivers/finalizr.cpp | 4 + src/mame/drivers/fireball.cpp | 5 +- src/mame/drivers/firebeat.cpp | 13 +- src/mame/drivers/firefox.cpp | 1 + src/mame/drivers/firetrap.cpp | 5 +- src/mame/drivers/firetrk.cpp | 3 +- src/mame/drivers/fitfight.cpp | 6 +- src/mame/drivers/fk1.cpp | 1 + src/mame/drivers/flipjack.cpp | 3 + src/mame/drivers/flkatck.cpp | 7 +- src/mame/drivers/flower.cpp | 1 + src/mame/drivers/flstory.cpp | 6 +- src/mame/drivers/flyball.cpp | 1 + src/mame/drivers/fm7.cpp | 14 +- src/mame/drivers/fmtowns.cpp | 4 + src/mame/drivers/foodf.cpp | 3 +- src/mame/drivers/forte2.cpp | 2 + src/mame/drivers/fortecar.cpp | 20 +- src/mame/drivers/fp1100.cpp | 2 + src/mame/drivers/fp200.cpp | 2 + src/mame/drivers/fp6000.cpp | 1 + src/mame/drivers/freekick.cpp | 5 +- src/mame/drivers/fresh.cpp | 2 +- src/mame/drivers/fromanc2.cpp | 5 +- src/mame/drivers/fromance.cpp | 6 +- src/mame/drivers/funkball.cpp | 9 +- src/mame/drivers/funkybee.cpp | 5 +- src/mame/drivers/funkyjet.cpp | 5 +- src/mame/drivers/funtech.cpp | 4 + src/mame/drivers/funworld.cpp | 14 +- src/mame/drivers/funybubl.cpp | 5 +- src/mame/drivers/fuukifg2.cpp | 4 +- src/mame/drivers/fuukifg3.cpp | 4 +- src/mame/drivers/g627.cpp | 5 +- src/mame/drivers/gaelco.cpp | 9 +- src/mame/drivers/gaelco2.cpp | 7 +- src/mame/drivers/gaelco3d.cpp | 9 +- src/mame/drivers/gaiden.cpp | 7 +- src/mame/drivers/gal3.cpp | 6 +- src/mame/drivers/galaga.cpp | 19 +- src/mame/drivers/galaxi.cpp | 9 +- src/mame/drivers/galaxia.cpp | 4 +- src/mame/drivers/galaxian.cpp | 3 + src/mame/drivers/galaxold.cpp | 6 +- src/mame/drivers/galaxy.cpp | 14 +- src/mame/drivers/galeb.cpp | 4 + src/mame/drivers/galgame.cpp | 1 + src/mame/drivers/galgames.cpp | 12 +- src/mame/drivers/galivan.cpp | 3 + src/mame/drivers/galpani2.cpp | 6 +- src/mame/drivers/galpani3.cpp | 8 +- src/mame/drivers/galpanic.cpp | 9 +- src/mame/drivers/galspnbl.cpp | 4 +- src/mame/drivers/gamate.cpp | 8 +- src/mame/drivers/gambl186.cpp | 5 +- src/mame/drivers/gamecom.cpp | 5 + src/mame/drivers/gamecstl.cpp | 5 +- src/mame/drivers/gameking.cpp | 4 +- src/mame/drivers/gameplan.cpp | 4 +- src/mame/drivers/gamepock.cpp | 10 +- src/mame/drivers/gamtor.cpp | 4 +- src/mame/drivers/gaplus.cpp | 4 +- src/mame/drivers/gatron.cpp | 14 +- src/mame/drivers/gauntlet.cpp | 3 +- src/mame/drivers/gb.cpp | 2 + src/mame/drivers/gba.cpp | 3 + src/mame/drivers/gberet.cpp | 9 +- src/mame/drivers/gcpinbal.cpp | 5 +- src/mame/drivers/gei.cpp | 2 + src/mame/drivers/geneve.cpp | 3 + src/mame/drivers/geniusiq.cpp | 1 + src/mame/drivers/ggconnie.cpp | 11 +- src/mame/drivers/ghosteo.cpp | 2 + src/mame/drivers/gijoe.cpp | 7 +- src/mame/drivers/ginganin.cpp | 8 +- src/mame/drivers/gizmondo.cpp | 2 + src/mame/drivers/gkigt.cpp | 5 +- src/mame/drivers/gladiatr.cpp | 3 + src/mame/drivers/glasgow.cpp | 5 +- src/mame/drivers/glass.cpp | 6 +- src/mame/drivers/gluck2.cpp | 12 +- src/mame/drivers/gmaster.cpp | 8 +- src/mame/drivers/gng.cpp | 5 +- src/mame/drivers/go2000.cpp | 3 + src/mame/drivers/goal92.cpp | 6 +- src/mame/drivers/goindol.cpp | 5 +- src/mame/drivers/goldngam.cpp | 10 +- src/mame/drivers/goldnpkr.cpp | 20 +- src/mame/drivers/goldstar.cpp | 10 +- src/mame/drivers/gomoku.cpp | 4 +- src/mame/drivers/good.cpp | 2 + src/mame/drivers/goodejan.cpp | 5 +- src/mame/drivers/gotcha.cpp | 11 +- src/mame/drivers/gottlieb.cpp | 2 + src/mame/drivers/gotya.cpp | 5 +- src/mame/drivers/goupil.cpp | 7 +- src/mame/drivers/gp2x.cpp | 2 + src/mame/drivers/gp32.cpp | 5 + src/mame/drivers/gp_1.cpp | 3 + src/mame/drivers/gpworld.cpp | 1 + src/mame/drivers/gradius3.cpp | 7 +- src/mame/drivers/grchamp.cpp | 4 +- src/mame/drivers/grfd2301.cpp | 3 +- src/mame/drivers/gridlee.cpp | 4 +- src/mame/drivers/groundfx.cpp | 6 +- src/mame/drivers/gstream.cpp | 2 + src/mame/drivers/gstriker.cpp | 7 +- src/mame/drivers/gsword.cpp | 2 + src/mame/drivers/gticlub.cpp | 3 +- src/mame/drivers/gts3a.cpp | 3 + src/mame/drivers/gts80.cpp | 1 + src/mame/drivers/gts80a.cpp | 3 + src/mame/drivers/gts80b.cpp | 4 + src/mame/drivers/guab.cpp | 14 +- src/mame/drivers/gumbo.cpp | 6 +- src/mame/drivers/gunbustr.cpp | 6 +- src/mame/drivers/gundealr.cpp | 6 +- src/mame/drivers/gunpey.cpp | 2 + src/mame/drivers/gunsmoke.cpp | 5 +- src/mame/drivers/gyruss.cpp | 11 +- src/mame/drivers/h19.cpp | 7 +- src/mame/drivers/h8.cpp | 3 + src/mame/drivers/halleys.cpp | 8 +- src/mame/drivers/hanaawas.cpp | 6 +- src/mame/drivers/hankin.cpp | 3 + src/mame/drivers/hapyfish.cpp | 1 + src/mame/drivers/harddriv.cpp | 33 +- src/mame/drivers/harriet.cpp | 3 +- src/mame/drivers/hazeltin.cpp | 4 + src/mame/drivers/hcastle.cpp | 8 +- src/mame/drivers/headonb.cpp | 1 + src/mame/drivers/hec2hrp.cpp | 15 +- src/mame/drivers/hexion.cpp | 8 +- src/mame/drivers/hh_amis2k.cpp | 3 +- src/mame/drivers/hh_cop400.cpp | 5 +- src/mame/drivers/hh_hmcs40.cpp | 6 +- src/mame/drivers/hh_melps4.cpp | 8 +- src/mame/drivers/hh_pic16.cpp | 3 +- src/mame/drivers/hh_sm510.cpp | 3 +- src/mame/drivers/hh_tms1k.cpp | 8 +- src/mame/drivers/hh_ucom4.cpp | 2 + src/mame/drivers/hideseek.cpp | 14 +- src/mame/drivers/higemaru.cpp | 5 +- src/mame/drivers/highvdeo.cpp | 11 +- src/mame/drivers/hikaru.cpp | 2 + src/mame/drivers/himesiki.cpp | 8 +- src/mame/drivers/hitme.cpp | 4 +- src/mame/drivers/hitpoker.cpp | 4 +- src/mame/drivers/hnayayoi.cpp | 5 +- src/mame/drivers/hng64.cpp | 7 +- src/mame/drivers/holeland.cpp | 7 +- src/mame/drivers/homedata.cpp | 4 + src/mame/drivers/homelab.cpp | 2 + src/mame/drivers/homerun.cpp | 4 +- src/mame/drivers/homez80.cpp | 1 + src/mame/drivers/hornet.cpp | 2 + src/mame/drivers/hotblock.cpp | 3 + src/mame/drivers/hotstuff.cpp | 1 + src/mame/drivers/hp16500.cpp | 4 +- src/mame/drivers/hp48.cpp | 4 + src/mame/drivers/hp49gp.cpp | 1 + src/mame/drivers/hp64k.cpp | 12 +- src/mame/drivers/hp9845.cpp | 9 +- src/mame/drivers/hp9k.cpp | 1 + src/mame/drivers/hp9k_3xx.cpp | 1 + src/mame/drivers/hprot1.cpp | 4 +- src/mame/drivers/huebler.cpp | 1 + src/mame/drivers/hunter2.cpp | 13 +- src/mame/drivers/hvyunit.cpp | 4 +- src/mame/drivers/hx20.cpp | 2 + src/mame/drivers/hyhoo.cpp | 2 + src/mame/drivers/hyperscan.cpp | 1 + src/mame/drivers/hyperspt.cpp | 8 +- src/mame/drivers/hyprduel.cpp | 8 +- src/mame/drivers/i7000.cpp | 9 +- src/mame/drivers/ibm3153.cpp | 2 + src/mame/drivers/ibm6580.cpp | 2 + src/mame/drivers/ibmpcjr.cpp | 30 +- src/mame/drivers/icatel.cpp | 6 +- src/mame/drivers/ice_bozopail.cpp | 1 + src/mame/drivers/icecold.cpp | 3 + src/mame/drivers/ichiban.cpp | 8 +- src/mame/drivers/idsa.cpp | 3 + src/mame/drivers/ie15.cpp | 6 +- src/mame/drivers/if800.cpp | 1 + src/mame/drivers/igs009.cpp | 3 + src/mame/drivers/igs011.cpp | 2 + src/mame/drivers/igs017.cpp | 5 + src/mame/drivers/igs_fear.cpp | 2 + src/mame/drivers/igs_m027.cpp | 1 + src/mame/drivers/igs_m036.cpp | 1 + src/mame/drivers/igspoker.cpp | 8 +- src/mame/drivers/ikki.cpp | 4 +- src/mame/drivers/imds2.cpp | 2 + src/mame/drivers/imolagp.cpp | 2 + src/mame/drivers/inder.cpp | 10 +- src/mame/drivers/indigo.cpp | 8 +- src/mame/drivers/indy_indigo2.cpp | 30 +- src/mame/drivers/instruct.cpp | 6 +- src/mame/drivers/interact.cpp | 12 +- src/mame/drivers/intrscti.cpp | 1 + src/mame/drivers/intv.cpp | 7 +- src/mame/drivers/inufuku.cpp | 6 +- src/mame/drivers/invqix.cpp | 2 + src/mame/drivers/ipds.cpp | 2 + src/mame/drivers/iq151.cpp | 10 +- src/mame/drivers/iqblock.cpp | 5 +- src/mame/drivers/irisha.cpp | 8 +- src/mame/drivers/irobot.cpp | 3 +- src/mame/drivers/ironhors.cpp | 10 +- src/mame/drivers/istellar.cpp | 3 +- src/mame/drivers/istrebiteli.cpp | 4 +- src/mame/drivers/iteagle.cpp | 1 + src/mame/drivers/itech32.cpp | 11 +- src/mame/drivers/itech8.cpp | 9 +- src/mame/drivers/itgambl2.cpp | 8 +- src/mame/drivers/itgambl3.cpp | 6 +- src/mame/drivers/itgamble.cpp | 12 +- src/mame/drivers/itt3030.cpp | 13 +- src/mame/drivers/jack.cpp | 5 +- src/mame/drivers/jackal.cpp | 7 +- src/mame/drivers/jackie.cpp | 2 + src/mame/drivers/jackpool.cpp | 4 +- src/mame/drivers/jaguar.cpp | 3 +- src/mame/drivers/jailbrek.cpp | 8 +- src/mame/drivers/jalmah.cpp | 2 + src/mame/drivers/jangou.cpp | 8 +- src/mame/drivers/jankenmn.cpp | 6 +- src/mame/drivers/jantotsu.cpp | 3 + src/mame/drivers/jchan.cpp | 8 +- src/mame/drivers/jclub2.cpp | 5 +- src/mame/drivers/jeutel.cpp | 4 + src/mame/drivers/joctronic.cpp | 4 +- src/mame/drivers/jokrwild.cpp | 5 +- src/mame/drivers/jollyjgr.cpp | 2 + src/mame/drivers/jongkyo.cpp | 4 +- src/mame/drivers/jonos.cpp | 1 + src/mame/drivers/joystand.cpp | 8 +- src/mame/drivers/jp.cpp | 4 + src/mame/drivers/jpmimpct.cpp | 11 +- src/mame/drivers/jpmmps.cpp | 3 + src/mame/drivers/jpms80.cpp | 2 + src/mame/drivers/jpmsys5.cpp | 5 + src/mame/drivers/jpmsys7.cpp | 8 +- src/mame/drivers/jr100.cpp | 10 +- src/mame/drivers/jr200.cpp | 2 + src/mame/drivers/jrpacman.cpp | 5 +- src/mame/drivers/jtc.cpp | 6 +- src/mame/drivers/jubilee.cpp | 11 +- src/mame/drivers/juicebox.cpp | 3 + src/mame/drivers/jungleyo.cpp | 2 + src/mame/drivers/junofrst.cpp | 5 +- src/mame/drivers/jupace.cpp | 9 +- src/mame/drivers/jupiter.cpp | 7 +- src/mame/drivers/k28.cpp | 1 + src/mame/drivers/k8915.cpp | 1 + src/mame/drivers/kaneko16.cpp | 5 +- src/mame/drivers/kangaroo.cpp | 7 +- src/mame/drivers/karnov.cpp | 6 +- src/mame/drivers/kas89.cpp | 14 +- src/mame/drivers/kaypro.cpp | 3 + src/mame/drivers/kc.cpp | 5 +- src/mame/drivers/kchamp.cpp | 3 + src/mame/drivers/kickgoal.cpp | 6 +- src/mame/drivers/kingdrby.cpp | 10 +- src/mame/drivers/kingobox.cpp | 4 + src/mame/drivers/kingpin.cpp | 5 +- src/mame/drivers/kinst.cpp | 6 +- src/mame/drivers/klax.cpp | 8 +- src/mame/drivers/kncljoe.cpp | 4 +- src/mame/drivers/koftball.cpp | 2 + src/mame/drivers/koikoi.cpp | 2 + src/mame/drivers/konamigq.cpp | 11 +- src/mame/drivers/konamigv.cpp | 13 +- src/mame/drivers/konamigx.cpp | 9 +- src/mame/drivers/konamim2.cpp | 1 + src/mame/drivers/konendev.cpp | 6 +- src/mame/drivers/konmedal.cpp | 10 +- src/mame/drivers/kontest.cpp | 2 + src/mame/drivers/kopunch.cpp | 4 +- src/mame/drivers/kramermc.cpp | 5 +- src/mame/drivers/kron.cpp | 1 + src/mame/drivers/ksayakyu.cpp | 4 + src/mame/drivers/ksys573.cpp | 3 + src/mame/drivers/kungfur.cpp | 3 +- src/mame/drivers/kurukuru.cpp | 7 +- src/mame/drivers/kyocera.cpp | 1 + src/mame/drivers/kyugo.cpp | 5 +- src/mame/drivers/labyrunr.cpp | 6 +- src/mame/drivers/ladybug.cpp | 5 +- src/mame/drivers/ladyfrog.cpp | 5 +- src/mame/drivers/laser3k.cpp | 4 +- src/mame/drivers/laserbas.cpp | 4 +- src/mame/drivers/laserbat.cpp | 3 +- src/mame/drivers/lasso.cpp | 3 + src/mame/drivers/lastbank.cpp | 3 + src/mame/drivers/lastduel.cpp | 5 +- src/mame/drivers/lastfght.cpp | 2 + src/mame/drivers/laz_aftrshok.cpp | 1 + src/mame/drivers/laz_awetoss.cpp | 1 + src/mame/drivers/laz_ribrac.cpp | 1 + src/mame/drivers/lazercmd.cpp | 2 + src/mame/drivers/lbeach.cpp | 1 + src/mame/drivers/lc80.cpp | 1 + src/mame/drivers/lcmate2.cpp | 6 +- src/mame/drivers/ldplayer.cpp | 13 +- src/mame/drivers/leapster.cpp | 2 + src/mame/drivers/legionna.cpp | 9 +- src/mame/drivers/leland.cpp | 1 + src/mame/drivers/lemmings.cpp | 6 +- src/mame/drivers/lethal.cpp | 6 +- src/mame/drivers/lethalj.cpp | 3 +- src/mame/drivers/lgp.cpp | 3 +- src/mame/drivers/liberate.cpp | 6 +- src/mame/drivers/liberatr.cpp | 1 + src/mame/drivers/limenko.cpp | 4 +- src/mame/drivers/lisa.cpp | 4 +- src/mame/drivers/littlerb.cpp | 7 +- src/mame/drivers/lkage.cpp | 8 +- src/mame/drivers/llc.cpp | 7 +- src/mame/drivers/lockon.cpp | 7 +- src/mame/drivers/lola8a.cpp | 7 +- src/mame/drivers/looping.cpp | 2 + src/mame/drivers/lordgun.cpp | 4 +- src/mame/drivers/lsasquad.cpp | 9 +- src/mame/drivers/ltcasino.cpp | 2 + src/mame/drivers/ltd.cpp | 4 + src/mame/drivers/luckgrln.cpp | 3 + src/mame/drivers/lucky74.cpp | 24 +- src/mame/drivers/lvcards.cpp | 7 +- src/mame/drivers/lviv.cpp | 15 +- src/mame/drivers/lwings.cpp | 5 +- src/mame/drivers/lynx.cpp | 7 +- src/mame/drivers/m10.cpp | 4 +- src/mame/drivers/m107.cpp | 7 +- src/mame/drivers/m14.cpp | 1 + src/mame/drivers/m20.cpp | 23 +- src/mame/drivers/m5.cpp | 17 +- src/mame/drivers/m57.cpp | 7 +- src/mame/drivers/m62.cpp | 6 +- src/mame/drivers/m63.cpp | 2 + src/mame/drivers/m72.cpp | 3 + src/mame/drivers/m79152pc.cpp | 4 +- src/mame/drivers/m79amb.cpp | 4 + src/mame/drivers/m90.cpp | 3 + src/mame/drivers/m92.cpp | 6 +- src/mame/drivers/mac.cpp | 1 + src/mame/drivers/mac128.cpp | 2 + src/mame/drivers/macpci.cpp | 2 + src/mame/drivers/macrossp.cpp | 5 +- src/mame/drivers/madalien.cpp | 5 +- src/mame/drivers/madmotor.cpp | 5 +- src/mame/drivers/magic10.cpp | 18 +- src/mame/drivers/magicard.cpp | 12 +- src/mame/drivers/magicfly.cpp | 8 +- src/mame/drivers/magictg.cpp | 6 +- src/mame/drivers/magmax.cpp | 6 +- src/mame/drivers/magnum.cpp | 4 +- src/mame/drivers/mainevt.cpp | 7 +- src/mame/drivers/mainsnk.cpp | 5 +- src/mame/drivers/majorpkr.cpp | 20 +- src/mame/drivers/malzak.cpp | 6 +- src/mame/drivers/manohman.cpp | 7 +- src/mame/drivers/mappy.cpp | 3 + src/mame/drivers/marineb.cpp | 5 +- src/mame/drivers/mario.cpp | 4 +- src/mame/drivers/markham.cpp | 5 +- src/mame/drivers/marywu.cpp | 4 +- src/mame/drivers/mastboy.cpp | 2 + src/mame/drivers/matmania.cpp | 1 + src/mame/drivers/maxaflex.cpp | 5 +- src/mame/drivers/maygay1b.cpp | 1 + src/mame/drivers/maygayep.cpp | 1 + src/mame/drivers/maygayv1.cpp | 12 +- src/mame/drivers/mayumi.cpp | 7 +- src/mame/drivers/mazerbla.cpp | 2 + src/mame/drivers/mbc200.cpp | 10 +- src/mame/drivers/mbc55x.cpp | 2 + src/mame/drivers/mbee.cpp | 1 + src/mame/drivers/mc10.cpp | 25 +- src/mame/drivers/mc1000.cpp | 15 +- src/mame/drivers/mc1502.cpp | 6 +- src/mame/drivers/mc80.cpp | 1 + src/mame/drivers/mcatadv.cpp | 7 +- src/mame/drivers/mcr.cpp | 7 +- src/mame/drivers/mcr3.cpp | 11 +- src/mame/drivers/mcr68.cpp | 5 +- src/mame/drivers/meadows.cpp | 3 + src/mame/drivers/mediagx.cpp | 2 + src/mame/drivers/megasys1.cpp | 18 +- src/mame/drivers/megazone.cpp | 5 +- src/mame/drivers/meijinsn.cpp | 2 + src/mame/drivers/mekd2.cpp | 6 +- src/mame/drivers/mephisto.cpp | 1 + src/mame/drivers/mephistp.cpp | 1 + src/mame/drivers/merit.cpp | 4 +- src/mame/drivers/meritm.cpp | 9 +- src/mame/drivers/mermaid.cpp | 5 +- src/mame/drivers/mes.cpp | 1 + src/mame/drivers/metalmx.cpp | 3 +- src/mame/drivers/metlclsh.cpp | 5 +- src/mame/drivers/metlfrzr.cpp | 7 +- src/mame/drivers/metro.cpp | 6 +- src/mame/drivers/mexico86.cpp | 2 + src/mame/drivers/meyc8080.cpp | 15 +- src/mame/drivers/meyc8088.cpp | 3 + src/mame/drivers/mgames.cpp | 2 + src/mame/drivers/mgavegas.cpp | 7 +- src/mame/drivers/mgolf.cpp | 1 + src/mame/drivers/mhavoc.cpp | 6 +- src/mame/drivers/micral.cpp | 2 + src/mame/drivers/micro3d.cpp | 10 +- src/mame/drivers/micronic.cpp | 4 +- src/mame/drivers/micropin.cpp | 6 +- src/mame/drivers/microtan.cpp | 9 +- src/mame/drivers/microvsn.cpp | 4 +- src/mame/drivers/midas.cpp | 7 +- src/mame/drivers/midtunit.cpp | 7 +- src/mame/drivers/midwunit.cpp | 8 +- src/mame/drivers/midxunit.cpp | 11 +- src/mame/drivers/midyunit.cpp | 5 +- src/mame/drivers/mikie.cpp | 8 +- src/mame/drivers/mikro80.cpp | 2 + src/mame/drivers/mikrosha.cpp | 21 +- src/mame/drivers/mil4000.cpp | 15 +- src/mame/drivers/mini2440.cpp | 3 + src/mame/drivers/miniboy7.cpp | 13 +- src/mame/drivers/minivadr.cpp | 1 + src/mame/drivers/mirage.cpp | 2 + src/mame/drivers/mirax.cpp | 2 + src/mame/drivers/missb2.cpp | 7 +- src/mame/drivers/missile.cpp | 2 + src/mame/drivers/mitchell.cpp | 5 +- src/mame/drivers/mjkjidai.cpp | 5 +- src/mame/drivers/mjsenpu.cpp | 4 +- src/mame/drivers/mjsister.cpp | 3 + src/mame/drivers/mk14.cpp | 3 + src/mame/drivers/mk2.cpp | 15 +- src/mame/drivers/mk85.cpp | 7 +- src/mame/drivers/mk90.cpp | 1 + src/mame/drivers/mkit09.cpp | 4 +- src/mame/drivers/mlanding.cpp | 10 +- src/mame/drivers/mmagic.cpp | 1 + src/mame/drivers/mmodular.cpp | 7 +- src/mame/drivers/model1.cpp | 7 +- src/mame/drivers/model2.cpp | 13 +- src/mame/drivers/model3.cpp | 5 +- src/mame/drivers/modellot.cpp | 2 + src/mame/drivers/mogura.cpp | 6 +- src/mame/drivers/mole.cpp | 2 + src/mame/drivers/molecular.cpp | 4 +- src/mame/drivers/momoko.cpp | 5 +- src/mame/drivers/monty.cpp | 4 +- src/mame/drivers/monzagp.cpp | 1 + src/mame/drivers/moo.cpp | 6 +- src/mame/drivers/mosaic.cpp | 6 +- src/mame/drivers/mouser.cpp | 6 +- src/mame/drivers/mpf1.cpp | 2 + src/mame/drivers/mpu12wbk.cpp | 12 +- src/mame/drivers/mpu4.cpp | 4 +- src/mame/drivers/mpu4dealem.cpp | 9 +- src/mame/drivers/mpu4plasma.cpp | 3 + src/mame/drivers/mpu4vid.cpp | 27 +- src/mame/drivers/mpu5.cpp | 5 +- src/mame/drivers/mquake.cpp | 12 +- src/mame/drivers/mrdo.cpp | 5 +- src/mame/drivers/mrflea.cpp | 4 +- src/mame/drivers/mrgame.cpp | 4 +- src/mame/drivers/mrjong.cpp | 5 +- src/mame/drivers/ms0515.cpp | 7 +- src/mame/drivers/ms32.cpp | 6 +- src/mame/drivers/msisaac.cpp | 6 +- src/mame/drivers/mstation.cpp | 4 +- src/mame/drivers/msx.cpp | 2 + src/mame/drivers/mtx.cpp | 10 +- src/mame/drivers/mugsmash.cpp | 6 +- src/mame/drivers/multfish.cpp | 3 + src/mame/drivers/multi16.cpp | 3 +- src/mame/drivers/multi8.cpp | 8 +- src/mame/drivers/multigam.cpp | 2 + src/mame/drivers/munchmo.cpp | 5 +- src/mame/drivers/murogem.cpp | 4 +- src/mame/drivers/murogmbl.cpp | 2 + src/mame/drivers/mustache.cpp | 5 +- src/mame/drivers/mwarr.cpp | 3 + src/mame/drivers/mx2178.cpp | 4 +- src/mame/drivers/myb3k.cpp | 3 +- src/mame/drivers/mycom.cpp | 12 +- src/mame/drivers/mystston.cpp | 4 +- src/mame/drivers/mystwarr.cpp | 8 +- src/mame/drivers/myvision.cpp | 7 +- src/mame/drivers/mz2000.cpp | 18 +- src/mame/drivers/mz2500.cpp | 10 +- src/mame/drivers/mz3500.cpp | 2 + src/mame/drivers/mz6500.cpp | 1 + src/mame/drivers/mz700.cpp | 15 +- src/mame/drivers/mz80.cpp | 4 + src/mame/drivers/n64.cpp | 5 +- src/mame/drivers/nakajies.cpp | 4 +- src/mame/drivers/namcofl.cpp | 5 +- src/mame/drivers/namcona1.cpp | 3 +- src/mame/drivers/namconb1.cpp | 6 +- src/mame/drivers/namcond1.cpp | 10 +- src/mame/drivers/namcops2.cpp | 1 + src/mame/drivers/namcos1.cpp | 3 + src/mame/drivers/namcos10.cpp | 6 +- src/mame/drivers/namcos11.cpp | 4 +- src/mame/drivers/namcos12.cpp | 4 + src/mame/drivers/namcos2.cpp | 6 +- src/mame/drivers/namcos21.cpp | 9 +- src/mame/drivers/namcos22.cpp | 3 + src/mame/drivers/namcos23.cpp | 13 +- src/mame/drivers/namcos86.cpp | 6 +- src/mame/drivers/nanos.cpp | 12 +- src/mame/drivers/naomi.cpp | 3 + src/mame/drivers/nascom1.cpp | 11 +- src/mame/drivers/naughtyb.cpp | 4 +- src/mame/drivers/nbmj8688.cpp | 4 + src/mame/drivers/nbmj8891.cpp | 2 + src/mame/drivers/nbmj8900.cpp | 2 + src/mame/drivers/nbmj8991.cpp | 2 + src/mame/drivers/nbmj9195.cpp | 2 + src/mame/drivers/nc.cpp | 9 +- src/mame/drivers/nemesis.cpp | 6 +- src/mame/drivers/neogeo.cpp | 3 + src/mame/drivers/neoprint.cpp | 4 +- src/mame/drivers/neptunp2.cpp | 2 + src/mame/drivers/nes.cpp | 4 + src/mame/drivers/newbrain.cpp | 3 + src/mame/drivers/news.cpp | 5 +- src/mame/drivers/next.cpp | 8 +- src/mame/drivers/nexus3d.cpp | 4 +- src/mame/drivers/ngen.cpp | 20 +- src/mame/drivers/ngp.cpp | 2 + src/mame/drivers/nibble.cpp | 7 +- src/mame/drivers/nightgal.cpp | 10 +- src/mame/drivers/ninjakd2.cpp | 7 +- src/mame/drivers/ninjaw.cpp | 9 +- src/mame/drivers/nitedrvr.cpp | 5 +- src/mame/drivers/niyanpai.cpp | 2 + src/mame/drivers/nmg5.cpp | 7 +- src/mame/drivers/nmk16.cpp | 18 +- src/mame/drivers/nokia_3310.cpp | 3 + src/mame/drivers/norautp.cpp | 20 +- src/mame/drivers/notetaker.cpp | 3 + src/mame/drivers/nova2001.cpp | 6 +- src/mame/drivers/novag6502.cpp | 5 +- src/mame/drivers/novag68k.cpp | 3 + src/mame/drivers/nsm.cpp | 2 + src/mame/drivers/nsmpoker.cpp | 7 +- src/mame/drivers/nss.cpp | 4 +- src/mame/drivers/nwk-tr.cpp | 2 + src/mame/drivers/nycaptor.cpp | 11 +- src/mame/drivers/nyny.cpp | 5 +- src/mame/drivers/octopus.cpp | 28 +- src/mame/drivers/odyssey2.cpp | 7 +- src/mame/drivers/offtwall.cpp | 4 +- src/mame/drivers/ohmygod.cpp | 5 +- src/mame/drivers/ojankohs.cpp | 6 +- src/mame/drivers/okean240.cpp | 2 + src/mame/drivers/olibochu.cpp | 2 + src/mame/drivers/omegrace.cpp | 2 + src/mame/drivers/ondra.cpp | 8 +- src/mame/drivers/oneshot.cpp | 11 +- src/mame/drivers/onetwo.cpp | 4 +- src/mame/drivers/opwolf.cpp | 12 +- src/mame/drivers/orao.cpp | 12 +- src/mame/drivers/orbit.cpp | 4 +- src/mame/drivers/oric.cpp | 16 +- src/mame/drivers/orion.cpp | 7 +- src/mame/drivers/osbexec.cpp | 13 +- src/mame/drivers/osborne1.cpp | 9 +- src/mame/drivers/osi.cpp | 4 + src/mame/drivers/othello.cpp | 6 +- src/mame/drivers/othunder.cpp | 11 +- src/mame/drivers/overdriv.cpp | 10 +- src/mame/drivers/p112.cpp | 1 + src/mame/drivers/p2000t.cpp | 3 + src/mame/drivers/p8k.cpp | 8 +- src/mame/drivers/pachifev.cpp | 3 +- src/mame/drivers/pacland.cpp | 4 +- src/mame/drivers/pacman.cpp | 11 +- src/mame/drivers/palm.cpp | 2 + src/mame/drivers/palmz22.cpp | 1 + src/mame/drivers/pandoras.cpp | 3 + src/mame/drivers/pangofun.cpp | 1 + src/mame/drivers/panicr.cpp | 7 +- src/mame/drivers/paradise.cpp | 5 +- src/mame/drivers/paranoia.cpp | 6 +- src/mame/drivers/parodius.cpp | 9 +- src/mame/drivers/partner.cpp | 17 +- src/mame/drivers/pasha2.cpp | 2 + src/mame/drivers/paso1600.cpp | 8 +- src/mame/drivers/pasopia.cpp | 5 +- src/mame/drivers/pasopia7.cpp | 11 +- src/mame/drivers/pass.cpp | 7 +- src/mame/drivers/pastelg.cpp | 2 + src/mame/drivers/pb1000.cpp | 10 +- src/mame/drivers/pbaction.cpp | 5 +- src/mame/drivers/pc100.cpp | 14 +- src/mame/drivers/pc1500.cpp | 2 + src/mame/drivers/pc1512.cpp | 1 + src/mame/drivers/pc2000.cpp | 31 +- src/mame/drivers/pc4.cpp | 6 +- src/mame/drivers/pc6001.cpp | 10 +- src/mame/drivers/pc8001.cpp | 2 + src/mame/drivers/pc8801.cpp | 9 +- src/mame/drivers/pc88va.cpp | 12 +- src/mame/drivers/pc9801.cpp | 41 +-- src/mame/drivers/pcat_dyn.cpp | 11 +- src/mame/drivers/pcd.cpp | 47 +-- src/mame/drivers/pce.cpp | 9 +- src/mame/drivers/pce220.cpp | 8 +- src/mame/drivers/pcfx.cpp | 1 + src/mame/drivers/pcktgal.cpp | 6 +- src/mame/drivers/pcm.cpp | 15 +- src/mame/drivers/pcw.cpp | 7 +- src/mame/drivers/pcw16.cpp | 2 + src/mame/drivers/pcxt.cpp | 4 +- src/mame/drivers/pda600.cpp | 1 + src/mame/drivers/pdp1.cpp | 13 +- src/mame/drivers/pecom.cpp | 8 +- src/mame/drivers/pegasus.cpp | 8 +- src/mame/drivers/pencil2.cpp | 10 +- src/mame/drivers/pengadvb.cpp | 2 + src/mame/drivers/pengo.cpp | 5 +- src/mame/drivers/pentagon.cpp | 15 +- src/mame/drivers/peoplepc.cpp | 1 + src/mame/drivers/peplus.cpp | 7 +- src/mame/drivers/pes.cpp | 13 +- src/mame/drivers/pet.cpp | 4 +- src/mame/drivers/peyper.cpp | 3 + src/mame/drivers/pg685.cpp | 9 +- src/mame/drivers/pgm.cpp | 9 +- src/mame/drivers/pgm2.cpp | 2 + src/mame/drivers/pgm3.cpp | 1 + src/mame/drivers/phc25.cpp | 3 + src/mame/drivers/phoenix.cpp | 5 +- src/mame/drivers/photon.cpp | 7 +- src/mame/drivers/photon2.cpp | 4 +- src/mame/drivers/phunsy.cpp | 8 +- src/mame/drivers/piggypas.cpp | 3 + src/mame/drivers/pinball2k.cpp | 7 +- src/mame/drivers/pingpong.cpp | 5 +- src/mame/drivers/pinkiri8.cpp | 4 +- src/mame/drivers/pipedrm.cpp | 4 +- src/mame/drivers/pipeline.cpp | 7 +- src/mame/drivers/pirates.cpp | 5 +- src/mame/drivers/pitagjr.cpp | 11 +- src/mame/drivers/pitnrun.cpp | 3 + src/mame/drivers/pk8000.cpp | 11 +- src/mame/drivers/pk8020.cpp | 5 +- src/mame/drivers/pkscram.cpp | 4 +- src/mame/drivers/pktgaldx.cpp | 6 +- src/mame/drivers/plan80.cpp | 1 + src/mame/drivers/play_1.cpp | 7 +- src/mame/drivers/play_2.cpp | 8 +- src/mame/drivers/play_3.cpp | 6 +- src/mame/drivers/playch10.cpp | 5 +- src/mame/drivers/playmark.cpp | 11 +- src/mame/drivers/plus4.cpp | 2 + src/mame/drivers/pluto5.cpp | 1 + src/mame/drivers/plygonet.cpp | 7 +- src/mame/drivers/pmd85.cpp | 14 +- src/mame/drivers/pntnpuzl.cpp | 3 +- src/mame/drivers/pockchal.cpp | 8 +- src/mame/drivers/pocketc.cpp | 7 +- src/mame/drivers/pockstat.cpp | 2 + src/mame/drivers/pofo.cpp | 8 +- src/mame/drivers/poisk1.cpp | 15 +- src/mame/drivers/pokechmp.cpp | 7 +- src/mame/drivers/pokemini.cpp | 6 +- src/mame/drivers/poker72.cpp | 2 + src/mame/drivers/polepos.cpp | 12 +- src/mame/drivers/policetr.cpp | 4 +- src/mame/drivers/poly.cpp | 7 +- src/mame/drivers/poly88.cpp | 6 +- src/mame/drivers/polyplay.cpp | 8 +- src/mame/drivers/pong.cpp | 3 + src/mame/drivers/poolshrk.cpp | 5 +- src/mame/drivers/pooyan.cpp | 8 +- src/mame/drivers/popeye.cpp | 9 +- src/mame/drivers/popobear.cpp | 2 + src/mame/drivers/portrait.cpp | 6 +- src/mame/drivers/potgoldu.cpp | 1 + src/mame/drivers/powerbal.cpp | 11 +- src/mame/drivers/powerins.cpp | 4 +- src/mame/drivers/pp01.cpp | 4 +- src/mame/drivers/ppmast93.cpp | 2 + src/mame/drivers/prehisle.cpp | 6 +- src/mame/drivers/prestige.cpp | 8 +- src/mame/drivers/primo.cpp | 11 +- src/mame/drivers/pro80.cpp | 5 + src/mame/drivers/proconn.cpp | 10 +- src/mame/drivers/prof180x.cpp | 5 +- src/mame/drivers/progolf.cpp | 3 + src/mame/drivers/proteus3.cpp | 7 +- src/mame/drivers/psikyo.cpp | 4 +- src/mame/drivers/psikyo4.cpp | 3 + src/mame/drivers/psikyosh.cpp | 3 +- src/mame/drivers/psion.cpp | 4 + src/mame/drivers/psx.cpp | 15 +- src/mame/drivers/psychic5.cpp | 5 +- src/mame/drivers/pt68k4.cpp | 14 +- src/mame/drivers/ptcsol.cpp | 14 +- src/mame/drivers/pturn.cpp | 2 + src/mame/drivers/punchout.cpp | 5 +- src/mame/drivers/pv1000.cpp | 6 +- src/mame/drivers/pv2000.cpp | 2 + src/mame/drivers/pv9234.cpp | 1 + src/mame/drivers/pve500.cpp | 10 +- src/mame/drivers/px4.cpp | 22 +- src/mame/drivers/px8.cpp | 5 + src/mame/drivers/pyl601.cpp | 14 +- src/mame/drivers/pyson.cpp | 1 + src/mame/drivers/pzletime.cpp | 3 + src/mame/drivers/qdrmfgp.cpp | 7 +- src/mame/drivers/ql.cpp | 9 +- src/mame/drivers/quakeat.cpp | 1 + src/mame/drivers/quantum.cpp | 2 + src/mame/drivers/quasar.cpp | 1 + src/mame/drivers/quizdna.cpp | 5 +- src/mame/drivers/quizo.cpp | 2 + src/mame/drivers/quizpani.cpp | 6 +- src/mame/drivers/quizpun2.cpp | 3 + src/mame/drivers/quizshow.cpp | 2 + src/mame/drivers/qx10.cpp | 18 +- src/mame/drivers/r2dtank.cpp | 12 +- src/mame/drivers/r2dx_v33.cpp | 6 +- src/mame/drivers/rabbit.cpp | 2 + src/mame/drivers/radio86.cpp | 14 +- src/mame/drivers/raiden.cpp | 5 +- src/mame/drivers/raiden2.cpp | 11 +- src/mame/drivers/rainbow.cpp | 63 ++-- src/mame/drivers/rallyx.cpp | 5 +- src/mame/drivers/rampart.cpp | 4 +- src/mame/drivers/rastan.cpp | 14 +- src/mame/drivers/rastersp.cpp | 2 + src/mame/drivers/ravens.cpp | 4 + src/mame/drivers/rbisland.cpp | 10 +- src/mame/drivers/rbmk.cpp | 6 +- src/mame/drivers/rc702.cpp | 18 +- src/mame/drivers/rc759.cpp | 21 +- src/mame/drivers/rcorsair.cpp | 1 + src/mame/drivers/rd100.cpp | 1 + src/mame/drivers/rd110.cpp | 5 +- src/mame/drivers/re900.cpp | 18 +- src/mame/drivers/realbrk.cpp | 4 +- src/mame/drivers/redclash.cpp | 5 +- src/mame/drivers/relief.cpp | 4 +- src/mame/drivers/renegade.cpp | 5 +- src/mame/drivers/replicator.cpp | 4 +- src/mame/drivers/retofinv.cpp | 2 + src/mame/drivers/rex6000.cpp | 3 + src/mame/drivers/rgum.cpp | 6 +- src/mame/drivers/risc2500.cpp | 2 + src/mame/drivers/riscpc.cpp | 2 + src/mame/drivers/rltennis.cpp | 4 + src/mame/drivers/rm380z.cpp | 3 + src/mame/drivers/rmhaihai.cpp | 2 + src/mame/drivers/rmnimbus.cpp | 16 +- src/mame/drivers/rmt32.cpp | 3 +- src/mame/drivers/rockrage.cpp | 7 +- src/mame/drivers/rocnrope.cpp | 8 +- src/mame/drivers/rohga.cpp | 6 +- src/mame/drivers/rollerg.cpp | 7 +- src/mame/drivers/rollrace.cpp | 5 +- src/mame/drivers/rotaryf.cpp | 8 +- src/mame/drivers/roul.cpp | 5 +- src/mame/drivers/route16.cpp | 6 +- src/mame/drivers/rowamet.cpp | 6 +- src/mame/drivers/royalmah.cpp | 2 + src/mame/drivers/rpunch.cpp | 6 +- src/mame/drivers/rt1715.cpp | 5 +- src/mame/drivers/runaway.cpp | 4 +- src/mame/drivers/rungun.cpp | 7 +- src/mame/drivers/rx78.cpp | 2 + src/mame/drivers/s11.cpp | 4 + src/mame/drivers/s11a.cpp | 4 + src/mame/drivers/s11b.cpp | 4 + src/mame/drivers/s11c.cpp | 3 + src/mame/drivers/s3.cpp | 6 +- src/mame/drivers/s4.cpp | 5 +- src/mame/drivers/s6.cpp | 5 +- src/mame/drivers/s6a.cpp | 5 +- src/mame/drivers/s7.cpp | 6 +- src/mame/drivers/s8.cpp | 6 +- src/mame/drivers/s8a.cpp | 6 +- src/mame/drivers/s9.cpp | 4 +- src/mame/drivers/safarir.cpp | 2 + src/mame/drivers/samcoupe.cpp | 9 +- src/mame/drivers/sandscrp.cpp | 2 + src/mame/drivers/sangho.cpp | 2 + src/mame/drivers/sanremmg.cpp | 1 + src/mame/drivers/sanremo.cpp | 17 +- src/mame/drivers/sapi1.cpp | 5 +- src/mame/drivers/saturn.cpp | 38 ++- src/mame/drivers/sauro.cpp | 7 +- src/mame/drivers/sbasketb.cpp | 4 + src/mame/drivers/sbc6510.cpp | 5 +- src/mame/drivers/sbowling.cpp | 4 +- src/mame/drivers/sbrain.cpp | 7 +- src/mame/drivers/sbrkout.cpp | 2 + src/mame/drivers/sbugger.cpp | 5 +- src/mame/drivers/sc1.cpp | 10 +- src/mame/drivers/sc2.cpp | 4 +- src/mame/drivers/scobra.cpp | 4 +- src/mame/drivers/scorpion.cpp | 9 +- src/mame/drivers/scotrsht.cpp | 8 +- src/mame/drivers/scramble.cpp | 11 +- src/mame/drivers/scregg.cpp | 5 +- src/mame/drivers/scv.cpp | 2 + src/mame/drivers/sderby.cpp | 10 +- src/mame/drivers/seabattl.cpp | 3 + src/mame/drivers/sealy.cpp | 8 +- src/mame/drivers/seattle.cpp | 10 +- src/mame/drivers/segac2.cpp | 7 +- src/mame/drivers/segae.cpp | 6 +- src/mame/drivers/segag80r.cpp | 6 +- src/mame/drivers/segag80v.cpp | 6 +- src/mame/drivers/segahang.cpp | 4 +- src/mame/drivers/segajw.cpp | 2 + src/mame/drivers/segald.cpp | 1 + src/mame/drivers/segam1.cpp | 8 +- src/mame/drivers/segaorun.cpp | 4 +- src/mame/drivers/segapm.cpp | 1 + src/mame/drivers/segas16a.cpp | 3 + src/mame/drivers/segas16b.cpp | 5 +- src/mame/drivers/segas18.cpp | 6 +- src/mame/drivers/segas24.cpp | 3 + src/mame/drivers/segas32.cpp | 16 +- src/mame/drivers/segaufo.cpp | 1 + src/mame/drivers/segaxbd.cpp | 21 +- src/mame/drivers/segaybd.cpp | 6 +- src/mame/drivers/seibuspi.cpp | 13 +- src/mame/drivers/seicross.cpp | 4 + src/mame/drivers/seicupbl.cpp | 7 +- src/mame/drivers/sengokmj.cpp | 7 +- src/mame/drivers/senjyo.cpp | 4 + src/mame/drivers/seta.cpp | 15 +- src/mame/drivers/seta2.cpp | 9 +- src/mame/drivers/sf.cpp | 5 +- src/mame/drivers/sfbonus.cpp | 5 +- src/mame/drivers/sfcbox.cpp | 15 +- src/mame/drivers/sfkick.cpp | 2 + src/mame/drivers/sg1000.cpp | 1 + src/mame/drivers/sg1000a.cpp | 1 + src/mame/drivers/shadfrce.cpp | 6 +- src/mame/drivers/shangha3.cpp | 4 +- src/mame/drivers/shanghai.cpp | 5 +- src/mame/drivers/shangkid.cpp | 4 + src/mame/drivers/shaolins.cpp | 6 +- src/mame/drivers/shisen.cpp | 4 + src/mame/drivers/shootout.cpp | 5 +- src/mame/drivers/shougi.cpp | 2 + src/mame/drivers/shtzone.cpp | 1 + src/mame/drivers/shuuz.cpp | 4 +- src/mame/drivers/sidearms.cpp | 5 +- src/mame/drivers/sidepckt.cpp | 6 +- src/mame/drivers/sigmab52.cpp | 12 +- src/mame/drivers/sigmab98.cpp | 9 +- src/mame/drivers/silkroad.cpp | 7 +- src/mame/drivers/silvmil.cpp | 4 +- src/mame/drivers/simpl156.cpp | 6 +- src/mame/drivers/simpsons.cpp | 7 +- src/mame/drivers/skeetsht.cpp | 2 + src/mame/drivers/skimaxx.cpp | 2 + src/mame/drivers/skullxbo.cpp | 4 +- src/mame/drivers/skyarmy.cpp | 4 +- src/mame/drivers/skydiver.cpp | 5 +- src/mame/drivers/skyfox.cpp | 4 +- src/mame/drivers/skykid.cpp | 5 +- src/mame/drivers/skylncr.cpp | 12 +- src/mame/drivers/skyraid.cpp | 5 +- src/mame/drivers/slapfght.cpp | 4 +- src/mame/drivers/slapshot.cpp | 11 +- src/mame/drivers/slc1.cpp | 4 +- src/mame/drivers/sliver.cpp | 7 +- src/mame/drivers/slotcarn.cpp | 5 +- src/mame/drivers/sm1800.cpp | 13 +- src/mame/drivers/sm7238.cpp | 1 + src/mame/drivers/smc777.cpp | 9 +- src/mame/drivers/sms.cpp | 8 +- src/mame/drivers/sms_bootleg.cpp | 7 +- src/mame/drivers/smsmcorp.cpp | 4 +- src/mame/drivers/snes.cpp | 6 +- src/mame/drivers/snesb.cpp | 1 + src/mame/drivers/snk.cpp | 4 +- src/mame/drivers/snk6502.cpp | 7 +- src/mame/drivers/snk68.cpp | 5 +- src/mame/drivers/snookr10.cpp | 12 +- src/mame/drivers/snowbros.cpp | 8 +- src/mame/drivers/socrates.cpp | 9 +- src/mame/drivers/solomon.cpp | 6 +- src/mame/drivers/sonson.cpp | 5 +- src/mame/drivers/sorcerer.cpp | 3 + src/mame/drivers/sothello.cpp | 3 +- src/mame/drivers/spaceg.cpp | 2 + src/mame/drivers/spartanxtec.cpp | 6 +- src/mame/drivers/spbactn.cpp | 8 +- src/mame/drivers/spc1000.cpp | 10 +- src/mame/drivers/spc1500.cpp | 14 +- src/mame/drivers/spcforce.cpp | 6 +- src/mame/drivers/spdodgeb.cpp | 4 +- src/mame/drivers/spec128.cpp | 11 +- src/mame/drivers/special.cpp | 4 + src/mame/drivers/specpls3.cpp | 10 +- src/mame/drivers/spectra.cpp | 3 + src/mame/drivers/spectrum.cpp | 10 +- src/mame/drivers/speedatk.cpp | 6 +- src/mame/drivers/speedbal.cpp | 6 +- src/mame/drivers/speedspn.cpp | 6 +- src/mame/drivers/spiders.cpp | 8 +- src/mame/drivers/spinb.cpp | 11 +- src/mame/drivers/splash.cpp | 5 +- src/mame/drivers/splus.cpp | 8 +- src/mame/drivers/spoker.cpp | 2 + src/mame/drivers/spool99.cpp | 5 +- src/mame/drivers/sprcros2.cpp | 2 + src/mame/drivers/sprint2.cpp | 4 +- src/mame/drivers/sprint4.cpp | 6 +- src/mame/drivers/sprint8.cpp | 3 +- src/mame/drivers/spy.cpp | 9 +- src/mame/drivers/spyhuntertec.cpp | 3 + src/mame/drivers/squale.cpp | 10 +- src/mame/drivers/srmp2.cpp | 10 +- src/mame/drivers/srmp6.cpp | 3 + src/mame/drivers/srumbler.cpp | 5 +- src/mame/drivers/ssem.cpp | 3 +- src/mame/drivers/ssfindo.cpp | 2 + src/mame/drivers/sshangha.cpp | 6 +- src/mame/drivers/sshot.cpp | 1 + src/mame/drivers/ssingles.cpp | 2 + src/mame/drivers/sslam.cpp | 5 +- src/mame/drivers/ssozumo.cpp | 3 + src/mame/drivers/sspeedr.cpp | 5 +- src/mame/drivers/ssrj.cpp | 6 +- src/mame/drivers/sstrangr.cpp | 1 + src/mame/drivers/ssv.cpp | 5 +- src/mame/drivers/ssystem3.cpp | 3 +- src/mame/drivers/st17xx.cpp | 3 +- src/mame/drivers/st_mp200.cpp | 3 + src/mame/drivers/stadhero.cpp | 6 +- src/mame/drivers/starcrus.cpp | 6 +- src/mame/drivers/starfire.cpp | 4 +- src/mame/drivers/starshp1.cpp | 3 +- src/mame/drivers/starwars.cpp | 7 +- src/mame/drivers/statriv2.cpp | 22 +- src/mame/drivers/stfight.cpp | 2 + src/mame/drivers/stlforce.cpp | 5 +- src/mame/drivers/stratos.cpp | 1 + src/mame/drivers/strnskil.cpp | 5 +- src/mame/drivers/studio2.cpp | 4 + src/mame/drivers/stuntair.cpp | 3 + src/mame/drivers/stv.cpp | 20 +- src/mame/drivers/sub.cpp | 2 + src/mame/drivers/subhuntr.cpp | 2 + src/mame/drivers/subs.cpp | 6 +- src/mame/drivers/subsino.cpp | 2 + src/mame/drivers/subsino2.cpp | 6 +- src/mame/drivers/summit.cpp | 1 + src/mame/drivers/sun2.cpp | 21 +- src/mame/drivers/sun3.cpp | 11 +- src/mame/drivers/sun3x.cpp | 20 +- src/mame/drivers/sun4.cpp | 24 +- src/mame/drivers/suna16.cpp | 3 + src/mame/drivers/suna8.cpp | 3 + src/mame/drivers/supbtime.cpp | 6 +- src/mame/drivers/supdrapo.cpp | 12 +- src/mame/drivers/supduck.cpp | 2 + src/mame/drivers/super80.cpp | 7 +- src/mame/drivers/superchs.cpp | 6 +- src/mame/drivers/supercrd.cpp | 10 +- src/mame/drivers/superdq.cpp | 10 +- src/mame/drivers/superqix.cpp | 2 + src/mame/drivers/supertnk.cpp | 2 + src/mame/drivers/superwng.cpp | 3 + src/mame/drivers/supracan.cpp | 1 + src/mame/drivers/suprgolf.cpp | 5 +- src/mame/drivers/suprloco.cpp | 5 +- src/mame/drivers/suprnova.cpp | 12 +- src/mame/drivers/suprridr.cpp | 5 +- src/mame/drivers/suprslam.cpp | 7 +- src/mame/drivers/surpratk.cpp | 7 +- src/mame/drivers/sv8000.cpp | 2 + src/mame/drivers/svi318.cpp | 17 +- src/mame/drivers/svision.cpp | 3 + src/mame/drivers/svmu.cpp | 6 +- src/mame/drivers/swyft.cpp | 20 +- src/mame/drivers/sym1.cpp | 10 +- src/mame/drivers/sys2900.cpp | 1 + src/mame/drivers/system1.cpp | 4 +- src/mame/drivers/system16.cpp | 13 +- src/mame/drivers/tagteam.cpp | 4 + src/mame/drivers/tail2nos.cpp | 5 +- src/mame/drivers/taito.cpp | 6 +- src/mame/drivers/taito_b.cpp | 9 +- src/mame/drivers/taito_f2.cpp | 9 +- src/mame/drivers/taito_f3.cpp | 6 +- src/mame/drivers/taito_h.cpp | 9 +- src/mame/drivers/taito_l.cpp | 3 + src/mame/drivers/taito_o.cpp | 8 +- src/mame/drivers/taito_x.cpp | 10 +- src/mame/drivers/taito_z.cpp | 8 +- src/mame/drivers/taitoair.cpp | 9 +- src/mame/drivers/taitogn.cpp | 6 +- src/mame/drivers/taitojc.cpp | 13 +- src/mame/drivers/taitosj.cpp | 2 + src/mame/drivers/taitotx.cpp | 1 + src/mame/drivers/taitowlf.cpp | 4 +- src/mame/drivers/tamag1.cpp | 4 +- src/mame/drivers/tandy1t.cpp | 2 +- src/mame/drivers/tandy2k.cpp | 4 + src/mame/drivers/tank8.cpp | 3 +- src/mame/drivers/tankbatt.cpp | 5 +- src/mame/drivers/tankbust.cpp | 5 +- src/mame/drivers/taotaido.cpp | 9 +- src/mame/drivers/tapatune.cpp | 2 + src/mame/drivers/targeth.cpp | 6 +- src/mame/drivers/tasman.cpp | 2 + src/mame/drivers/tatsumi.cpp | 9 +- src/mame/drivers/tattack.cpp | 1 + src/mame/drivers/tavernie.cpp | 11 +- src/mame/drivers/taxidriv.cpp | 5 +- src/mame/drivers/tbowl.cpp | 6 +- src/mame/drivers/tceptor.cpp | 4 + src/mame/drivers/tcl.cpp | 2 + src/mame/drivers/tdv2324.cpp | 3 + src/mame/drivers/tec1.cpp | 6 +- src/mame/drivers/tecmo.cpp | 4 +- src/mame/drivers/tecmo16.cpp | 7 +- src/mame/drivers/tecmosys.cpp | 6 +- src/mame/drivers/tehkanwc.cpp | 6 +- src/mame/drivers/tek405x.cpp | 3 + src/mame/drivers/tek410x.cpp | 2 + src/mame/drivers/tek440x.cpp | 4 +- src/mame/drivers/tekxp33x.cpp | 2 + src/mame/drivers/tempest.cpp | 2 + src/mame/drivers/terak.cpp | 2 + src/mame/drivers/terracre.cpp | 3 + src/mame/drivers/tetrisp2.cpp | 11 +- src/mame/drivers/tgtpanic.cpp | 1 + src/mame/drivers/thayers.cpp | 5 +- src/mame/drivers/thedealr.cpp | 9 +- src/mame/drivers/thedeep.cpp | 8 +- src/mame/drivers/thepit.cpp | 5 +- src/mame/drivers/thief.cpp | 6 +- src/mame/drivers/thomson.cpp | 8 +- src/mame/drivers/thoop2.cpp | 5 +- src/mame/drivers/thunderj.cpp | 3 +- src/mame/drivers/thunderx.cpp | 8 +- src/mame/drivers/ti630.cpp | 2 + src/mame/drivers/ti74.cpp | 7 +- src/mame/drivers/ti85.cpp | 6 +- src/mame/drivers/ti89.cpp | 8 +- src/mame/drivers/ti99_2.cpp | 1 + src/mame/drivers/ti99_4p.cpp | 10 +- src/mame/drivers/ti99_4x.cpp | 4 +- src/mame/drivers/ti99_8.cpp | 1 + src/mame/drivers/tiamc1.cpp | 13 +- src/mame/drivers/ticalc1x.cpp | 2 + src/mame/drivers/tickee.cpp | 8 +- src/mame/drivers/tigeroad.cpp | 2 + src/mame/drivers/tiki100.cpp | 4 + src/mame/drivers/tim011.cpp | 1 + src/mame/drivers/tim100.cpp | 5 +- src/mame/drivers/timelimt.cpp | 6 +- src/mame/drivers/timeplt.cpp | 7 +- src/mame/drivers/timetrv.cpp | 1 + src/mame/drivers/timex.cpp | 17 +- src/mame/drivers/tispeak.cpp | 9 +- src/mame/drivers/tispellb.cpp | 2 + src/mame/drivers/tk2000.cpp | 16 +- src/mame/drivers/tk80bs.cpp | 1 + src/mame/drivers/tm990189.cpp | 32 +- src/mame/drivers/tmaster.cpp | 2 + src/mame/drivers/tmc1800.cpp | 3 + src/mame/drivers/tmc2000e.cpp | 3 + src/mame/drivers/tmmjprd.cpp | 2 + src/mame/drivers/tmnt.cpp | 17 +- src/mame/drivers/tmspoker.cpp | 9 +- src/mame/drivers/tnzs.cpp | 4 + src/mame/drivers/toaplan1.cpp | 8 +- src/mame/drivers/toaplan2.cpp | 9 +- src/mame/drivers/toki.cpp | 5 +- src/mame/drivers/tokyocop.cpp | 1 + src/mame/drivers/tomcat.cpp | 2 + src/mame/drivers/tonton.cpp | 5 +- src/mame/drivers/toobin.cpp | 3 +- src/mame/drivers/topspeed.cpp | 16 +- src/mame/drivers/toratora.cpp | 2 + src/mame/drivers/tourtabl.cpp | 2 + src/mame/drivers/tourvis.cpp | 20 +- src/mame/drivers/toypop.cpp | 6 +- src/mame/drivers/tp84.cpp | 10 +- src/mame/drivers/trackfld.cpp | 6 +- src/mame/drivers/tranz330.cpp | 4 + src/mame/drivers/travrusa.cpp | 6 +- src/mame/drivers/triforce.cpp | 2 + src/mame/drivers/triplhnt.cpp | 3 +- src/mame/drivers/trs80.cpp | 4 + src/mame/drivers/trs80m2.cpp | 3 + src/mame/drivers/truco.cpp | 12 +- src/mame/drivers/trucocl.cpp | 4 + src/mame/drivers/trvmadns.cpp | 2 + src/mame/drivers/trvquest.cpp | 7 +- src/mame/drivers/tryout.cpp | 6 +- src/mame/drivers/ts803.cpp | 1 + src/mame/drivers/tsamurai.cpp | 3 + src/mame/drivers/tsispch.cpp | 3 + src/mame/drivers/ttchamp.cpp | 4 +- src/mame/drivers/tubep.cpp | 4 +- src/mame/drivers/tugboat.cpp | 2 + src/mame/drivers/tumbleb.cpp | 5 +- src/mame/drivers/tumblep.cpp | 5 +- src/mame/drivers/tunhunt.cpp | 4 +- src/mame/drivers/turrett.cpp | 6 +- src/mame/drivers/tutankhm.cpp | 8 +- src/mame/drivers/tutor.cpp | 11 +- src/mame/drivers/tv910.cpp | 7 +- src/mame/drivers/tv950.cpp | 5 +- src/mame/drivers/tv990.cpp | 9 +- src/mame/drivers/tvc.cpp | 18 +- src/mame/drivers/tvcapcom.cpp | 1 + src/mame/drivers/tvgame.cpp | 4 +- src/mame/drivers/twin16.cpp | 9 +- src/mame/drivers/twincobr.cpp | 11 +- src/mame/drivers/twinkle.cpp | 2 + src/mame/drivers/twins.cpp | 19 +- src/mame/drivers/tx0.cpp | 12 +- src/mame/drivers/tx1.cpp | 10 +- src/mame/drivers/uapce.cpp | 8 +- src/mame/drivers/uknc.cpp | 1 + src/mame/drivers/ultraman.cpp | 5 +- src/mame/drivers/ultratnk.cpp | 3 +- src/mame/drivers/ultrsprt.cpp | 5 +- src/mame/drivers/umipoker.cpp | 7 +- src/mame/drivers/undrfire.cpp | 6 +- src/mame/drivers/unichamp.cpp | 5 + src/mame/drivers/unico.cpp | 7 +- src/mame/drivers/unior.cpp | 4 +- src/mame/drivers/unistar.cpp | 3 +- src/mame/drivers/univac.cpp | 1 + src/mame/drivers/unixpc.cpp | 2 + src/mame/drivers/unkhorse.cpp | 5 +- src/mame/drivers/upscope.cpp | 3 +- src/mame/drivers/usgames.cpp | 10 +- src/mame/drivers/ut88.cpp | 4 + src/mame/drivers/uzebox.cpp | 7 +- src/mame/drivers/v1050.cpp | 4 + src/mame/drivers/v6809.cpp | 11 +- src/mame/drivers/vamphalf.cpp | 6 +- src/mame/drivers/vaportra.cpp | 6 +- src/mame/drivers/vastar.cpp | 5 +- src/mame/drivers/vball.cpp | 4 +- src/mame/drivers/vboy.cpp | 7 +- src/mame/drivers/vc4000.cpp | 2 + src/mame/drivers/vcombat.cpp | 6 +- src/mame/drivers/vd.cpp | 7 +- src/mame/drivers/vector06.cpp | 2 + src/mame/drivers/vectrex.cpp | 4 + src/mame/drivers/vega.cpp | 18 +- src/mame/drivers/vegaeo.cpp | 4 +- src/mame/drivers/vegas.cpp | 6 +- src/mame/drivers/vendetta.cpp | 8 +- src/mame/drivers/vertigo.cpp | 4 +- src/mame/drivers/vg5k.cpp | 26 +- src/mame/drivers/vgmplay.cpp | 29 +- src/mame/drivers/vic10.cpp | 2 + src/mame/drivers/vic20.cpp | 2 + src/mame/drivers/vicdual.cpp | 6 +- src/mame/drivers/victor9k.cpp | 4 +- src/mame/drivers/vidbrain.cpp | 3 + src/mame/drivers/videopin.cpp | 7 +- src/mame/drivers/videopkr.cpp | 23 +- src/mame/drivers/vigilant.cpp | 4 + src/mame/drivers/vii.cpp | 3 + src/mame/drivers/vindictr.cpp | 4 +- src/mame/drivers/vip.cpp | 2 + src/mame/drivers/viper.cpp | 5 +- src/mame/drivers/vis.cpp | 10 +- src/mame/drivers/vixen.cpp | 3 + src/mame/drivers/vk100.cpp | 23 +- src/mame/drivers/vlc.cpp | 24 +- src/mame/drivers/volfied.cpp | 19 +- src/mame/drivers/votrpss.cpp | 9 +- src/mame/drivers/votrtnt.cpp | 2 + src/mame/drivers/voyager.cpp | 10 +- src/mame/drivers/vp101.cpp | 1 + src/mame/drivers/vpoker.cpp | 2 + src/mame/drivers/vroulet.cpp | 4 +- src/mame/drivers/vsnes.cpp | 6 +- src/mame/drivers/vt100.cpp | 5 + src/mame/drivers/vt220.cpp | 1 + src/mame/drivers/vt240.cpp | 34 +- src/mame/drivers/vt320.cpp | 9 +- src/mame/drivers/vt520.cpp | 3 +- src/mame/drivers/vta2000.cpp | 1 + src/mame/drivers/vtech1.cpp | 19 +- src/mame/drivers/vtech2.cpp | 12 +- src/mame/drivers/vulgus.cpp | 5 +- src/mame/drivers/wacky_gator.cpp | 3 +- src/mame/drivers/wallc.cpp | 4 +- src/mame/drivers/wardner.cpp | 10 +- src/mame/drivers/warpsped.cpp | 1 + src/mame/drivers/warpwarp.cpp | 5 +- src/mame/drivers/warriorb.cpp | 10 +- src/mame/drivers/wc90.cpp | 5 +- src/mame/drivers/wc90b.cpp | 6 +- src/mame/drivers/wecleman.cpp | 7 +- src/mame/drivers/welltris.cpp | 11 +- src/mame/drivers/wgp.cpp | 10 +- src/mame/drivers/wheelfir.cpp | 3 + src/mame/drivers/wicat.cpp | 15 +- src/mame/drivers/wico.cpp | 3 + src/mame/drivers/wildpkr.cpp | 14 +- src/mame/drivers/williams.cpp | 2 + src/mame/drivers/wink.cpp | 4 +- src/mame/drivers/wiping.cpp | 7 +- src/mame/drivers/witch.cpp | 21 +- src/mame/drivers/wiz.cpp | 5 +- src/mame/drivers/wmg.cpp | 3 + src/mame/drivers/wms.cpp | 11 +- src/mame/drivers/wolfpack.cpp | 4 +- src/mame/drivers/wpc_an.cpp | 6 +- src/mame/drivers/wpc_dot.cpp | 2 + src/mame/drivers/wpc_flip1.cpp | 2 + src/mame/drivers/wpc_flip2.cpp | 2 + src/mame/drivers/wrally.cpp | 5 +- src/mame/drivers/wswan.cpp | 4 + src/mame/drivers/wwfsstar.cpp | 7 +- src/mame/drivers/wyvernf0.cpp | 3 + src/mame/drivers/x07.cpp | 4 + src/mame/drivers/x1.cpp | 7 +- src/mame/drivers/x1twin.cpp | 14 +- src/mame/drivers/x68k.cpp | 19 +- src/mame/drivers/xain.cpp | 2 + src/mame/drivers/xavix.cpp | 5 +- src/mame/drivers/xbox.cpp | 20 +- src/mame/drivers/xerox820.cpp | 5 + src/mame/drivers/xexex.cpp | 9 +- src/mame/drivers/xmen.cpp | 10 +- src/mame/drivers/xorworld.cpp | 8 +- src/mame/drivers/xtheball.cpp | 3 + src/mame/drivers/xxmissio.cpp | 5 +- src/mame/drivers/xybots.cpp | 4 +- src/mame/drivers/xyonix.cpp | 4 +- src/mame/drivers/yiear.cpp | 9 +- src/mame/drivers/ymmu100.cpp | 11 +- src/mame/drivers/yunsun16.cpp | 4 +- src/mame/drivers/yunsung8.cpp | 6 +- src/mame/drivers/z100.cpp | 7 +- src/mame/drivers/z1013.cpp | 6 +- src/mame/drivers/z88.cpp | 2 + src/mame/drivers/z9001.cpp | 8 +- src/mame/drivers/zac2650.cpp | 4 +- src/mame/drivers/zaccaria.cpp | 5 +- src/mame/drivers/zaurus.cpp | 10 +- src/mame/drivers/zaxxon.cpp | 13 +- src/mame/drivers/zerozone.cpp | 3 + src/mame/drivers/zn.cpp | 28 +- src/mame/drivers/zodiack.cpp | 6 +- src/mame/drivers/zorba.cpp | 2 + src/mame/drivers/zr107.cpp | 1 + src/mame/drivers/zrt80.cpp | 2 + src/mame/drivers/zwackery.cpp | 5 +- src/mame/drivers/zx.cpp | 3 + src/mame/includes/8080bw.h | 15 +- src/mame/includes/airbustr.h | 1 + src/mame/includes/amiga.h | 1 + src/mame/includes/amspdwy.h | 1 + src/mame/includes/amstrad.h | 1 + src/mame/includes/apple2.h | 22 +- src/mame/includes/aquarium.h | 1 + src/mame/includes/aquarius.h | 16 +- src/mame/includes/arcadia.h | 2 + src/mame/includes/archimds.h | 1 + src/mame/includes/argus.h | 1 + src/mame/includes/artmagic.h | 22 +- src/mame/includes/astrocde.h | 1 + src/mame/includes/astrof.h | 1 + src/mame/includes/atarifb.h | 1 + src/mame/includes/atarig1.h | 3 +- src/mame/includes/atarig42.h | 3 +- src/mame/includes/atarigx2.h | 3 +- src/mame/includes/atetris.h | 1 + src/mame/includes/atom.h | 25 +- src/mame/includes/aussiebyte.h | 24 +- src/mame/includes/avigo.h | 17 +- src/mame/includes/aztarac.h | 1 + src/mame/includes/b2m.h | 12 +- src/mame/includes/balsente.h | 1 + src/mame/includes/battlera.h | 1 + src/mame/includes/bigevglf.h | 1 + src/mame/includes/bishi.h | 1 + src/mame/includes/bking.h | 1 + src/mame/includes/blockout.h | 1 + src/mame/includes/bosco.h | 18 +- src/mame/includes/btime.h | 1 + src/mame/includes/btoads.h | 1 + src/mame/includes/buggychl.h | 1 + src/mame/includes/capbowl.h | 1 + src/mame/includes/cave.h | 1 + src/mame/includes/ccastles.h | 1 + src/mame/includes/cchasm.h | 1 + src/mame/includes/centiped.h | 1 + src/mame/includes/changela.h | 1 + src/mame/includes/cheekyms.h | 1 + src/mame/includes/cinemat.h | 21 +- src/mame/includes/circus.h | 1 + src/mame/includes/cischeat.h | 1 + src/mame/includes/cloak.h | 1 + src/mame/includes/cloud9.h | 1 + src/mame/includes/cninja.h | 1 + src/mame/includes/combatsc.h | 1 + src/mame/includes/concept.h | 8 +- src/mame/includes/contra.h | 1 + src/mame/includes/copsnrob.h | 1 + src/mame/includes/cosmic.h | 1 + src/mame/includes/cosmicos.h | 12 +- src/mame/includes/cps1.h | 1 + src/mame/includes/cvs.h | 1 + src/mame/includes/cyberbal.h | 1 + src/mame/includes/cybiko.h | 26 +- src/mame/includes/darkmist.h | 1 + src/mame/includes/dc.h | 7 +- src/mame/includes/dccons.h | 17 +- src/mame/includes/dcheese.h | 1 + src/mame/includes/dday.h | 1 + src/mame/includes/ddragon.h | 1 + src/mame/includes/ddragon3.h | 1 + src/mame/includes/deco32.h | 1 + src/mame/includes/deco_mlc.h | 1 + src/mame/includes/decocass.h | 1 + src/mame/includes/dkong.h | 1 + src/mame/includes/dogfgt.h | 1 + src/mame/includes/dooyong.h | 1 + src/mame/includes/dragrace.h | 1 + src/mame/includes/dynax.h | 1 + src/mame/includes/einstein.h | 1 + src/mame/includes/eolith.h | 1 + src/mame/includes/equites.h | 1 + src/mame/includes/esripsys.h | 1 + src/mame/includes/exerion.h | 1 + src/mame/includes/exidy.h | 1 + src/mame/includes/exidy440.h | 1 + src/mame/includes/exp85.h | 8 +- src/mame/includes/fantland.h | 1 + src/mame/includes/fastlane.h | 1 + src/mame/includes/fgoal.h | 1 + src/mame/includes/firetrk.h | 1 + src/mame/includes/fmtowns.h | 36 ++- src/mame/includes/fromance.h | 1 + src/mame/includes/fuukifg2.h | 1 + src/mame/includes/fuukifg3.h | 1 + src/mame/includes/gaelco3d.h | 1 + src/mame/includes/gaiden.h | 1 + src/mame/includes/galaga.h | 8 + src/mame/includes/galastrm.h | 2 + src/mame/includes/galaxian.h | 1 + src/mame/includes/galaxold.h | 1 + src/mame/includes/galpanic.h | 1 + src/mame/includes/galspnbl.h | 1 + src/mame/includes/gameplan.h | 1 + src/mame/includes/gamepock.h | 13 +- src/mame/includes/gaplus.h | 1 + src/mame/includes/gomoku.h | 1 + src/mame/includes/gottlieb.h | 1 + src/mame/includes/grchamp.h | 1 + src/mame/includes/gridlee.h | 7 +- src/mame/includes/gstriker.h | 1 + src/mame/includes/gyruss.h | 1 + src/mame/includes/harddriv.h | 1 + src/mame/includes/hh_tms1k.h | 11 +- src/mame/includes/hh_ucom4.h | 11 +- src/mame/includes/hitme.h | 1 + src/mame/includes/hng64.h | 1 + src/mame/includes/homerun.h | 1 + src/mame/includes/hp9845.h | 1 + src/mame/includes/hx20.h | 16 +- src/mame/includes/hyhoo.h | 1 + src/mame/includes/hyprduel.h | 2 + src/mame/includes/ikki.h | 1 + src/mame/includes/intv.h | 10 +- src/mame/includes/inufuku.h | 5 + src/mame/includes/irobot.h | 1 + src/mame/includes/itech32.h | 1 + src/mame/includes/itech8.h | 1 + src/mame/includes/jaguar.h | 1 + src/mame/includes/jedi.h | 7 +- src/mame/includes/kc.h | 14 +- src/mame/includes/kncljoe.h | 1 + src/mame/includes/konamigx.h | 6 + src/mame/includes/kyocera.h | 18 +- src/mame/includes/labyrunr.h | 1 + src/mame/includes/laserbat.h | 2 + src/mame/includes/lc80.h | 9 +- src/mame/includes/leland.h | 1 + src/mame/includes/lethalj.h | 8 + src/mame/includes/liberatr.h | 1 + src/mame/includes/lisa.h | 12 +- src/mame/includes/llc.h | 16 +- src/mame/includes/lockon.h | 1 + src/mame/includes/lordgun.h | 1 + src/mame/includes/lviv.h | 10 +- src/mame/includes/m10.h | 1 + src/mame/includes/m107.h | 1 + src/mame/includes/m5.h | 44 +-- src/mame/includes/m52.h | 2 + src/mame/includes/m58.h | 1 + src/mame/includes/m72.h | 1 + src/mame/includes/m92.h | 1 + src/mame/includes/mac.h | 1 + src/mame/includes/macrossp.h | 1 + src/mame/includes/magmax.h | 2 + src/mame/includes/malzak.h | 1 + src/mame/includes/mappy.h | 1 + src/mame/includes/matmania.h | 1 + src/mame/includes/mbc55x.h | 25 +- src/mame/includes/mbee.h | 29 +- src/mame/includes/mc1502.h | 16 +- src/mame/includes/mcr3.h | 1 + src/mame/includes/mcr68.h | 1 + src/mame/includes/meadows.h | 1 + src/mame/includes/megasys1.h | 1 + src/mame/includes/mermaid.h | 1 + src/mame/includes/metalmx.h | 2 + src/mame/includes/metro.h | 1 + src/mame/includes/midtunit.h | 5 +- src/mame/includes/midvunit.h | 1 + src/mame/includes/midyunit.h | 5 +- src/mame/includes/midzeus.h | 1 + src/mame/includes/model1.h | 16 +- src/mame/includes/model2.h | 1 + src/mame/includes/model3.h | 1 + src/mame/includes/moo.h | 1 + src/mame/includes/mpf1.h | 10 +- src/mame/includes/mrflea.h | 1 + src/mame/includes/ms32.h | 1 + src/mame/includes/multfish.h | 1 + src/mame/includes/mustache.h | 1 + src/mame/includes/mw8080bw.h | 1 + src/mame/includes/mystston.h | 2 + src/mame/includes/mystwarr.h | 4 +- src/mame/includes/mz700.h | 18 +- src/mame/includes/mz80.h | 8 +- src/mame/includes/n8080.h | 1 + src/mame/includes/namcona1.h | 1 + src/mame/includes/namcos2.h | 1 + src/mame/includes/namcos22.h | 1 + src/mame/includes/naughtyb.h | 1 + src/mame/includes/nbmj8891.h | 1 + src/mame/includes/nbmj8900.h | 1 + src/mame/includes/nbmj8991.h | 1 + src/mame/includes/nbmj9195.h | 1 + src/mame/includes/nemesis.h | 3 + src/mame/includes/neogeo.h | 2 + src/mame/includes/ninjakd2.h | 1 + src/mame/includes/niyanpai.h | 1 + src/mame/includes/ojankohs.h | 1 + src/mame/includes/orao.h | 9 +- src/mame/includes/orbit.h | 1 + src/mame/includes/orion.h | 19 +- src/mame/includes/osborne1.h | 14 +- src/mame/includes/overdriv.h | 1 + src/mame/includes/p2000t.h | 10 +- src/mame/includes/pacland.h | 1 + src/mame/includes/paradise.h | 1 + src/mame/includes/partner.h | 18 +- src/mame/includes/pastelg.h | 1 + src/mame/includes/pc1512.h | 13 +- src/mame/includes/pc8401a.h | 2 + src/mame/includes/pcw.h | 1 + src/mame/includes/pecom.h | 7 +- src/mame/includes/pgm.h | 23 +- src/mame/includes/pk8020.h | 16 +- src/mame/includes/polepos.h | 1 + src/mame/includes/policetr.h | 2 + src/mame/includes/polyplay.h | 6 +- src/mame/includes/powerins.h | 1 + src/mame/includes/pp01.h | 10 +- src/mame/includes/primo.h | 12 +- src/mame/includes/prof180x.h | 12 +- src/mame/includes/psikyo.h | 1 + src/mame/includes/psikyo4.h | 5 +- src/mame/includes/psikyosh.h | 3 +- src/mame/includes/qix.h | 2 + src/mame/includes/realbrk.h | 1 + src/mame/includes/redalert.h | 1 + src/mame/includes/rmnimbus.h | 1 + src/mame/includes/rpunch.h | 1 + src/mame/includes/runaway.h | 2 + src/mame/includes/rungun.h | 1 + src/mame/includes/samcoupe.h | 14 +- src/mame/includes/segag80r.h | 1 + src/mame/includes/segag80v.h | 1 + src/mame/includes/segas24.h | 1 + src/mame/includes/segas32.h | 1 + src/mame/includes/segaxbd.h | 1 + src/mame/includes/seta2.h | 1 + src/mame/includes/shadfrce.h | 1 + src/mame/includes/shangha3.h | 1 + src/mame/includes/simple_st0016.h | 1 + src/mame/includes/skyfox.h | 1 + src/mame/includes/slapfght.h | 1 + src/mame/includes/sms.h | 15 +- src/mame/includes/snes.h | 1 + src/mame/includes/snk.h | 1 + src/mame/includes/snk68.h | 1 + src/mame/includes/spacefb.h | 1 + src/mame/includes/spbactn.h | 1 + src/mame/includes/spdodgeb.h | 1 + src/mame/includes/spec128.h | 6 +- src/mame/includes/spectrum.h | 23 +- src/mame/includes/sprint2.h | 1 + src/mame/includes/sprint4.h | 2 + src/mame/includes/sprint8.h | 1 + src/mame/includes/ssv.h | 1 + src/mame/includes/starfire.h | 1 + src/mame/includes/starshp1.h | 1 + src/mame/includes/suna16.h | 1 + src/mame/includes/suna8.h | 1 + src/mame/includes/super80.h | 23 +- src/mame/includes/suprnova.h | 2 + src/mame/includes/suprslam.h | 5 + src/mame/includes/system1.h | 1 + src/mame/includes/taito_b.h | 1 + src/mame/includes/taito_f3.h | 1 + src/mame/includes/taitoair.h | 1 + src/mame/includes/taitojc.h | 1 + src/mame/includes/taitosj.h | 2 + src/mame/includes/tandy2k.h | 8 +- src/mame/includes/tank8.h | 1 + src/mame/includes/taotaido.h | 5 + src/mame/includes/tceptor.h | 1 + src/mame/includes/tecmo.h | 1 + src/mame/includes/tecmo16.h | 1 + src/mame/includes/tecmosys.h | 1 + src/mame/includes/tek405x.h | 21 +- src/mame/includes/thomson.h | 24 +- src/mame/includes/ti85.h | 14 +- src/mame/includes/tiamc1.h | 20 +- src/mame/includes/timeplt.h | 1 + src/mame/includes/toaplan1.h | 1 + src/mame/includes/toaplan2.h | 7 +- src/mame/includes/toki.h | 1 + src/mame/includes/tp84.h | 2 + src/mame/includes/tranz330.h | 6 +- src/mame/includes/triplhnt.h | 1 + src/mame/includes/trs80.h | 21 +- src/mame/includes/tubep.h | 1 + src/mame/includes/tunhunt.h | 2 + src/mame/includes/turbo.h | 2 + src/mame/includes/turrett.h | 3 +- src/mame/includes/twin16.h | 1 + src/mame/includes/twincobr.h | 1 + src/mame/includes/tx1.h | 2 + src/mame/includes/ultratnk.h | 1 + src/mame/includes/unico.h | 1 + src/mame/includes/vball.h | 1 + src/mame/includes/vc4000.h | 2 + src/mame/includes/vector06.h | 26 +- src/mame/includes/vectrex.h | 2 + src/mame/includes/vicdual.h | 1 + src/mame/includes/victory.h | 2 + src/mame/includes/videopin.h | 1 + src/mame/includes/volfied.h | 1 + src/mame/includes/vtech2.h | 13 +- src/mame/includes/wecleman.h | 1 + src/mame/includes/williams.h | 1 + src/mame/includes/wolfpack.h | 1 + src/mame/includes/wwfsstar.h | 1 + src/mame/includes/x68k.h | 15 +- src/mame/includes/xain.h | 1 + src/mame/includes/xbox.h | 9 + src/mame/includes/xbox_nv2a.h | 10 + src/mame/includes/xerox820.h | 10 +- src/mame/includes/xexex.h | 1 + src/mame/includes/xmen.h | 1 + src/mame/includes/yunsun16.h | 1 + src/mame/includes/z88.h | 15 +- src/mame/includes/zac2650.h | 1 + src/mame/includes/zx.h | 19 +- src/mame/machine/315-5838_317-0229_comp.cpp | 2 +- src/mame/machine/315-5881_crypt.cpp | 2 +- src/mame/machine/315_5296.cpp | 2 +- src/mame/machine/3do.cpp | 4 + src/mame/machine/6883sam.cpp | 2 +- src/mame/machine/abc1600mac.cpp | 2 +- src/mame/machine/abc80kb.cpp | 2 +- src/mame/machine/alpha8201.cpp | 2 +- src/mame/machine/amstrad.cpp | 3 +- src/mame/machine/apollo.cpp | 10 +- src/mame/machine/apollo_kbd.cpp | 2 +- src/mame/machine/apple2.cpp | 11 +- src/mame/machine/apple2gs.cpp | 3 + src/mame/machine/apple3.cpp | 1 + src/mame/machine/apricotkb.cpp | 2 +- src/mame/machine/archimds.cpp | 2 +- src/mame/machine/asic65.cpp | 2 +- src/mame/machine/at.cpp | 3 +- src/mame/machine/at.h | 8 +- src/mame/machine/atari_vg.cpp | 2 +- src/mame/machine/atarifdc.cpp | 2 +- src/mame/machine/atarigen.cpp | 8 +- src/mame/machine/atarigen.h | 11 +- src/mame/machine/atarixga.cpp | 4 +- src/mame/machine/awboard.cpp | 2 +- src/mame/machine/beta.cpp | 2 +- src/mame/machine/bfm_bd1.cpp | 2 +- src/mame/machine/bfm_bda.cpp | 2 +- src/mame/machine/c117.cpp | 2 +- src/mame/machine/cammu.cpp | 6 +- src/mame/machine/cat702.cpp | 2 +- src/mame/machine/cdi070.cpp | 2 +- src/mame/machine/cdicdic.cpp | 2 +- src/mame/machine/cdislave.cpp | 2 +- src/mame/machine/cedar_magnet_flop.cpp | 2 +- src/mame/machine/cedar_magnet_plane.cpp | 2 +- src/mame/machine/cedar_magnet_sprite.cpp | 2 +- src/mame/machine/coco.cpp | 2 + src/mame/machine/coco_vhd.cpp | 2 +- src/mame/machine/compiskb.cpp | 6 +- src/mame/machine/compiskb.h | 11 +- src/mame/machine/cuda.cpp | 4 +- src/mame/machine/dc-ctrl.cpp | 2 +- src/mame/machine/dec_lk201.cpp | 3 +- src/mame/machine/deco104.cpp | 2 +- src/mame/machine/deco146.cpp | 4 +- src/mame/machine/deco222.cpp | 3 + src/mame/machine/deco222.h | 6 +- src/mame/machine/decocass_tape.cpp | 2 +- src/mame/machine/decocpu6.cpp | 3 + src/mame/machine/decocpu6.h | 2 +- src/mame/machine/decocpu7.cpp | 3 + src/mame/machine/decocpu7.h | 2 +- src/mame/machine/decopincpu.cpp | 8 +- src/mame/machine/dmv_keyb.cpp | 2 +- src/mame/machine/docg3.cpp | 2 +- src/mame/machine/egret.cpp | 4 +- src/mame/machine/einstein.cpp | 6 +- src/mame/machine/electron.cpp | 3 +- src/mame/machine/esqlcd.cpp | 2 +- src/mame/machine/esqpanel.cpp | 6 +- src/mame/machine/esqvfd.cpp | 6 +- src/mame/machine/fd1089.cpp | 4 +- src/mame/machine/fd1094.cpp | 2 +- src/mame/machine/fm_scsi.cpp | 2 +- src/mame/machine/fmt_icmem.cpp | 2 +- src/mame/machine/gaelco3d.cpp | 2 +- src/mame/machine/gamecom.cpp | 1 + src/mame/machine/gamepock.cpp | 4 +- src/mame/machine/gdrom.cpp | 2 +- src/mame/machine/genpin.cpp | 4 +- src/mame/machine/hec2hrp.cpp | 10 +- src/mame/machine/hp48.cpp | 7 +- src/mame/machine/ibm6580_fdc.cpp | 2 +- src/mame/machine/ibm6580_kbd.cpp | 2 +- src/mame/machine/ie15_kbd.cpp | 2 +- src/mame/machine/igs022.cpp | 2 +- src/mame/machine/igs022.h | 5 +- src/mame/machine/igs025.cpp | 2 +- src/mame/machine/igs025.h | 6 +- src/mame/machine/igs028.cpp | 2 +- src/mame/machine/igs028.h | 6 +- src/mame/machine/inder_sb.cpp | 4 +- src/mame/machine/inder_vid.cpp | 3 +- src/mame/machine/interpro_ioga.cpp | 2 +- src/mame/machine/interpro_mcga.cpp | 2 +- src/mame/machine/interpro_sga.cpp | 2 +- src/mame/machine/isbc_208.cpp | 2 +- src/mame/machine/isbc_215g.cpp | 2 +- src/mame/machine/iteagle_fpga.cpp | 6 +- src/mame/machine/jvs13551.cpp | 2 +- src/mame/machine/k573cass.cpp | 12 +- src/mame/machine/k573dio.cpp | 2 +- src/mame/machine/k573mcr.cpp | 2 +- src/mame/machine/k573msu.cpp | 2 +- src/mame/machine/k573npu.cpp | 2 +- src/mame/machine/k7659kb.cpp | 2 +- src/mame/machine/kaneko_calc3.cpp | 2 +- src/mame/machine/kaneko_hit.cpp | 2 +- src/mame/machine/kaneko_toybox.cpp | 2 +- src/mame/machine/kc_keyb.cpp | 2 +- src/mame/machine/km035.cpp | 3 +- src/mame/machine/konami1.cpp | 2 +- src/mame/machine/konppc.cpp | 2 +- src/mame/machine/lisa.cpp | 1 + src/mame/machine/lviv.cpp | 10 +- src/mame/machine/m1comm.cpp | 2 +- src/mame/machine/m20_8086.cpp | 2 +- src/mame/machine/m20_kbd.cpp | 2 +- src/mame/machine/m24_kbd.cpp | 2 +- src/mame/machine/m24_z8000.cpp | 2 +- src/mame/machine/m2comm.cpp | 2 +- src/mame/machine/m3comm.cpp | 2 +- src/mame/machine/mackbd.cpp | 2 +- src/mame/machine/macrtc.cpp | 2 +- src/mame/machine/maple-dc.cpp | 2 +- src/mame/machine/mathbox.cpp | 2 +- src/mame/machine/mega32x.cpp | 4 +- src/mame/machine/megacd.cpp | 6 +- src/mame/machine/megacdcd.cpp | 2 +- src/mame/machine/megadriv.cpp | 1 + src/mame/machine/meters.cpp | 2 +- src/mame/machine/microdrv.cpp | 2 +- src/mame/machine/micropolis.cpp | 2 +- src/mame/machine/midikbd.cpp | 2 +- src/mame/machine/midwayic.cpp | 8 +- src/mame/machine/mie.cpp | 4 +- src/mame/machine/mm1kb.cpp | 4 +- src/mame/machine/ms7004.cpp | 4 +- src/mame/machine/msx_matsushita.cpp | 2 +- src/mame/machine/msx_s1985.cpp | 2 +- src/mame/machine/msx_systemflags.cpp | 2 +- src/mame/machine/mz700.cpp | 9 +- src/mame/machine/n64.cpp | 2 +- src/mame/machine/namco06.cpp | 2 +- src/mame/machine/namco50.cpp | 2 +- src/mame/machine/namco51.cpp | 3 +- src/mame/machine/namco53.cpp | 2 +- src/mame/machine/namco62.cpp | 2 +- src/mame/machine/namco_c139.cpp | 2 +- src/mame/machine/namco_c148.cpp | 2 +- src/mame/machine/namco_settings.cpp | 2 +- src/mame/machine/namcoio.cpp | 6 +- src/mame/machine/namcoio_gearbox.cpp | 2 +- src/mame/machine/namcomcu.cpp | 10 +- src/mame/machine/naomigd.cpp | 2 +- src/mame/machine/naomim1.cpp | 2 +- src/mame/machine/naomim2.cpp | 2 +- src/mame/machine/naomim4.cpp | 2 +- src/mame/machine/naomirom.cpp | 2 +- src/mame/machine/nb1413m3.cpp | 2 +- src/mame/machine/nb1414m4.cpp | 9 +- src/mame/machine/nextkbd.cpp | 2 +- src/mame/machine/nextmo.cpp | 2 +- src/mame/machine/ng_memcard.cpp | 2 +- src/mame/machine/ngen_kb.cpp | 2 +- src/mame/machine/nmk004.cpp | 2 +- src/mame/machine/nmk112.cpp | 2 +- src/mame/machine/ns10crypt.cpp | 16 +- src/mame/machine/ns11prot.cpp | 18 +- src/mame/machine/octo_kbd.cpp | 2 +- src/mame/machine/orion.cpp | 7 +- src/mame/machine/osborne1.cpp | 2 + src/mame/machine/pc1512kb.cpp | 2 +- src/mame/machine/pc9801_118.cpp | 5 +- src/mame/machine/pc9801_26.cpp | 5 +- src/mame/machine/pc9801_86.cpp | 3 +- src/mame/machine/pc9801_cbus.cpp | 2 +- src/mame/machine/pc9801_cd.cpp | 2 +- src/mame/machine/pc9801_kbd.cpp | 2 +- src/mame/machine/pcd_kbd.cpp | 6 +- src/mame/machine/pcd_kbd.h | 13 +- src/mame/machine/pce220_ser.cpp | 2 +- src/mame/machine/pce_cd.cpp | 2 +- src/mame/machine/pecom.cpp | 3 +- src/mame/machine/pgmprot_igs027a_type1.cpp | 4 +- src/mame/machine/pgmprot_igs027a_type1.h | 8 +- src/mame/machine/primo.cpp | 7 +- src/mame/machine/prof80mmu.cpp | 2 +- src/mame/machine/psion_pack.cpp | 2 +- src/mame/machine/psxcd.cpp | 2 +- src/mame/machine/qimi.cpp | 2 +- src/mame/machine/qx10kbd.cpp | 2 +- src/mame/machine/rmnkbd.cpp | 2 +- src/mame/machine/rx01.cpp | 2 +- src/mame/machine/s32comm.cpp | 2 +- src/mame/machine/samcoupe.cpp | 1 + src/mame/machine/segabb.cpp | 2 +- src/mame/machine/segacrp2_device.cpp | 24 +- src/mame/machine/segacrpt_device.cpp | 54 ++-- src/mame/machine/segaic16.cpp | 8 +- src/mame/machine/segaic16.h | 9 +- src/mame/machine/seibucop/seibucop.cpp | 2 +- src/mame/machine/seicop.cpp | 2 +- src/mame/machine/sgi.cpp | 2 +- src/mame/machine/slapstic.cpp | 2 +- src/mame/machine/st0016.cpp | 4 +- src/mame/machine/st0016.h | 9 +- src/mame/machine/swim.cpp | 2 +- src/mame/machine/tait8741.cpp | 2 +- src/mame/machine/taito68705interface.cpp | 8 +- src/mame/machine/taitoio.cpp | 6 +- src/mame/machine/tandy2kb.cpp | 2 +- src/mame/machine/teleprinter.cpp | 6 +- src/mame/machine/thomson.cpp | 2 +- src/mame/machine/ticket.cpp | 2 +- src/mame/machine/trs80m2kb.cpp | 2 +- src/mame/machine/upd65031.cpp | 2 +- src/mame/machine/v1050kb.cpp | 4 +- src/mame/machine/vector06.cpp | 1 + src/mame/machine/victor9k_fdc.cpp | 2 +- src/mame/machine/victor9kb.cpp | 2 +- src/mame/machine/vtech2.cpp | 3 +- src/mame/machine/wangpckb.cpp | 3 +- src/mame/machine/wpc.cpp | 2 +- src/mame/machine/wpc_lamp.cpp | 2 +- src/mame/machine/wpc_out.cpp | 2 +- src/mame/machine/wpc_pic.cpp | 2 +- src/mame/machine/wpc_shift.cpp | 2 +- src/mame/machine/x1.cpp | 2 +- src/mame/machine/x68k_hdc.cpp | 2 +- src/mame/machine/x68k_kbd.cpp | 2 +- src/mame/machine/x820kb.cpp | 2 +- src/mame/machine/xbox.cpp | 18 +- src/mame/machine/xbox_usb.cpp | 11 +- src/mame/machine/znmcu.cpp | 2 +- src/mame/machine/zorbakbd.cpp | 15 +- src/mame/machine/zs01.cpp | 2 +- src/mame/machine/zx8302.cpp | 2 +- src/mame/video/20pacgal.cpp | 1 + src/mame/video/733_asr.cpp | 3 +- src/mame/video/911_vdt.cpp | 6 +- src/mame/video/abc1600.cpp | 2 +- src/mame/video/abc80.cpp | 1 + src/mame/video/abc800.cpp | 1 + src/mame/video/abc802.cpp | 1 + src/mame/video/abc806.cpp | 1 + src/mame/video/aerofgt.cpp | 1 + src/mame/video/airraid_dev.cpp | 2 +- src/mame/video/airraid_dev.h | 9 +- src/mame/video/angelkds.cpp | 1 + src/mame/video/antic.cpp | 3 +- src/mame/video/apollo.cpp | 11 +- src/mame/video/apple2.cpp | 2 +- src/mame/video/apple2.h | 6 +- src/mame/video/asterix.cpp | 1 + src/mame/video/asuka.cpp | 1 + src/mame/video/atari400.cpp | 1 + src/mame/video/atarimo.cpp | 3 +- src/mame/video/atarirle.cpp | 3 +- src/mame/video/atarist.cpp | 6 +- src/mame/video/avgdvg.cpp | 17 +- src/mame/video/bbc.cpp | 1 + src/mame/video/bfm_adr2.cpp | 6 +- src/mame/video/bfm_dm01.cpp | 2 +- src/mame/video/bfm_dm01.h | 2 + src/mame/video/blmbycar.cpp | 1 + src/mame/video/bloodbro.cpp | 1 + src/mame/video/boogwing.cpp | 1 + src/mame/video/c45.cpp | 2 +- src/mame/video/cgc7900.cpp | 1 + src/mame/video/cidelsa.cpp | 5 +- src/mame/video/comx35.cpp | 5 +- src/mame/video/crt.cpp | 2 +- src/mame/video/dassault.cpp | 1 + src/mame/video/dcon.cpp | 1 + src/mame/video/deadang.cpp | 1 + src/mame/video/decbac06.cpp | 2 +- src/mame/video/deckarn.cpp | 2 +- src/mame/video/decmxc06.cpp | 3 +- src/mame/video/deco16ic.cpp | 2 +- src/mame/video/deco_zoomspr.cpp | 2 +- src/mame/video/decocomn.cpp | 2 +- src/mame/video/decodmd1.cpp | 3 +- src/mame/video/decodmd2.cpp | 3 +- src/mame/video/decodmd3.cpp | 3 +- src/mame/video/decospr.cpp | 3 +- src/mame/video/deniam.cpp | 1 + src/mame/video/docastle.cpp | 1 + src/mame/video/dooyong.cpp | 6 +- src/mame/video/electron.cpp | 1 + src/mame/video/esd16.cpp | 1 + src/mame/video/excellent_spr.cpp | 3 +- src/mame/video/f1gp.cpp | 3 +- src/mame/video/finalizr.cpp | 3 +- src/mame/video/flkatck.cpp | 1 + src/mame/video/fm7.cpp | 4 +- src/mame/video/fmtowns.cpp | 5 +- src/mame/video/fuukifg.cpp | 3 +- src/mame/video/gaelco.cpp | 1 + src/mame/video/gaelco2.cpp | 1 + src/mame/video/galaxy.cpp | 2 + src/mame/video/galpani2.cpp | 1 + src/mame/video/gamecom.cpp | 3 + src/mame/video/gcpinbal.cpp | 1 + src/mame/video/gic.cpp | 3 +- src/mame/video/gime.cpp | 4 +- src/mame/video/gp9001.cpp | 3 +- src/mame/video/groundfx.cpp | 1 + src/mame/video/gtia.cpp | 3 +- src/mame/video/gunbustr.cpp | 1 + src/mame/video/hcastle.cpp | 1 + src/mame/video/hec2hrp.cpp | 3 +- src/mame/video/homedata.cpp | 5 +- src/mame/video/igs017_igs031.cpp | 2 +- src/mame/video/inufuku.cpp | 2 +- src/mame/video/jalblend.cpp | 2 +- src/mame/video/k001005.cpp | 2 +- src/mame/video/k001006.cpp | 2 +- src/mame/video/k001604.cpp | 2 +- src/mame/video/k007121.cpp | 2 +- src/mame/video/k007342.cpp | 2 +- src/mame/video/k007420.cpp | 2 +- src/mame/video/k037122.cpp | 3 +- src/mame/video/k051316.cpp | 2 +- src/mame/video/k051733.cpp | 2 +- src/mame/video/k051960.cpp | 2 +- src/mame/video/k051960.h | 9 +- src/mame/video/k052109.cpp | 2 +- src/mame/video/k052109.h | 8 +- src/mame/video/k053244_k053245.cpp | 2 +- src/mame/video/k053246_k053247_k055673.cpp | 4 +- src/mame/video/k053246_k053247_k055673.h | 8 +- src/mame/video/k053250.cpp | 4 +- src/mame/video/k053251.cpp | 2 +- src/mame/video/k053936.cpp | 2 +- src/mame/video/k054000.cpp | 2 +- src/mame/video/k054156_k054157_k056832.cpp | 2 +- src/mame/video/k054338.cpp | 2 +- src/mame/video/k055555.cpp | 2 +- src/mame/video/k057714.cpp | 3 +- src/mame/video/k1ge.cpp | 5 +- src/mame/video/kan_pand.cpp | 3 +- src/mame/video/kaneko16.cpp | 1 + src/mame/video/kaneko_grap2.cpp | 2 +- src/mame/video/kaneko_spr.cpp | 7 +- src/mame/video/kaneko_tmap.cpp | 2 +- src/mame/video/kaypro.cpp | 1 + src/mame/video/kc.cpp | 3 + src/mame/video/kyocera.cpp | 3 + src/mame/video/legionna.cpp | 1 + src/mame/video/lethal.cpp | 2 + src/mame/video/lethalj.cpp | 1 - src/mame/video/lkage.cpp | 1 + src/mame/video/m90.cpp | 1 + src/mame/video/madalien.cpp | 3 +- src/mame/video/maria.cpp | 3 +- src/mame/video/mb60553.cpp | 3 +- src/mame/video/mcatadv.cpp | 1 + src/mame/video/mcd212.cpp | 7 +- src/mame/video/mcr.cpp | 1 + src/mame/video/midyunit.cpp | 2 +- src/mame/video/mikromik.cpp | 1 + src/mame/video/ms1_tmap.cpp | 2 +- src/mame/video/namco_c116.cpp | 2 +- src/mame/video/namcos1.cpp | 1 + src/mame/video/namcos86.cpp | 1 + src/mame/video/neogeo_spr.cpp | 10 +- src/mame/video/newbrain.cpp | 1 + src/mame/video/newport.cpp | 2 +- src/mame/video/nick.cpp | 2 +- src/mame/video/nick.h | 11 +- src/mame/video/opwolf.cpp | 1 + src/mame/video/osi.cpp | 1 + src/mame/video/othunder.cpp | 1 + src/mame/video/pc080sn.cpp | 3 +- src/mame/video/pc090oj.cpp | 2 +- src/mame/video/pc1512.cpp | 1 + src/mame/video/pc_t1t.cpp | 7 +- src/mame/video/pcd.cpp | 9 +- src/mame/video/pcw16.cpp | 1 + src/mame/video/pecom.cpp | 7 +- src/mame/video/pgm.cpp | 1 + src/mame/video/pktgaldx.cpp | 1 + src/mame/video/playch10.cpp | 3 +- src/mame/video/playmark.cpp | 1 + src/mame/video/plygonet.cpp | 3 +- src/mame/video/powervr2.cpp | 2 +- src/mame/video/prehisle.cpp | 1 + src/mame/video/rallyx.cpp | 3 +- src/mame/video/rastan.cpp | 1 + src/mame/video/rbisland.cpp | 1 + src/mame/video/rohga.cpp | 1 + src/mame/video/rollerg.cpp | 1 + src/mame/video/samcoupe.cpp | 1 + src/mame/video/sega16sp.cpp | 16 +- src/mame/video/segaic16.cpp | 4 +- src/mame/video/segaic16_road.cpp | 2 +- src/mame/video/segaic24.cpp | 7 +- src/mame/video/seibu_crtc.cpp | 2 +- src/mame/video/seibuspi.cpp | 1 + src/mame/video/seta.cpp | 1 + src/mame/video/seta001.cpp | 3 +- src/mame/video/shootout.cpp | 1 + src/mame/video/silkroad.cpp | 1 + src/mame/video/simpl156.cpp | 2 +- src/mame/video/sknsspr.cpp | 3 +- src/mame/video/sknsspr.h | 4 + src/mame/video/slapshot.cpp | 1 + src/mame/video/snk68_spr.cpp | 2 +- src/mame/video/snk68_spr.h | 2 + src/mame/video/spectrum.cpp | 2 + src/mame/video/sprint4.cpp | 3 +- src/mame/video/st0020.cpp | 2 +- src/mame/video/stactics.cpp | 1 + src/mame/video/starcrus.cpp | 3 +- src/mame/video/stfight_dev.cpp | 4 +- src/mame/video/stfight_dev.h | 8 +- src/mame/video/stic.cpp | 3 +- src/mame/video/superchs.cpp | 1 + src/mame/video/suprridr.cpp | 1 + src/mame/video/taito_f2.cpp | 1 + src/mame/video/taito_l.cpp | 1 + src/mame/video/taito_z.cpp | 1 + src/mame/video/taotaido.cpp | 2 +- src/mame/video/tatsumi.cpp | 1 + src/mame/video/tc0080vco.cpp | 7 +- src/mame/video/tc0100scn.cpp | 3 +- src/mame/video/tc0110pcr.cpp | 2 +- src/mame/video/tc0150rod.cpp | 2 +- src/mame/video/tc0180vcu.cpp | 2 +- src/mame/video/tc0280grd.cpp | 2 +- src/mame/video/tc0360pri.cpp | 2 +- src/mame/video/tc0480scp.cpp | 3 +- src/mame/video/tc0780fpa.cpp | 2 +- src/mame/video/tecmo_mix.cpp | 2 +- src/mame/video/tecmo_spr.cpp | 4 +- src/mame/video/tetrisp2.cpp | 3 +- src/mame/video/tia.cpp | 5 +- src/mame/video/tigeroad_spr.cpp | 2 +- src/mame/video/tmc1800.cpp | 7 +- src/mame/video/tmc600.cpp | 5 +- src/mame/video/toaplan_scu.cpp | 5 +- src/mame/video/topspeed.cpp | 1 + src/mame/video/trs80.cpp | 1 + src/mame/video/undrfire.cpp | 1 + src/mame/video/uv201.cpp | 2 +- src/mame/video/uv201.h | 11 +- src/mame/video/v1050.cpp | 2 + src/mame/video/vrender0.cpp | 2 +- src/mame/video/vs920a.cpp | 2 +- src/mame/video/vsystem_spr.cpp | 9 +- src/mame/video/vsystem_spr.h | 4 + src/mame/video/vsystem_spr2.cpp | 2 +- src/mame/video/vtvideo.cpp | 5 +- src/mame/video/warriorb.cpp | 1 + src/mame/video/welltris.cpp | 1 + src/mame/video/wgp.cpp | 1 + src/mame/video/wpc_dmd.cpp | 3 +- src/mame/video/wswan.cpp | 3 +- src/mame/video/x68k.cpp | 3 - src/mame/video/ygv608.cpp | 4 +- src/mame/video/zx8301.cpp | 3 +- src/osd/modules/render/aviwrite.cpp | 3 + 4201 files changed, 13870 insertions(+), 8100 deletions(-) create mode 100644 src/devices/bus/ti99x/ti99defs.cpp delete mode 100644 src/devices/sound/speaker.cpp delete mode 100644 src/devices/sound/speaker.h create mode 100644 src/devices/sound/spkrdev.cpp create mode 100644 src/devices/sound/spkrdev.h diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 76d2e90293c..a21315344d8 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2319,6 +2319,7 @@ if (BUSES["TI99X"]~=null) then MAME_DIR .. "src/devices/bus/ti99x/joyport.h", MAME_DIR .. "src/devices/bus/ti99x/mecmouse.cpp", MAME_DIR .. "src/devices/bus/ti99x/mecmouse.h", + MAME_DIR .. "src/devices/bus/ti99x/ti99defs.cpp", MAME_DIR .. "src/devices/bus/ti99x/ti99defs.h", } end diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index fd1dc2f33a3..a4797ce9bf3 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -22,7 +22,7 @@ files { -- DACs --@src/devices/sound/dac.h,SOUNDS["DAC"] = true --@src/devices/sound/dmadac.h,SOUNDS["DMADAC"] = true ---@src/devices/sound/speaker.h,SOUNDS["SPEAKER"] = true +--@src/devices/sound/spkrdev.h,SOUNDS["SPEAKER"] = true --@src/devices/sound/beep.h,SOUNDS["BEEP"] = true --------------------------------------------------- @@ -42,8 +42,8 @@ end if (SOUNDS["SPEAKER"]~=null) then files { - MAME_DIR .. "src/devices/sound/speaker.cpp", - MAME_DIR .. "src/devices/sound/speaker.h", + MAME_DIR .. "src/devices/sound/spkrdev.cpp", + MAME_DIR .. "src/devices/sound/spkrdev.h", } end diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp index 8e0d024ebf1..39bf0c52489 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; +const device_type A1BUS_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -59,7 +59,7 @@ void a1bus_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type A1BUS = &device_creator; +const device_type A1BUS = device_creator; void a1bus_device::static_set_cputag(device_t &device, const char *tag) { diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp index f5802111084..3d499339314 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; +const device_type A1BUS_CASSETTE = device_creator; /* sound output */ diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp index ba6bc5935c1..f53270cd1df 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; +const device_type A1BUS_CFFA = device_creator; MACHINE_CONFIG_FRAGMENT( cffa ) MCFG_ATA_INTERFACE_ADD(CFFA_ATA_TAG, ata_devices, "hdd", nullptr, false) diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp index fb392196652..faa6e6d7bd8 100644 --- a/src/devices/bus/a2bus/a2alfam2.cpp +++ b/src/devices/bus/a2bus/a2alfam2.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "a2alfam2.h" #include "sound/sn76496.h" +#include "speaker.h" /*************************************************************************** PARAMETERS @@ -21,8 +22,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_ALFAM2 = &device_creator; -const device_type A2BUS_AESMS = &device_creator; +const device_type A2BUS_ALFAM2 = device_creator; +const device_type A2BUS_AESMS = device_creator; #define SN1_TAG "sn76489_1" // left #define SN2_TAG "sn76489_2" // center diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp index 5aefeb35a4f..f24903138dc 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; +const device_type A2BUS_APPLICARD = device_creator; #define Z80_TAG "z80" #define Z80_ROM_REGION "z80_rom" diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index 31d86d7bddc..68da2e73426 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -15,6 +15,7 @@ #include "emu.h" #include "a2arcadebd.h" +#include "speaker.h" /*************************************************************************** @@ -29,7 +30,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_ARCADEBOARD = &device_creator; +const device_type A2BUS_ARCADEBOARD = device_creator; MACHINE_CONFIG_FRAGMENT( arcadeboard ) MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp index b1c97c08693..c20a2120b54 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; +const device_type A2BUS_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -121,7 +121,7 @@ void a2bus_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS = &device_creator; +const device_type A2BUS = device_creator; void a2bus_device::static_set_cputag(device_t &device, const char *tag) { diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index e8f6cb5087d..b3fb2d51fd7 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; -const device_type A2BUS_CFFA2_6502 = &device_creator; +const device_type A2BUS_CFFA2 = device_creator; +const device_type A2BUS_CFFA2_6502 = device_creator; #define CFFA2_ROM_REGION "cffa2_rom" #define CFFA2_ATA_TAG "cffa2_ata" diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp index bcb4a554d02..7c399b215f4 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; +const device_type A2BUS_CORVUS = device_creator; #define CORVUS_ROM_REGION "corvus_rom" #define CORVUS_HD_TAG "corvushd" diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp index fa89dfc228e..a32ec42430b 100644 --- a/src/devices/bus/a2bus/a2diskii.cpp +++ b/src/devices/bus/a2bus/a2diskii.cpp @@ -23,8 +23,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_DISKII = &device_creator; -const device_type A2BUS_IWM_FDC = &device_creator; +const device_type A2BUS_DISKII = device_creator; +const device_type A2BUS_IWM_FDC = device_creator; #define DISKII_ROM_REGION "diskii_rom" #define FDC_TAG "diskii_fdc" diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp index 749bd0000c0..a1ebc3fb3c1 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; +const device_type A2BUS_DISKIING = device_creator; #define WOZFDC_TAG "wozfdc" #define DISKII_ROM_REGION "diskii_rom" diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp index 76629c1b9f0..16b68bb2e81 100644 --- a/src/devices/bus/a2bus/a2dx1.cpp +++ b/src/devices/bus/a2bus/a2dx1.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "a2dx1.h" #include "sound/volt_reg.h" +#include "speaker.h" /*************************************************************************** PARAMETERS @@ -20,7 +21,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_DX1 = &device_creator; +const device_type A2BUS_DX1 = device_creator; MACHINE_CONFIG_FRAGMENT( a2dx1 ) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp index e8588f31260..8fc2f7a8137 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; +const device_type A2EAUXSLOT_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -61,7 +61,7 @@ void a2eauxslot_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type A2EAUXSLOT = &device_creator; +const device_type A2EAUXSLOT = device_creator; void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag) { diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index 698138dff84..3803af3fce4 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "a2echoii.h" #include "sound/tms5220.h" +#include "speaker.h" /*************************************************************************** PARAMETERS @@ -20,7 +21,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_ECHOII = &device_creator; +const device_type A2BUS_ECHOII = device_creator; #define TMS_TAG "tms5220" diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp index bd975354314..d7732804f58 100644 --- a/src/devices/bus/a2bus/a2eext80col.cpp +++ b/src/devices/bus/a2bus/a2eext80col.cpp @@ -20,7 +20,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2EAUX_EXT80COL = &device_creator; +const device_type A2EAUX_EXT80COL = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp index e832bb53123..587165e81e4 100644 --- a/src/devices/bus/a2bus/a2eramworks3.cpp +++ b/src/devices/bus/a2bus/a2eramworks3.cpp @@ -21,7 +21,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2EAUX_RAMWORKS3 = &device_creator; +const device_type A2EAUX_RAMWORKS3 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp index 28a669ffd20..a32b6750c77 100644 --- a/src/devices/bus/a2bus/a2estd80col.cpp +++ b/src/devices/bus/a2bus/a2estd80col.cpp @@ -20,7 +20,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2EAUX_STD80COL = &device_creator; +const device_type A2EAUX_STD80COL = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index 166a436b1a1..7584c73d836 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; +const device_type A2BUS_HSSCSI = device_creator; #define SCSI_ROM_REGION "scsi_rom" #define SCSI_BUS_TAG "scsibus" diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index 5eb27c226da..891bc51c0a0 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "a2mcms.h" +#include "speaker.h" // the actual sound device (a slot device can't currently also be a sound device so we keep this private here) enum @@ -22,7 +23,7 @@ enum }; -const device_type MCMS = &device_creator; +const device_type MCMS = device_creator; /*************************************************************************** PARAMETERS @@ -32,8 +33,8 @@ const device_type MCMS = &device_creator; // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_MCMS1 = &device_creator; -const device_type A2BUS_MCMS2 = &device_creator; +const device_type A2BUS_MCMS1 = device_creator; +const device_type A2BUS_MCMS2 = device_creator; #define ENGINE_TAG "engine" diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index 32ac041e397..ebd2bb4dc9a 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; -const device_type A2BUS_RAMFACTOR = &device_creator; +const device_type A2BUS_MEMEXP = device_creator; +const device_type A2BUS_RAMFACTOR = device_creator; #define MEMEXP_ROM_REGION "memexp_rom" diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp index d4cd774255f..f8a9df64e8d 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; +const device_type A2BUS_MIDI = device_creator; #define MIDI_PTM_TAG "midi_ptm" #define MIDI_ACIA_TAG "midi_acia" diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index 565f1a472f7..98c33c6fd09 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "a2mockingboard.h" +#include "speaker.h" /*************************************************************************** @@ -29,9 +30,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_MOCKINGBOARD = &device_creator; -const device_type A2BUS_PHASOR = &device_creator; -const device_type A2BUS_ECHOPLUS = &device_creator; +const device_type A2BUS_MOCKINGBOARD = device_creator; +const device_type A2BUS_PHASOR = device_creator; +const device_type A2BUS_ECHOPLUS = device_creator; MACHINE_CONFIG_FRAGMENT( mockingboard ) MCFG_DEVICE_ADD(VIA1_TAG, VIA6522, 1022727) diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index 0ae18d51d8f..d05842a7269 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; +const device_type A2BUS_PIC = device_creator; #define PIC_ROM_REGION "pic_rom" #define PIC_CENTRONICS_TAG "pic_ctx" diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp index 971a398ed8d..322be844267 100644 --- a/src/devices/bus/a2bus/a2sam.cpp +++ b/src/devices/bus/a2bus/a2sam.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "a2sam.h" #include "sound/volt_reg.h" +#include "speaker.h" /*************************************************************************** PARAMETERS @@ -20,7 +21,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_SAM = &device_creator; +const device_type A2BUS_SAM = device_creator; MACHINE_CONFIG_FRAGMENT( a2sam ) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index 1cc446936bb..00e0c27bb11 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; +const device_type A2BUS_SCSI = device_creator; #define SCSI_ROM_REGION "scsi_rom" #define SCSI_BUS_TAG "scsibus" diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp index 620d836587f..3051755dc0f 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; +const device_type A2BUS_SOFTCARD = device_creator; #define Z80_TAG "z80" diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index fe6557e9cf1..aa8f28f48be 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; +const device_type A2BUS_SSC = device_creator; #define SSC_ROM_REGION "ssc_rom" #define SSC_ACIA_TAG "ssc_acia" diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp index ec6ef5af5f7..8ccdf8bb928 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; +const device_type A2BUS_SWYFT = device_creator; #define SWYFT_ROM_REGION "swyft_rom" diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp index 9f28491d7e4..dd935cf2554 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; +const device_type A2BUS_THEMILL = device_creator; #define M6809_TAG "m6809" diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index 8de8b73d67f..18a6f22abf1 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; +const device_type A2BUS_THUNDERCLOCK = device_creator; #define THUNDERCLOCK_ROM_REGION "thunclk_rom" #define THUNDERCLOCK_UPD1990_TAG "thunclk_upd" diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp index 763f816a756..3edeeaf8cdd 100644 --- a/src/devices/bus/a2bus/a2ultraterm.cpp +++ b/src/devices/bus/a2bus/a2ultraterm.cpp @@ -29,6 +29,7 @@ #include "emu.h" #include "a2ultraterm.h" +#include "screen.h" /*************************************************************************** @@ -39,8 +40,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_ULTRATERM = &device_creator; -const device_type A2BUS_ULTRATERMENH = &device_creator; +const device_type A2BUS_ULTRATERM = device_creator; +const device_type A2BUS_ULTRATERMENH = device_creator; #define ULTRATERM_ROM_REGION "uterm_rom" #define ULTRATERM_GFX_REGION "uterm_gfx" diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index 01850c1b4bb..1cfb4552313 100644 --- a/src/devices/bus/a2bus/a2videoterm.cpp +++ b/src/devices/bus/a2bus/a2videoterm.cpp @@ -25,6 +25,7 @@ #include "emu.h" #include "a2videoterm.h" +#include "screen.h" /*************************************************************************** @@ -35,12 +36,12 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_VIDEOTERM = &device_creator; -const device_type A2BUS_IBSAP16 = &device_creator; -const device_type A2BUS_IBSAP16ALT = &device_creator; -const device_type A2BUS_VTC1 = &device_creator; -const device_type A2BUS_VTC2 = &device_creator; -const device_type A2BUS_AEVIEWMASTER80 = &device_creator; +const device_type A2BUS_VIDEOTERM = device_creator; +const device_type A2BUS_IBSAP16 = device_creator; +const device_type A2BUS_IBSAP16ALT = device_creator; +const device_type A2BUS_VTC1 = device_creator; +const device_type A2BUS_VTC2 = device_creator; +const device_type A2BUS_AEVIEWMASTER80 = device_creator; #define VIDEOTERM_ROM_REGION "vterm_rom" #define VIDEOTERM_GFX_REGION "vterm_gfx" diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp index b7f9aa896b9..cefc12850bc 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; -const device_type A2BUS_VULCANGOLD = &device_creator; +const device_type A2BUS_VULCAN = device_creator; +const device_type A2BUS_VULCANGOLD = device_creator; #define VULCAN_ROM_REGION "vulcan_rom" #define VULCAN_ATA_TAG "vulcan_ata" diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp index cc95c8dd1d5..a3220476cda 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; +const device_type A2BUS_ZIPDRIVE = device_creator; #define ZIPDRIVE_ROM_REGION "zipdrive_rom" #define ZIPDRIVE_ATA_TAG "zipdrive_ata" diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index 2c1d7667a57..e6badc3238a 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; +const device_type A2BUS_CORVFDC01 = device_creator; #define FDC01_ROM_REGION "fdc01_rom" #define FDC01_FDC_TAG "fdc01_fdc" diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index bac61d8d249..a65726629cb 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; +const device_type A2BUS_CORVFDC02 = device_creator; #define FDC02_ROM_REGION "fdc02_rom" #define FDC02_FDC_TAG "fdc02_fdc" diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp index e8dc74df028..82b403d251a 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; -const device_type A2BUS_EZCGI_9938 = &device_creator; -const device_type A2BUS_EZCGI_9958 = &device_creator; +const device_type A2BUS_EZCGI = device_creator; +const device_type A2BUS_EZCGI_9938 = device_creator; +const device_type A2BUS_EZCGI_9958 = device_creator; MACHINE_CONFIG_FRAGMENT( ezcgi ) MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp index 781e55c76fd..4cfe11e52ec 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; +const device_type A2BUS_LASER128 = device_creator; MACHINE_CONFIG_FRAGMENT( a2laser128 ) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index 003b783a6df..c332fce3d65 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; +const device_type A2BUS_MOUSE = device_creator; static MACHINE_CONFIG_FRAGMENT( mouse ) MCFG_CPU_ADD(MOUSE_MCU_TAG, M68705P3, 2043600) diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index 38927016f72..d7fda07f316 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -79,6 +79,7 @@ #include "emu.h" #include "pc_xporter.h" +#include "speaker.h" /*************************************************************************** PARAMETERS @@ -88,7 +89,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_PCXPORTER = &device_creator; +const device_type A2BUS_PCXPORTER = device_creator; static ADDRESS_MAP_START( pc_map, AS_PROGRAM, 16, a2bus_pcxporter_device ) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h index 39932634d88..49221a28ce9 100644 --- a/src/devices/bus/a2bus/pc_xporter.h +++ b/src/devices/bus/a2bus/pc_xporter.h @@ -21,7 +21,7 @@ #include "bus/pc_kbd/pc_kbdc.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp index 1fabbc1c51e..6697c6ac9ab 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; +const device_type A2BUS_RAMCARD128K = device_creator; /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp index ef2108ed14e..22978a214af 100644 --- a/src/devices/bus/a2bus/ramcard16k.cpp +++ b/src/devices/bus/a2bus/ramcard16k.cpp @@ -19,7 +19,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_RAMCARD16K = &device_creator; +const device_type A2BUS_RAMCARD16K = device_creator; /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 7790744a2b0..7eee31eb768 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -46,7 +46,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A2BUS_TIMEMASTERHO = &device_creator; +const device_type A2BUS_TIMEMASTERHO = device_creator; #define TIMEMASTER_ROM_REGION "timemst_rom" #define TIMEMASTER_PIA_TAG "timemst_pia" diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp index c4c50f8972a..7cf7765a273 100644 --- a/src/devices/bus/a7800/a78_slot.cpp +++ b/src/devices/bus/a7800/a78_slot.cpp @@ -33,7 +33,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A78_CART_SLOT = &device_creator; +const device_type A78_CART_SLOT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 6d044bcc13c..cc63d13b9c8 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -28,16 +28,17 @@ #include "emu.h" #include "cpuwiz.h" +#include "speaker.h" //------------------------------------------------- // constructor //------------------------------------------------- -const device_type A78_ROM_VERSABOARD = &device_creator; -const device_type A78_ROM_MEGACART = &device_creator; +const device_type A78_ROM_VERSABOARD = device_creator; +const device_type A78_ROM_MEGACART = device_creator; -const device_type A78_ROM_P450_VB = &device_creator; +const device_type A78_ROM_P450_VB = device_creator; a78_versaboard_device::a78_versaboard_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) diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp index 381e6475d30..e78147c2f46 100644 --- a/src/devices/bus/a7800/hiscore.cpp +++ b/src/devices/bus/a7800/hiscore.cpp @@ -17,7 +17,7 @@ // constructor //------------------------------------------------- -const device_type A78_HISCORE = &device_creator; +const device_type A78_HISCORE = device_creator; a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index b55445aa691..8604ddf92f5 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -20,27 +20,28 @@ #include "emu.h" #include "rom.h" +#include "speaker.h" //------------------------------------------------- // constructor //------------------------------------------------- -const device_type A78_ROM = &device_creator; -const device_type A78_ROM_SG = &device_creator; -const device_type A78_ROM_POKEY = &device_creator; -const device_type A78_ROM_SG_POKEY = &device_creator; -const device_type A78_ROM_SG_RAM = &device_creator; -const device_type A78_ROM_SG9 = &device_creator; -const device_type A78_ROM_MRAM = &device_creator; -const device_type A78_ROM_ABSOLUTE = &device_creator; -const device_type A78_ROM_ACTIVISION = &device_creator; - - -const device_type A78_ROM_P450 = &device_creator; -const device_type A78_ROM_P450_POKEY = &device_creator; -const device_type A78_ROM_P450_SG_RAM = &device_creator; -const device_type A78_ROM_P450_SG9 = &device_creator; +const device_type A78_ROM = device_creator; +const device_type A78_ROM_SG = device_creator; +const device_type A78_ROM_POKEY = device_creator; +const device_type A78_ROM_SG_POKEY = device_creator; +const device_type A78_ROM_SG_RAM = device_creator; +const device_type A78_ROM_SG9 = device_creator; +const device_type A78_ROM_MRAM = device_creator; +const device_type A78_ROM_ABSOLUTE = device_creator; +const device_type A78_ROM_ACTIVISION = device_creator; + + +const device_type A78_ROM_P450 = device_creator; +const device_type A78_ROM_P450_POKEY = device_creator; +const device_type A78_ROM_P450_SG_RAM = device_creator; +const device_type A78_ROM_P450_SG9 = device_creator; a78_rom_device::a78_rom_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) diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index 422cd0a740e..5e3737aee61 100644 --- a/src/devices/bus/a7800/xboard.cpp +++ b/src/devices/bus/a7800/xboard.cpp @@ -46,14 +46,15 @@ #include "emu.h" #include "xboard.h" #include "a78_carts.h" +#include "speaker.h" //------------------------------------------------- // constructor //------------------------------------------------- -const device_type A78_XBOARD = &device_creator; -const device_type A78_XM = &device_creator; +const device_type A78_XBOARD = device_creator; +const device_type A78_XM = device_creator; a78_xboard_device::a78_xboard_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) diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp index f8bcc0d877f..ee0ca68d790 100644 --- a/src/devices/bus/a800/a800_slot.cpp +++ b/src/devices/bus/a800/a800_slot.cpp @@ -29,9 +29,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A800_CART_SLOT = &device_creator; -const device_type A5200_CART_SLOT = &device_creator; -const device_type XEGS_CART_SLOT = &device_creator; +const device_type A800_CART_SLOT = device_creator; +const device_type A5200_CART_SLOT = device_creator; +const device_type XEGS_CART_SLOT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp index d6c8dbe7e3f..403ea833bb0 100644 --- a/src/devices/bus/a800/a8sio.cpp +++ b/src/devices/bus/a800/a8sio.cpp @@ -39,7 +39,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type A8SIO_SLOT = &device_creator; +const device_type A8SIO_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -87,7 +87,7 @@ void a8sio_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type A8SIO = &device_creator; +const device_type A8SIO = device_creator; //************************************************************************** diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index 7ff511bd0d7..bb35bea187a 100644 --- a/src/devices/bus/a800/cassette.cpp +++ b/src/devices/bus/a800/cassette.cpp @@ -25,7 +25,7 @@ TODO: // GLOBAL VARIABLES //************************************************************************** -const device_type A8SIO_CASSETTE = &device_creator; +const device_type A8SIO_CASSETTE = device_creator; const device_timer_id TIMER_CASSETTE_READ = 1; static MACHINE_CONFIG_FRAGMENT( cassette ) diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp index 2e2af58c0f0..6d0977cfdd3 100644 --- a/src/devices/bus/a800/oss.cpp +++ b/src/devices/bus/a800/oss.cpp @@ -15,10 +15,10 @@ // constructor //------------------------------------------------- -const device_type A800_ROM_OSS8K = &device_creator; -const device_type A800_ROM_OSS34 = &device_creator; -const device_type A800_ROM_OSS43 = &device_creator; -const device_type A800_ROM_OSS91 = &device_creator; +const device_type A800_ROM_OSS8K = device_creator; +const device_type A800_ROM_OSS34 = device_creator; +const device_type A800_ROM_OSS43 = device_creator; +const device_type A800_ROM_OSS91 = device_creator; a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp index a3625fa754c..ff7730ecae9 100644 --- a/src/devices/bus/a800/rom.cpp +++ b/src/devices/bus/a800/rom.cpp @@ -18,16 +18,16 @@ // constructor //------------------------------------------------- -const device_type A800_ROM = &device_creator; -const device_type A800_ROM_BBSB = &device_creator; -const device_type A800_ROM_WILLIAMS = &device_creator; -const device_type A800_ROM_EXPRESS = &device_creator; -const device_type A800_ROM_TURBO = &device_creator; -const device_type A800_ROM_TELELINK2 = &device_creator; -const device_type A800_ROM_MICROCALC = &device_creator; -const device_type XEGS_ROM = &device_creator; -const device_type A5200_ROM_2CHIPS = &device_creator; -const device_type A5200_ROM_BBSB = &device_creator; +const device_type A800_ROM = device_creator; +const device_type A800_ROM_BBSB = device_creator; +const device_type A800_ROM_WILLIAMS = device_creator; +const device_type A800_ROM_EXPRESS = device_creator; +const device_type A800_ROM_TURBO = device_creator; +const device_type A800_ROM_TELELINK2 = device_creator; +const device_type A800_ROM_MICROCALC = device_creator; +const device_type XEGS_ROM = device_creator; +const device_type A5200_ROM_2CHIPS = device_creator; +const device_type A5200_ROM_BBSB = device_creator; a800_rom_device::a800_rom_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) diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp index 55639200485..b02443d6aed 100644 --- a/src/devices/bus/a800/sparta.cpp +++ b/src/devices/bus/a800/sparta.cpp @@ -15,7 +15,7 @@ // constructor //------------------------------------------------- -const device_type A800_ROM_SPARTADOS = &device_creator; +const device_type A800_ROM_SPARTADOS = device_creator; a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp index b4338853270..3cb4d468ba9 100644 --- a/src/devices/bus/abcbus/abc890.cpp +++ b/src/devices/bus/abcbus/abc890.cpp @@ -15,12 +15,12 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC890 = &device_creator; -const device_type ABC_EXPANSION_UNIT = &device_creator; -const device_type ABC894 = &device_creator; -const device_type ABC850 = &device_creator; -const device_type ABC852 = &device_creator; -const device_type ABC856 = &device_creator; +const device_type ABC890 = device_creator; +const device_type ABC_EXPANSION_UNIT = device_creator; +const device_type ABC894 = device_creator; +const device_type ABC850 = device_creator; +const device_type ABC852 = device_creator; +const device_type ABC856 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp index 9487730474f..855a52824d9 100644 --- a/src/devices/bus/abcbus/abcbus.cpp +++ b/src/devices/bus/abcbus/abcbus.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type ABCBUS_SLOT = &device_creator; +const device_type ABCBUS_SLOT = device_creator; diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h index eb6379703e0..021c1427fd5 100644 --- a/src/devices/bus/abcbus/abcbus.h +++ b/src/devices/bus/abcbus/abcbus.h @@ -95,10 +95,10 @@ **********************************************************************/ -#pragma once +#ifndef MAME_DEVICES_ABCBUS_ABCBUS_H +#define MAME_DEVICES_ABCBUS_ABCBUS_H -#ifndef __ABCBUS__ -#define __ABCBUS__ +#pragma once @@ -310,9 +310,9 @@ SLOT_INTERFACE_EXTERN( abcbus_cards ); SLOT_INTERFACE_EXTERN( abc1600bus_cards ); -typedef device_type_iterator<&device_creator, abcbus_slot_t> abcbus_slot_device_iterator; +typedef device_type_iterator abcbus_slot_device_iterator; -#endif +#endif // MAME_DEVICES_ABCBUS_ABCBUS_H diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index d57a1c1c53f..9f2688149e8 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -55,7 +55,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC_FD2 = &device_creator; +const device_type ABC_FD2 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp index 7029c2b4a8e..9e69ced4ad3 100644 --- a/src/devices/bus/abcbus/hdc.cpp +++ b/src/devices/bus/abcbus/hdc.cpp @@ -24,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC_HDC = &device_creator; +const device_type ABC_HDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index a48236e727b..42960d2e918 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -139,7 +139,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type LUXOR_55_10828 = &device_creator; +const device_type LUXOR_55_10828 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 3df7402180a..588cf8b77df 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -94,12 +94,12 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type LUXOR_55_21046 = &device_creator; -const device_type ABC830 = &device_creator; -const device_type ABC832 = &device_creator; -const device_type ABC834 = &device_creator; -const device_type ABC838 = &device_creator; -const device_type ABC850_FLOPPY = &device_creator; +const device_type LUXOR_55_21046 = device_creator; +const device_type ABC830 = device_creator; +const device_type ABC832 = device_creator; +const device_type ABC834 = device_creator; +const device_type ABC838 = device_creator; +const device_type ABC850_FLOPPY = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index 9095f29332c..1cebd0f9258 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -94,7 +94,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type LUXOR_55_21056 = &device_creator; +const device_type LUXOR_55_21056 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index 2798607dfcc..4ffdf711756 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type LUXOR_4105 = &device_creator; +const device_type LUXOR_4105 = device_creator; WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy ) diff --git a/src/devices/bus/abcbus/memcard.cpp b/src/devices/bus/abcbus/memcard.cpp index ba22a8e1a62..32ac9a9cf42 100644 --- a/src/devices/bus/abcbus/memcard.cpp +++ b/src/devices/bus/abcbus/memcard.cpp @@ -63,7 +63,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC_MEMORY_CARD = &device_creator; +const device_type ABC_MEMORY_CARD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/ram.cpp b/src/devices/bus/abcbus/ram.cpp index 5df5c00bd5f..07739a75f40 100644 --- a/src/devices/bus/abcbus/ram.cpp +++ b/src/devices/bus/abcbus/ram.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC80_16KB_RAM_CARD = &device_creator; +const device_type ABC80_16KB_RAM_CARD = device_creator; diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp index 8342283445f..e99d51f61a6 100644 --- a/src/devices/bus/abcbus/sio.cpp +++ b/src/devices/bus/abcbus/sio.cpp @@ -48,7 +48,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC_SIO = &device_creator; +const device_type ABC_SIO = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/slutprov.cpp b/src/devices/bus/abcbus/slutprov.cpp index b13dce4bcc9..9dead4049f3 100644 --- a/src/devices/bus/abcbus/slutprov.cpp +++ b/src/devices/bus/abcbus/slutprov.cpp @@ -9,7 +9,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC_SLUTPROV = &device_creator; +const device_type ABC_SLUTPROV = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/turbo.cpp b/src/devices/bus/abcbus/turbo.cpp index 760cdf6aaa4..d552f8e40e9 100644 --- a/src/devices/bus/abcbus/turbo.cpp +++ b/src/devices/bus/abcbus/turbo.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TURBO_KONTROLLER = &device_creator; +const device_type TURBO_KONTROLLER = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abcbus/uni800.cpp b/src/devices/bus/abcbus/uni800.cpp index fc6e36b66e3..5bdc0e68661 100644 --- a/src/devices/bus/abcbus/uni800.cpp +++ b/src/devices/bus/abcbus/uni800.cpp @@ -40,7 +40,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC_UNI800 = &device_creator; +const device_type ABC_UNI800 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index 7a29e4035bc..f81542c8b94 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -43,6 +43,7 @@ Notes: #include "emu.h" #include "abc77.h" +#include "speaker.h" @@ -59,8 +60,8 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC77 = &device_creator; -const device_type ABC55 = &device_creator; +const device_type ABC77 = device_creator; +const device_type ABC55 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index fc2972a7adf..8776885cad0 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -6,16 +6,17 @@ *********************************************************************/ +#ifndef MAME_BUS_ABCKB_ABC77_H +#define MAME_BUS_ABCKB_ABC77_H + #pragma once -#ifndef __ABC77__ -#define __ABC77__ +#include "abckb.h" #include "cpu/mcs48/mcs48.h" #include "machine/watchdog.h" -#include "abckb.h" #include "sound/discrete.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" @@ -102,5 +103,4 @@ extern const device_type ABC77; extern const device_type ABC55; - -#endif +#endif // MAME_BUS_ABCKB_ABC77_H diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index f0b4a215c7e..7a8a07162d9 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -85,7 +85,7 @@ XR22-050-3B Pinout // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC800_KEYBOARD = &device_creator; +const device_type ABC800_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index 488194fd452..299f3f63d6a 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -54,6 +54,7 @@ Notes: #include "emu.h" #include "abc99.h" +#include "speaker.h" @@ -70,7 +71,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC99 = &device_creator; +const device_type ABC99 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h index 631194a83e7..c9278fe8acc 100644 --- a/src/devices/bus/abckb/abc99.h +++ b/src/devices/bus/abckb/abc99.h @@ -6,14 +6,15 @@ *********************************************************************/ +#ifndef MAME_BUS_ABCKB_ABC99_H +#define MAME_BUS_ABCKB_ABC99_H + #pragma once -#ifndef __ABC99__ -#define __ABC99__ +#include "abckb.h" #include "cpu/mcs48/mcs48.h" -#include "abckb.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" @@ -109,5 +110,4 @@ private: extern const device_type ABC99; - -#endif +#endif // MAME_BUS_ABCKB_ABC99_H diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp index 4c03c430df2..fd0478f54ef 100644 --- a/src/devices/bus/abckb/abckb.cpp +++ b/src/devices/bus/abckb/abckb.cpp @@ -16,7 +16,7 @@ //************************************************************************** // device type definition -const device_type ABC_KEYBOARD_PORT = &device_creator; +const device_type ABC_KEYBOARD_PORT = device_creator; diff --git a/src/devices/bus/adam/adamlink.cpp b/src/devices/bus/adam/adamlink.cpp index c9b810e2494..d4144d430e6 100644 --- a/src/devices/bus/adam/adamlink.cpp +++ b/src/devices/bus/adam/adamlink.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAMLINK = &device_creator; +const device_type ADAMLINK = device_creator; diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp index 2e58564fcd0..5d9d8dbd4b3 100644 --- a/src/devices/bus/adam/exp.cpp +++ b/src/devices/bus/adam/exp.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_EXPANSION_SLOT = &device_creator; +const device_type ADAM_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp index 68d7477cc6d..b49777663c4 100644 --- a/src/devices/bus/adam/ide.cpp +++ b/src/devices/bus/adam/ide.cpp @@ -35,7 +35,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_IDE = &device_creator; +const device_type ADAM_IDE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/adam/ram.cpp b/src/devices/bus/adam/ram.cpp index 8922b441a42..5f627cd46fc 100644 --- a/src/devices/bus/adam/ram.cpp +++ b/src/devices/bus/adam/ram.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_RAM = &device_creator; +const device_type ADAM_RAM = device_creator; diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp index c153a826f67..17a38148196 100644 --- a/src/devices/bus/adamnet/adamnet.cpp +++ b/src/devices/bus/adamnet/adamnet.cpp @@ -15,8 +15,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type ADAMNET = &device_creator; -const device_type ADAMNET_SLOT = &device_creator; +const device_type ADAMNET = device_creator; +const device_type ADAMNET_SLOT = device_creator; diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp index 27cb93de3e1..27bc97b3816 100644 --- a/src/devices/bus/adamnet/ddp.cpp +++ b/src/devices/bus/adamnet/ddp.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_DDP = &device_creator; +const device_type ADAM_DDP = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp index 776e431a51e..c2cf39ec7f7 100644 --- a/src/devices/bus/adamnet/fdc.cpp +++ b/src/devices/bus/adamnet/fdc.cpp @@ -34,7 +34,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_FDC = &device_creator; +const device_type ADAM_FDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp index 867b68f6394..2f52e88a700 100644 --- a/src/devices/bus/adamnet/kb.cpp +++ b/src/devices/bus/adamnet/kb.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_KB = &device_creator; +const device_type ADAM_KB = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp index 55ff7d8155e..6c2a609c1e5 100644 --- a/src/devices/bus/adamnet/printer.cpp +++ b/src/devices/bus/adamnet/printer.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_PRN = &device_creator; +const device_type ADAM_PRN = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp index d9b1278db6f..1fe2fbaf6cf 100644 --- a/src/devices/bus/adamnet/spi.cpp +++ b/src/devices/bus/adamnet/spi.cpp @@ -26,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ADAM_SPI = &device_creator; +const device_type ADAM_SPI = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp index c9588ca0a8a..3b0278c62cf 100644 --- a/src/devices/bus/amiga/keyboard/a1200.cpp +++ b/src/devices/bus/amiga/keyboard/a1200.cpp @@ -23,7 +23,7 @@ // GLOBAL VARIABLES //************************************************************************** -device_type const A1200_KBD = &device_creator; +device_type const A1200_KBD = device_creator; diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp index 266728e6b5e..1ee353763dd 100644 --- a/src/devices/bus/amiga/keyboard/a500.cpp +++ b/src/devices/bus/amiga/keyboard/a500.cpp @@ -20,16 +20,16 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type A500_KBD_US = &device_creator; -const device_type A500_KBD_DE = &device_creator; -const device_type A500_KBD_FR = &device_creator; -const device_type A500_KBD_IT = &device_creator; -const device_type A500_KBD_SE = &device_creator; -const device_type A500_KBD_ES = &device_creator; -const device_type A500_KBD_DK = &device_creator; -const device_type A500_KBD_CH = &device_creator; -const device_type A500_KBD_NO = &device_creator; -const device_type A500_KBD_GB = &device_creator; +const device_type A500_KBD_US = device_creator; +const device_type A500_KBD_DE = device_creator; +const device_type A500_KBD_FR = device_creator; +const device_type A500_KBD_IT = device_creator; +const device_type A500_KBD_SE = device_creator; +const device_type A500_KBD_ES = device_creator; +const device_type A500_KBD_DK = device_creator; +const device_type A500_KBD_CH = device_creator; +const device_type A500_KBD_NO = device_creator; +const device_type A500_KBD_GB = device_creator; namespace bus { namespace amiga { namespace keyboard { diff --git a/src/devices/bus/amiga/keyboard/keyboard.cpp b/src/devices/bus/amiga/keyboard/keyboard.cpp index 1c1d037e227..169fbb05448 100644 --- a/src/devices/bus/amiga/keyboard/keyboard.cpp +++ b/src/devices/bus/amiga/keyboard/keyboard.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type AMIGA_KEYBOARD_INTERFACE = &device_creator; +const device_type AMIGA_KEYBOARD_INTERFACE = device_creator; //************************************************************************** diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp index 5a02f8e70dd..d0f777b333b 100644 --- a/src/devices/bus/amiga/zorro/a2052.cpp +++ b/src/devices/bus/amiga/zorro/a2052.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type A2052 = &device_creator; +const device_type A2052 = device_creator; //------------------------------------------------- // input_ports - device-specific input ports diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index 2a70ed54d4d..19a8140f609 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -24,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type A2232 = &device_creator; +const device_type A2232 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp index 81b6ae79e6e..09c9a3cf73d 100644 --- a/src/devices/bus/amiga/zorro/a590.cpp +++ b/src/devices/bus/amiga/zorro/a590.cpp @@ -18,8 +18,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type A590 = &device_creator; -const device_type A2091 = &device_creator; +const device_type A590 = device_creator; +const device_type A2091 = device_creator; //------------------------------------------------- // input_ports - device-specific input ports diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp index 708101014d9..498f2516f9c 100644 --- a/src/devices/bus/amiga/zorro/action_replay.cpp +++ b/src/devices/bus/amiga/zorro/action_replay.cpp @@ -22,9 +22,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ACTION_REPLAY_MK1 = &device_creator; -const device_type ACTION_REPLAY_MK2 = &device_creator; -const device_type ACTION_REPLAY_MK3 = &device_creator; +const device_type ACTION_REPLAY_MK1 = device_creator; +const device_type ACTION_REPLAY_MK2 = device_creator; +const device_type ACTION_REPLAY_MK3 = device_creator; //------------------------------------------------- // input_ports - device-specific input ports diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp index 2162a2d914e..cc363a00d5d 100644 --- a/src/devices/bus/amiga/zorro/buddha.cpp +++ b/src/devices/bus/amiga/zorro/buddha.cpp @@ -36,7 +36,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BUDDHA = &device_creator; +const device_type BUDDHA = device_creator; //------------------------------------------------- // mmio_map - device-specific memory mapped I/O diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp index f83ee8f194f..180f6091157 100644 --- a/src/devices/bus/amiga/zorro/zorro.cpp +++ b/src/devices/bus/amiga/zorro/zorro.cpp @@ -16,7 +16,7 @@ // ZORRO SLOT DEVICE //************************************************************************** -const device_type ZORRO_SLOT = &device_creator; +const device_type ZORRO_SLOT = device_creator; //------------------------------------------------- // zorro_slot_device - constructor @@ -115,7 +115,7 @@ WRITE_LINE_MEMBER( zorro_device::int6_w ) { m_int6_handler(state); } // EXPANSION SLOT DEVICE //************************************************************************** -const device_type EXP_SLOT = &device_creator; +const device_type EXP_SLOT = device_creator; //------------------------------------------------- // exp_slot_device - constructor @@ -181,7 +181,7 @@ void exp_slot_device::fc_w(int code) { if (m_dev) m_dev->fc_w(code); } // ZORRO2 DEVICE //************************************************************************** -const device_type ZORRO2 = &device_creator; +const device_type ZORRO2 = device_creator; //------------------------------------------------- // zorro2_device - constructor diff --git a/src/devices/bus/apf/rom.cpp b/src/devices/bus/apf/rom.cpp index 041bdad74b3..616d4d42146 100644 --- a/src/devices/bus/apf/rom.cpp +++ b/src/devices/bus/apf/rom.cpp @@ -17,9 +17,9 @@ // apf_rom_device - constructor //------------------------------------------------- -const device_type APF_ROM_STD = &device_creator; -const device_type APF_ROM_BASIC = &device_creator; -const device_type APF_ROM_SPACEDST = &device_creator; +const device_type APF_ROM_STD = device_creator; +const device_type APF_ROM_BASIC = device_creator; +const device_type APF_ROM_SPACEDST = device_creator; apf_rom_device::apf_rom_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) diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp index afe50d8a9b5..fb62fcf51d3 100644 --- a/src/devices/bus/apf/slot.cpp +++ b/src/devices/bus/apf/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type APF_CART_SLOT = &device_creator; +const device_type APF_CART_SLOT = device_creator; //************************************************************************** // APF Cartridges Interface diff --git a/src/devices/bus/apricot/expansion/expansion.cpp b/src/devices/bus/apricot/expansion/expansion.cpp index f35fefd7ff4..8f99831b482 100644 --- a/src/devices/bus/apricot/expansion/expansion.cpp +++ b/src/devices/bus/apricot/expansion/expansion.cpp @@ -14,7 +14,7 @@ // EXPANSION SLOT DEVICE //************************************************************************** -const device_type APRICOT_EXPANSION_SLOT = &device_creator; +const device_type APRICOT_EXPANSION_SLOT = device_creator; //------------------------------------------------- // apricot_expansion_slot_device - constructor @@ -53,7 +53,7 @@ void apricot_expansion_slot_device::device_start() // EXPANSION BUS DEVICE //************************************************************************** -const device_type APRICOT_EXPANSION_BUS = &device_creator; +const device_type APRICOT_EXPANSION_BUS = device_creator; //------------------------------------------------- // apricot_expansion_bus_device - constructor diff --git a/src/devices/bus/apricot/expansion/ram.cpp b/src/devices/bus/apricot/expansion/ram.cpp index 04477437269..46a5bee1543 100644 --- a/src/devices/bus/apricot/expansion/ram.cpp +++ b/src/devices/bus/apricot/expansion/ram.cpp @@ -14,9 +14,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type APRICOT_256K_RAM = &device_creator; -const device_type APRICOT_128K_RAM = &device_creator; -const device_type APRICOT_512K_RAM = &device_creator; +const device_type APRICOT_256K_RAM = device_creator; +const device_type APRICOT_128K_RAM = device_creator; +const device_type APRICOT_512K_RAM = device_creator; //************************************************************************** diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp index 198d19f0e49..7fef733b134 100644 --- a/src/devices/bus/apricot/keyboard/hle.cpp +++ b/src/devices/bus/apricot/keyboard/hle.cpp @@ -58,7 +58,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type APRICOT_KEYBOARD_HLE = &device_creator; +const device_type APRICOT_KEYBOARD_HLE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/apricot/keyboard/keyboard.cpp b/src/devices/bus/apricot/keyboard/keyboard.cpp index e2cf48601a3..e406c0c4cd5 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.cpp +++ b/src/devices/bus/apricot/keyboard/keyboard.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator; +const device_type APRICOT_KEYBOARD_INTERFACE = device_creator; //************************************************************************** diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp index 8009b229a68..73640851160 100644 --- a/src/devices/bus/arcadia/rom.cpp +++ b/src/devices/bus/arcadia/rom.cpp @@ -18,8 +18,8 @@ // arcadia_rom_device - constructor //------------------------------------------------- -const device_type ARCADIA_ROM_STD = &device_creator; -const device_type ARCADIA_ROM_GOLF = &device_creator; +const device_type ARCADIA_ROM_STD = device_creator; +const device_type ARCADIA_ROM_GOLF = device_creator; arcadia_rom_device::arcadia_rom_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) diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp index f40788240ef..e4cc9b38851 100644 --- a/src/devices/bus/arcadia/slot.cpp +++ b/src/devices/bus/arcadia/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type EA2001_CART_SLOT = &device_creator; +const device_type EA2001_CART_SLOT = device_creator; //************************************************************************** // ARCADIA Cartridges Interface diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp index cf57dcee23d..3e67050ddc2 100644 --- a/src/devices/bus/astrocde/exp.cpp +++ b/src/devices/bus/astrocde/exp.cpp @@ -14,7 +14,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type ASTROCADE_EXP_SLOT = &device_creator; +const device_type ASTROCADE_EXP_SLOT = device_creator; device_astrocade_card_interface::device_astrocade_card_interface(const machine_config &mconfig, device_t &device) diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp index d10b006c224..89d16e6de77 100644 --- a/src/devices/bus/astrocde/ram.cpp +++ b/src/devices/bus/astrocde/ram.cpp @@ -60,12 +60,12 @@ // astrocade_rom_device - constructor //------------------------------------------------- -const device_type ASTROCADE_BLUERAM_4K = &device_creator; -const device_type ASTROCADE_BLUERAM_16K = &device_creator; -const device_type ASTROCADE_BLUERAM_32K = &device_creator; -const device_type ASTROCADE_VIPER_SYS1 = &device_creator; -const device_type ASTROCADE_WHITERAM = &device_creator; -const device_type ASTROCADE_RL64RAM = &device_creator; +const device_type ASTROCADE_BLUERAM_4K = device_creator; +const device_type ASTROCADE_BLUERAM_16K = device_creator; +const device_type ASTROCADE_BLUERAM_32K = device_creator; +const device_type ASTROCADE_VIPER_SYS1 = device_creator; +const device_type ASTROCADE_WHITERAM = device_creator; +const device_type ASTROCADE_RL64RAM = device_creator; astrocade_blueram_4k_device::astrocade_blueram_4k_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) diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp index 335b45338ea..c5edddd7d3a 100644 --- a/src/devices/bus/astrocde/rom.cpp +++ b/src/devices/bus/astrocde/rom.cpp @@ -17,9 +17,9 @@ // astrocade_rom_device - constructor //------------------------------------------------- -const device_type ASTROCADE_ROM_STD = &device_creator; -const device_type ASTROCADE_ROM_256K = &device_creator; -const device_type ASTROCADE_ROM_512K = &device_creator; +const device_type ASTROCADE_ROM_STD = device_creator; +const device_type ASTROCADE_ROM_256K = device_creator; +const device_type ASTROCADE_ROM_512K = device_creator; astrocade_rom_device::astrocade_rom_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) diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp index 294b7d0a2be..b1e9840c7c1 100644 --- a/src/devices/bus/astrocde/slot.cpp +++ b/src/devices/bus/astrocde/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type ASTROCADE_CART_SLOT = &device_creator; +const device_type ASTROCADE_CART_SLOT = device_creator; //************************************************************************** // Astrocade Cartridges Interface diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp index d791aeb9f87..273025a5ce9 100644 --- a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp +++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_1MHZBUS_SLOT = &device_creator; +const device_type BBC_1MHZBUS_SLOT = device_creator; diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp index 406ce778fc8..ca748a4763f 100644 --- a/src/devices/bus/bbc/1mhzbus/opus3.cpp +++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp @@ -45,7 +45,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_OPUS3 = &device_creator; +const device_type BBC_OPUS3 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/bbc/analogue/analogue.cpp b/src/devices/bus/bbc/analogue/analogue.cpp index 1177fbd37a7..726f869771c 100644 --- a/src/devices/bus/bbc/analogue/analogue.cpp +++ b/src/devices/bus/bbc/analogue/analogue.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_ANALOGUE_SLOT = &device_creator; +const device_type BBC_ANALOGUE_SLOT = device_creator; diff --git a/src/devices/bus/bbc/analogue/joystick.cpp b/src/devices/bus/bbc/analogue/joystick.cpp index 4be67fd84a6..8c6aa767af6 100644 --- a/src/devices/bus/bbc/analogue/joystick.cpp +++ b/src/devices/bus/bbc/analogue/joystick.cpp @@ -18,8 +18,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_ACORNJOY = &device_creator; -const device_type BBC_VOLTMACE3B = &device_creator; +const device_type BBC_ACORNJOY = device_creator; +const device_type BBC_VOLTMACE3B = device_creator; static INPUT_PORTS_START( acornjoy ) diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp index 92840858374..45a13a5dc18 100644 --- a/src/devices/bus/bbc/fdc/acorn.cpp +++ b/src/devices/bus/bbc/fdc/acorn.cpp @@ -15,8 +15,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_ACORN8271 = &device_creator; -const device_type BBC_ACORN1770 = &device_creator; +const device_type BBC_ACORN8271 = device_creator; +const device_type BBC_ACORN1770 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp index c5bd476e2c1..ca36e75a2da 100644 --- a/src/devices/bus/bbc/fdc/cumana.cpp +++ b/src/devices/bus/bbc/fdc/cumana.cpp @@ -17,8 +17,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_CUMANA1 = &device_creator; -const device_type BBC_CUMANA2 = &device_creator; +const device_type BBC_CUMANA1 = device_creator; +const device_type BBC_CUMANA2 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/bbc/fdc/fdc.cpp b/src/devices/bus/bbc/fdc/fdc.cpp index cd262df345c..58bbfc416e3 100644 --- a/src/devices/bus/bbc/fdc/fdc.cpp +++ b/src/devices/bus/bbc/fdc/fdc.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_FDC_SLOT = &device_creator; +const device_type BBC_FDC_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp index 3e8f1bd9496..ccc75650925 100644 --- a/src/devices/bus/bbc/fdc/opus.cpp +++ b/src/devices/bus/bbc/fdc/opus.cpp @@ -20,9 +20,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_OPUS2791 = &device_creator; -const device_type BBC_OPUS2793 = &device_creator; -const device_type BBC_OPUS1770 = &device_creator; +const device_type BBC_OPUS2791 = device_creator; +const device_type BBC_OPUS2793 = device_creator; +const device_type BBC_OPUS1770 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp index 38dc71049bf..158e7c9a9c3 100644 --- a/src/devices/bus/bbc/fdc/watford.cpp +++ b/src/devices/bus/bbc/fdc/watford.cpp @@ -19,8 +19,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_WEDDB2 = &device_creator; -const device_type BBC_WEDDB3 = &device_creator; +const device_type BBC_WEDDB2 = device_creator; +const device_type BBC_WEDDB3 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/bbc/joyport/joyport.cpp b/src/devices/bus/bbc/joyport/joyport.cpp index 5af727eb4f1..872aa0cb5f0 100644 --- a/src/devices/bus/bbc/joyport/joyport.cpp +++ b/src/devices/bus/bbc/joyport/joyport.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_JOYPORT_SLOT = &device_creator; +const device_type BBC_JOYPORT_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/bbc/joyport/joystick.cpp b/src/devices/bus/bbc/joyport/joystick.cpp index e6c4b22b401..d4eecd8acaf 100644 --- a/src/devices/bus/bbc/joyport/joystick.cpp +++ b/src/devices/bus/bbc/joyport/joystick.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBCMC_JOYSTICK = &device_creator; +const device_type BBCMC_JOYSTICK = device_creator; static INPUT_PORTS_START( joystick ) diff --git a/src/devices/bus/bbc/tube/tube.cpp b/src/devices/bus/bbc/tube/tube.cpp index c242c5a8d69..694cecfc2f3 100644 --- a/src/devices/bus/bbc/tube/tube.cpp +++ b/src/devices/bus/bbc/tube/tube.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_TUBE_SLOT = &device_creator; +const device_type BBC_TUBE_SLOT = device_creator; diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp index f466c84a395..ed6858a20a6 100644 --- a/src/devices/bus/bbc/userport/userport.cpp +++ b/src/devices/bus/bbc/userport/userport.cpp @@ -14,7 +14,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type BBC_USERPORT_SLOT = &device_creator; +const device_type BBC_USERPORT_SLOT = device_creator; diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp index 200d1fc63b5..8bbc443672a 100644 --- a/src/devices/bus/bml3/bml3bus.cpp +++ b/src/devices/bus/bml3/bml3bus.cpp @@ -50,7 +50,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type BML3BUS_SLOT = &device_creator; +const device_type BML3BUS_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -93,7 +93,7 @@ void bml3bus_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type BML3BUS = &device_creator; +const device_type BML3BUS = device_creator; void bml3bus_device::static_set_cputag(device_t &device, const char *tag) { diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp index b426dc664da..753b0665f19 100644 --- a/src/devices/bus/bml3/bml3kanji.cpp +++ b/src/devices/bus/bml3/bml3kanji.cpp @@ -20,7 +20,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type BML3BUS_KANJI = &device_creator; +const device_type BML3BUS_KANJI = device_creator; #define KANJI_ROM_REGION "kanji_rom" diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index 595d3b97a9f..201e28b87fc 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -21,7 +21,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type BML3BUS_MP1802 = &device_creator; +const device_type BML3BUS_MP1802 = device_creator; static SLOT_INTERFACE_START( mp1802_floppies ) SLOT_INTERFACE("dd", FLOPPY_525_DD) diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp index b4358c60fe7..dc8b9e58551 100644 --- a/src/devices/bus/bml3/bml3mp1805.cpp +++ b/src/devices/bus/bml3/bml3mp1805.cpp @@ -21,7 +21,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type BML3BUS_MP1805 = &device_creator; +const device_type BML3BUS_MP1805 = device_creator; static const floppy_interface bml3_mp1805_floppy_interface = { diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp index 826380110cb..4002d5df709 100644 --- a/src/devices/bus/bw2/exp.cpp +++ b/src/devices/bus/bw2/exp.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type BW2_EXPANSION_SLOT = &device_creator; +const device_type BW2_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/bw2/ramcard.cpp b/src/devices/bus/bw2/ramcard.cpp index a40a238edbb..6e66de49933 100644 --- a/src/devices/bus/bw2/ramcard.cpp +++ b/src/devices/bus/bw2/ramcard.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BW2_RAMCARD = &device_creator; +const device_type BW2_RAMCARD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp index 87c5580f56d..4c5520950ce 100644 --- a/src/devices/bus/c64/16kb.cpp +++ b/src/devices/bus/c64/16kb.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_16KB = &device_creator; +const device_type C64_16KB = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/4dxh.cpp b/src/devices/bus/c64/4dxh.cpp index 9328f853637..3cd731215fd 100644 --- a/src/devices/bus/c64/4dxh.cpp +++ b/src/devices/bus/c64/4dxh.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_4DXH = &device_creator; +const device_type C64_4DXH = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/4ksa.cpp b/src/devices/bus/c64/4ksa.cpp index a7ca6ac6f4c..a3f47f48405 100644 --- a/src/devices/bus/c64/4ksa.cpp +++ b/src/devices/bus/c64/4ksa.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_4KSA = &device_creator; +const device_type C64_4KSA = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/4tba.cpp b/src/devices/bus/c64/4tba.cpp index 3d140deb696..7f4adc76bce 100644 --- a/src/devices/bus/c64/4tba.cpp +++ b/src/devices/bus/c64/4tba.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_4TBA = &device_creator; +const device_type C64_4TBA = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp index 852e7d4860f..bd3fc5a270b 100644 --- a/src/devices/bus/c64/bn1541.cpp +++ b/src/devices/bus/c64/bn1541.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_BN1541 = &device_creator; +const device_type C64_BN1541 = device_creator; diff --git a/src/devices/bus/c64/c128_comal80.cpp b/src/devices/bus/c64/c128_comal80.cpp index 6085a6e9166..9f0e8a03954 100644 --- a/src/devices/bus/c64/c128_comal80.cpp +++ b/src/devices/bus/c64/c128_comal80.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C128_COMAL80 = &device_creator; +const device_type C128_COMAL80 = device_creator; diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp index 18fce1fbbaa..3be09f7f258 100644 --- a/src/devices/bus/c64/c128_partner.cpp +++ b/src/devices/bus/c64/c128_partner.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C128_PARTNER = &device_creator; +const device_type C128_PARTNER = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp index 47647290949..f3421510012 100644 --- a/src/devices/bus/c64/comal80.cpp +++ b/src/devices/bus/c64/comal80.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_COMAL80 = &device_creator; +const device_type C64_COMAL80 = device_creator; diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp index 0da1f1e2813..8544938255a 100644 --- a/src/devices/bus/c64/cpm.cpp +++ b/src/devices/bus/c64/cpm.cpp @@ -33,7 +33,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_CPM = &device_creator; +const device_type C64_CPM = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp index a92877bc196..8acdd0c8498 100644 --- a/src/devices/bus/c64/currah_speech.cpp +++ b/src/devices/bus/c64/currah_speech.cpp @@ -69,6 +69,7 @@ Notes: #include "emu.h" #include "currah_speech.h" +#include "speaker.h" @@ -84,7 +85,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_CURRAH_SPEECH = &device_creator; +const device_type C64_CURRAH_SPEECH = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp index a4ce5b8df79..2dd9c890d44 100644 --- a/src/devices/bus/c64/dela_ep256.cpp +++ b/src/devices/bus/c64/dela_ep256.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_DELA_EP256 = &device_creator; +const device_type C64_DELA_EP256 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp index 3a70145d609..65c371a1f8f 100644 --- a/src/devices/bus/c64/dela_ep64.cpp +++ b/src/devices/bus/c64/dela_ep64.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_DELA_EP64 = &device_creator; +const device_type C64_DELA_EP64 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp index 3c6012b57af..eae8c4ae34b 100644 --- a/src/devices/bus/c64/dela_ep7x8.cpp +++ b/src/devices/bus/c64/dela_ep7x8.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_DELA_EP7X8 = &device_creator; +const device_type C64_DELA_EP7X8 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp index 3cebd073deb..ada3ca405ee 100644 --- a/src/devices/bus/c64/dinamic.cpp +++ b/src/devices/bus/c64/dinamic.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_DINAMIC = &device_creator; +const device_type C64_DINAMIC = device_creator; diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp index ab49e6106f2..31458acb9a2 100644 --- a/src/devices/bus/c64/dqbb.cpp +++ b/src/devices/bus/c64/dqbb.cpp @@ -24,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_DQBB = &device_creator; +const device_type C64_DQBB = device_creator; diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp index ad197f6daff..dd24e20d013 100644 --- a/src/devices/bus/c64/easy_calc_result.cpp +++ b/src/devices/bus/c64/easy_calc_result.cpp @@ -36,7 +36,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_EASY_CALC_RESULT = &device_creator; +const device_type C64_EASY_CALC_RESULT = device_creator; diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp index 7e247f9c4b3..edc7c4c3cff 100644 --- a/src/devices/bus/c64/easyflash.cpp +++ b/src/devices/bus/c64/easyflash.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_EASYFLASH = &device_creator; +const device_type C64_EASYFLASH = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp index 7bb627120ac..75e4f7e2a35 100644 --- a/src/devices/bus/c64/epyx_fast_load.cpp +++ b/src/devices/bus/c64/epyx_fast_load.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_EPYX_FAST_LOAD = &device_creator; +const device_type C64_EPYX_FAST_LOAD = device_creator; diff --git a/src/devices/bus/c64/exos.cpp b/src/devices/bus/c64/exos.cpp index b769f06a106..5c2d51d864a 100644 --- a/src/devices/bus/c64/exos.cpp +++ b/src/devices/bus/c64/exos.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_EXOS = &device_creator; +const device_type C64_EXOS = device_creator; diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp index 3d4159b10af..96718ceefc7 100644 --- a/src/devices/bus/c64/exp.cpp +++ b/src/devices/bus/c64/exp.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_EXPANSION_SLOT = &device_creator; +const device_type C64_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp index 890c2ecfd5f..8bd0986ff04 100644 --- a/src/devices/bus/c64/fcc.cpp +++ b/src/devices/bus/c64/fcc.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_FCC = &device_creator; +const device_type C64_FCC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp index 07c85db5b62..0c756ddecbd 100644 --- a/src/devices/bus/c64/final.cpp +++ b/src/devices/bus/c64/final.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_FINAL = &device_creator; +const device_type C64_FINAL = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp index 12c68483d1b..4226cb981c8 100644 --- a/src/devices/bus/c64/final3.cpp +++ b/src/devices/bus/c64/final3.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_FINAL3 = &device_creator; +const device_type C64_FINAL3 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp index 02abc5c909f..c675ae763de 100644 --- a/src/devices/bus/c64/fun_play.cpp +++ b/src/devices/bus/c64/fun_play.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_FUN_PLAY = &device_creator; +const device_type C64_FUN_PLAY = device_creator; diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp index 2827ecc3585..7640251306f 100644 --- a/src/devices/bus/c64/geocable.cpp +++ b/src/devices/bus/c64/geocable.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_GEOCABLE = &device_creator; +const device_type C64_GEOCABLE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp index e06ef40bcf3..c68efcc2a80 100644 --- a/src/devices/bus/c64/georam.cpp +++ b/src/devices/bus/c64/georam.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_GEORAM = &device_creator; +const device_type C64_GEORAM = device_creator; diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp index 5139b0bf31f..cd49717a148 100644 --- a/src/devices/bus/c64/ide64.cpp +++ b/src/devices/bus/c64/ide64.cpp @@ -39,7 +39,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_IDE64 = &device_creator; +const device_type C64_IDE64 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp index 547e3a8787a..8e57f6ef007 100644 --- a/src/devices/bus/c64/ieee488.cpp +++ b/src/devices/bus/c64/ieee488.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_IEEE488 = &device_creator; +const device_type C64_IEEE488 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/kingsoft.cpp b/src/devices/bus/c64/kingsoft.cpp index 4a6d001d384..6716028f634 100644 --- a/src/devices/bus/c64/kingsoft.cpp +++ b/src/devices/bus/c64/kingsoft.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_KINGSOFT = &device_creator; +const device_type C64_KINGSOFT = device_creator; diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp index b4069b1fa31..ff16f80ee4f 100644 --- a/src/devices/bus/c64/mach5.cpp +++ b/src/devices/bus/c64/mach5.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MACH5 = &device_creator; +const device_type C64_MACH5 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp index 3de61c7507c..a1ad9614530 100644 --- a/src/devices/bus/c64/magic_desk.cpp +++ b/src/devices/bus/c64/magic_desk.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MAGIC_DESK = &device_creator; +const device_type C64_MAGIC_DESK = device_creator; diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp index 9e22f899caf..0812e2aaeba 100644 --- a/src/devices/bus/c64/magic_formel.cpp +++ b/src/devices/bus/c64/magic_formel.cpp @@ -31,7 +31,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MAGIC_FORMEL = &device_creator; +const device_type C64_MAGIC_FORMEL = device_creator; WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pa_w ) diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index 8f46919561d..b973f87a0c4 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -41,6 +41,7 @@ http://www.stefan-uhlmann.de/cbm/MVM/index.html #include "emu.h" #include "magic_voice.h" +#include "speaker.h" @@ -65,7 +66,7 @@ http://www.stefan-uhlmann.de/cbm/MVM/index.html // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MAGIC_VOICE = &device_creator; +const device_type C64_MAGIC_VOICE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp index 84bd4b89b3c..092c0ff76db 100644 --- a/src/devices/bus/c64/midi_maplin.cpp +++ b/src/devices/bus/c64/midi_maplin.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MIDI_MAPLIN = &device_creator; +const device_type C64_MIDI_MAPLIN = device_creator; WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::acia_irq_w ) diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp index 65863317a84..6ef20e74b41 100644 --- a/src/devices/bus/c64/midi_namesoft.cpp +++ b/src/devices/bus/c64/midi_namesoft.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MIDI_NAMESOFT = &device_creator; +const device_type C64_MIDI_NAMESOFT = device_creator; WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::acia_irq_w ) diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp index 01cb4ce0e63..4c229129112 100644 --- a/src/devices/bus/c64/midi_passport.cpp +++ b/src/devices/bus/c64/midi_passport.cpp @@ -26,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MIDI_PASSPORT = &device_creator; +const device_type C64_MIDI_PASSPORT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp index 33846c6d5b6..120dd875be4 100644 --- a/src/devices/bus/c64/midi_sci.cpp +++ b/src/devices/bus/c64/midi_sci.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MIDI_SCI = &device_creator; +const device_type C64_MIDI_SCI = device_creator; WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::acia_irq_w ) diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp index ff5bf42e0ad..cb1b4e1a9c1 100644 --- a/src/devices/bus/c64/midi_siel.cpp +++ b/src/devices/bus/c64/midi_siel.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MIDI_SIEL = &device_creator; +const device_type C64_MIDI_SIEL = device_creator; WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::acia_irq_w ) diff --git a/src/devices/bus/c64/mikro_assembler.cpp b/src/devices/bus/c64/mikro_assembler.cpp index e5ac7c004fb..18f7bcd2772 100644 --- a/src/devices/bus/c64/mikro_assembler.cpp +++ b/src/devices/bus/c64/mikro_assembler.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MIKRO_ASSEMBLER = &device_creator; +const device_type C64_MIKRO_ASSEMBLER = device_creator; diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp index 7434dc425e2..37c077a1606 100644 --- a/src/devices/bus/c64/multiscreen.cpp +++ b/src/devices/bus/c64/multiscreen.cpp @@ -78,7 +78,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MULTISCREEN = &device_creator; +const device_type C64_MULTISCREEN = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp index 98039ff46d7..3c886b60935 100644 --- a/src/devices/bus/c64/music64.cpp +++ b/src/devices/bus/c64/music64.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_MUSIC64 = &device_creator; +const device_type C64_MUSIC64 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp index 7ff3a4d182d..f0686a9f077 100644 --- a/src/devices/bus/c64/neoram.cpp +++ b/src/devices/bus/c64/neoram.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_NEORAM = &device_creator; +const device_type C64_NEORAM = device_creator; diff --git a/src/devices/bus/c64/ocean.cpp b/src/devices/bus/c64/ocean.cpp index 8b792422283..a6d3d17cc1b 100644 --- a/src/devices/bus/c64/ocean.cpp +++ b/src/devices/bus/c64/ocean.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_OCEAN = &device_creator; +const device_type C64_OCEAN = device_creator; diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp index e3a890df6a1..837e3ada595 100644 --- a/src/devices/bus/c64/pagefox.cpp +++ b/src/devices/bus/c64/pagefox.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_PAGEFOX = &device_creator; +const device_type C64_PAGEFOX = device_creator; diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp index b7b9875a9ee..b431bc02b94 100644 --- a/src/devices/bus/c64/partner.cpp +++ b/src/devices/bus/c64/partner.cpp @@ -36,7 +36,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_PARTNER = &device_creator; +const device_type C64_PARTNER = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/prophet64.cpp b/src/devices/bus/c64/prophet64.cpp index bd9cf55b123..3a02de50eba 100644 --- a/src/devices/bus/c64/prophet64.cpp +++ b/src/devices/bus/c64/prophet64.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_PROPHET64 = &device_creator; +const device_type C64_PROPHET64 = device_creator; diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp index 7fa0f361687..f12ef27280f 100644 --- a/src/devices/bus/c64/ps64.cpp +++ b/src/devices/bus/c64/ps64.cpp @@ -57,7 +57,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_PS64 = &device_creator; +const device_type C64_PS64 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp index 777336aa030..415bc8510db 100644 --- a/src/devices/bus/c64/reu.cpp +++ b/src/devices/bus/c64/reu.cpp @@ -22,9 +22,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_REU1700 = &device_creator; -const device_type C64_REU1750 = &device_creator; -const device_type C64_REU1764 = &device_creator; +const device_type C64_REU1700 = device_creator; +const device_type C64_REU1750 = device_creator; +const device_type C64_REU1764 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp index 81612627e03..08b357dbc41 100644 --- a/src/devices/bus/c64/rex.cpp +++ b/src/devices/bus/c64/rex.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_REX = &device_creator; +const device_type C64_REX = device_creator; diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp index 0ccfd9fb3c8..7c93751ea10 100644 --- a/src/devices/bus/c64/rex_ep256.cpp +++ b/src/devices/bus/c64/rex_ep256.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_REX_EP256 = &device_creator; +const device_type C64_REX_EP256 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp index fb5bde6f5cc..add7f50bbe2 100644 --- a/src/devices/bus/c64/ross.cpp +++ b/src/devices/bus/c64/ross.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_ROSS = &device_creator; +const device_type C64_ROSS = device_creator; diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp index 50b80fefd8f..b77dff2d61d 100644 --- a/src/devices/bus/c64/sfx_sound_expander.cpp +++ b/src/devices/bus/c64/sfx_sound_expander.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "sfx_sound_expander.h" +#include "speaker.h" @@ -23,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SFX_SOUND_EXPANDER = &device_creator; +const device_type C64_SFX_SOUND_EXPANDER = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp index 8907aa2f9b5..d780445f714 100644 --- a/src/devices/bus/c64/silverrock.cpp +++ b/src/devices/bus/c64/silverrock.cpp @@ -48,7 +48,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SILVERROCK = &device_creator; +const device_type C64_SILVERROCK = device_creator; diff --git a/src/devices/bus/c64/simons_basic.cpp b/src/devices/bus/c64/simons_basic.cpp index f7980d91221..5ced074bc7c 100644 --- a/src/devices/bus/c64/simons_basic.cpp +++ b/src/devices/bus/c64/simons_basic.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SIMONS_BASIC = &device_creator; +const device_type C64_SIMONS_BASIC = device_creator; diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp index 3a2d770eedd..41060e9b3bd 100644 --- a/src/devices/bus/c64/speakeasy.cpp +++ b/src/devices/bus/c64/speakeasy.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "speakeasy.h" +#include "speaker.h" @@ -23,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SPEAKEASY = &device_creator; +const device_type C64_SPEAKEASY = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/stardos.cpp b/src/devices/bus/c64/stardos.cpp index 9e258fdc73e..945d089f15d 100644 --- a/src/devices/bus/c64/stardos.cpp +++ b/src/devices/bus/c64/stardos.cpp @@ -44,7 +44,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_STARDOS = &device_creator; +const device_type C64_STARDOS = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/std.cpp b/src/devices/bus/c64/std.cpp index 045f8909eec..2b75507d9b6 100644 --- a/src/devices/bus/c64/std.cpp +++ b/src/devices/bus/c64/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_STD = &device_creator; +const device_type C64_STD = device_creator; diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp index 7d7597a763f..9e5580545df 100644 --- a/src/devices/bus/c64/structured_basic.cpp +++ b/src/devices/bus/c64/structured_basic.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_STRUCTURED_BASIC = &device_creator; +const device_type C64_STRUCTURED_BASIC = device_creator; diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp index 7dc5218b313..d535d1d066e 100644 --- a/src/devices/bus/c64/super_explode.cpp +++ b/src/devices/bus/c64/super_explode.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SUPER_EXPLODE = &device_creator; +const device_type C64_SUPER_EXPLODE = device_creator; diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp index 3ffadee981f..dde616c1719 100644 --- a/src/devices/bus/c64/super_games.cpp +++ b/src/devices/bus/c64/super_games.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SUPER_GAMES = &device_creator; +const device_type C64_SUPER_GAMES = device_creator; diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp index 80a2dea1bb3..256a184664b 100644 --- a/src/devices/bus/c64/supercpu.cpp +++ b/src/devices/bus/c64/supercpu.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SUPERCPU = &device_creator; +const device_type C64_SUPERCPU = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp index a8a57726e53..024d6c0145c 100644 --- a/src/devices/bus/c64/sw8k.cpp +++ b/src/devices/bus/c64/sw8k.cpp @@ -38,7 +38,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SW8K = &device_creator; +const device_type C64_SW8K = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp index 6a44246b6b0..eeaa9677568 100644 --- a/src/devices/bus/c64/swiftlink.cpp +++ b/src/devices/bus/c64/swiftlink.cpp @@ -31,7 +31,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SWIFTLINK = &device_creator; +const device_type C64_SWIFTLINK = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp index b27e62c2f11..c7a72e4d4a2 100644 --- a/src/devices/bus/c64/system3.cpp +++ b/src/devices/bus/c64/system3.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_SYSTEM3 = &device_creator; +const device_type C64_SYSTEM3 = device_creator; diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp index 0f53ad1e20e..276a1d8965e 100644 --- a/src/devices/bus/c64/tdos.cpp +++ b/src/devices/bus/c64/tdos.cpp @@ -146,7 +146,7 @@ BASIC commands (SYS 32768 to activate) // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_TDOS = &device_creator; +const device_type C64_TDOS = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp index a61c24044dc..524cb98a26e 100644 --- a/src/devices/bus/c64/turbo232.cpp +++ b/src/devices/bus/c64/turbo232.cpp @@ -30,7 +30,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_TURBO232 = &device_creator; +const device_type C64_TURBO232 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/vizastar.cpp b/src/devices/bus/c64/vizastar.cpp index e925760baad..bd16f5b70bb 100644 --- a/src/devices/bus/c64/vizastar.cpp +++ b/src/devices/bus/c64/vizastar.cpp @@ -47,7 +47,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_VIZASTAR = &device_creator; +const device_type C64_VIZASTAR = device_creator; diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp index ceab25e531a..794aa210a8f 100644 --- a/src/devices/bus/c64/vw64.cpp +++ b/src/devices/bus/c64/vw64.cpp @@ -55,7 +55,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_VW64 = &device_creator; +const device_type C64_VW64 = device_creator; diff --git a/src/devices/bus/c64/warp_speed.cpp b/src/devices/bus/c64/warp_speed.cpp index 8a56d562330..17ed11be1b3 100644 --- a/src/devices/bus/c64/warp_speed.cpp +++ b/src/devices/bus/c64/warp_speed.cpp @@ -49,7 +49,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_WARP_SPEED = &device_creator; +const device_type C64_WARP_SPEED = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/westermann.cpp b/src/devices/bus/c64/westermann.cpp index 5fdac6d6a5c..d977e493cb5 100644 --- a/src/devices/bus/c64/westermann.cpp +++ b/src/devices/bus/c64/westermann.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_WESTERMANN = &device_creator; +const device_type C64_WESTERMANN = device_creator; diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp index f90823869bb..ef2891c68f4 100644 --- a/src/devices/bus/c64/xl80.cpp +++ b/src/devices/bus/c64/xl80.cpp @@ -38,6 +38,7 @@ Notes: #include "emu.h" #include "xl80.h" +#include "screen.h" @@ -56,7 +57,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_XL80 = &device_creator; +const device_type C64_XL80 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp index 31005b9d73d..c6e5c1ef749 100644 --- a/src/devices/bus/c64/zaxxon.cpp +++ b/src/devices/bus/c64/zaxxon.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_ZAXXON = &device_creator; +const device_type C64_ZAXXON = device_creator; diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp index d250dd5d454..e9e94d272a5 100644 --- a/src/devices/bus/cbm2/24k.cpp +++ b/src/devices/bus/cbm2/24k.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CBM2_24K = &device_creator; +const device_type CBM2_24K = device_creator; diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp index 7230b218105..130a72c804a 100644 --- a/src/devices/bus/cbm2/exp.cpp +++ b/src/devices/bus/cbm2/exp.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CBM2_EXPANSION_SLOT = &device_creator; +const device_type CBM2_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp index 85183f05e6e..cc06bbb7f40 100644 --- a/src/devices/bus/cbm2/hrg.cpp +++ b/src/devices/bus/cbm2/hrg.cpp @@ -20,6 +20,7 @@ #include "emu.h" #include "hrg.h" +#include "screen.h" @@ -37,8 +38,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CBM2_HRG_A = &device_creator; -const device_type CBM2_HRG_B = &device_creator; +const device_type CBM2_HRG_A = device_creator; +const device_type CBM2_HRG_B = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp index b87d10851ce..d795fd8837a 100644 --- a/src/devices/bus/cbm2/std.cpp +++ b/src/devices/bus/cbm2/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CBM2_STD = &device_creator; +const device_type CBM2_STD = device_creator; diff --git a/src/devices/bus/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp index b8a976b9fd5..118b379abc8 100644 --- a/src/devices/bus/cbm2/user.cpp +++ b/src/devices/bus/cbm2/user.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CBM2_USER_PORT = &device_creator; +const device_type CBM2_USER_PORT = device_creator; diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index 003e1c0dec7..602d1f4b37e 100644 --- a/src/devices/bus/cbmiec/c1526.cpp +++ b/src/devices/bus/cbmiec/c1526.cpp @@ -23,9 +23,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C1526 = &device_creator; -const device_type MPS802 = &device_creator; -const device_type C4023 = &device_creator; +const device_type C1526 = device_creator; +const device_type MPS802 = device_creator; +const device_type C4023 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 03ca9e33bdf..9955cb5afeb 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -161,18 +161,18 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C1540 = &device_creator; -const device_type C1541 = &device_creator; -const device_type C1541C = &device_creator; -const device_type C1541II = &device_creator; -const device_type SX1541 = &device_creator; -const device_type FSD1 = &device_creator; -const device_type FSD2 = &device_creator; -const device_type CSD1 = &device_creator; -const device_type C1541_DOLPHIN_DOS = &device_creator; -const device_type C1541_PROFESSIONAL_DOS_V1 = &device_creator; -const device_type C1541_PROLOGIC_DOS_CLASSIC = &device_creator; -const device_type INDUS_GT = &device_creator; +const device_type C1540 = device_creator; +const device_type C1541 = device_creator; +const device_type C1541C = device_creator; +const device_type C1541II = device_creator; +const device_type SX1541 = device_creator; +const device_type FSD1 = device_creator; +const device_type FSD2 = device_creator; +const device_type CSD1 = device_creator; +const device_type C1541_DOLPHIN_DOS = device_creator; +const device_type C1541_PROFESSIONAL_DOS_V1 = device_creator; +const device_type C1541_PROLOGIC_DOS_CLASSIC = device_creator; +const device_type INDUS_GT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index edff95705c9..b1369d3cec9 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -44,10 +44,10 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C1570 = &device_creator; -const device_type C1571 = &device_creator; -const device_type C1571CR = &device_creator; -const device_type MINI_CHIEF = &device_creator; +const device_type C1570 = device_creator; +const device_type C1571 = device_creator; +const device_type C1571CR = device_creator; +const device_type MINI_CHIEF = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index 9e5d0998a99..eb48f99141d 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -33,8 +33,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C1563 = &device_creator; -const device_type C1581 = &device_creator; +const device_type C1563 = device_creator; +const device_type C1581 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp index 4ff95426802..0288aa2874f 100644 --- a/src/devices/bus/cbmiec/c64_nl10.cpp +++ b/src/devices/bus/cbmiec/c64_nl10.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_NL10_INTERFACE = &device_creator; +const device_type C64_NL10_INTERFACE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp index be5295577a9..67276583fae 100644 --- a/src/devices/bus/cbmiec/cbmiec.cpp +++ b/src/devices/bus/cbmiec/cbmiec.cpp @@ -209,8 +209,8 @@ static const char *const SIGNAL_NAME[] = { "SRQ", "ATN", "CLK", "DATA", "RESET" // DEVICE DEFINITIONS //************************************************************************** -const device_type CBM_IEC = &device_creator; -const device_type CBM_IEC_SLOT = &device_creator; +const device_type CBM_IEC = device_creator; +const device_type CBM_IEC_SLOT = device_creator; diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp index 2b47254d0ac..b554c9bda71 100644 --- a/src/devices/bus/cbmiec/cmdhd.cpp +++ b/src/devices/bus/cbmiec/cmdhd.cpp @@ -29,7 +29,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CMD_HD = &device_creator; +const device_type CMD_HD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp index 2dfb4430fd4..7eb12763ef9 100644 --- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp +++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type DIAG264_SERIAL_LOOPBACK = &device_creator; +const device_type DIAG264_SERIAL_LOOPBACK = device_creator; diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index 6a3c0075f9a..92164c9299e 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -39,8 +39,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type FD2000 = &device_creator; -const device_type FD4000 = &device_creator; +const device_type FD2000 = device_creator; +const device_type FD4000 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp index 6380622058d..796802ab95e 100644 --- a/src/devices/bus/cbmiec/interpod.cpp +++ b/src/devices/bus/cbmiec/interpod.cpp @@ -76,7 +76,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type INTERPOD = &device_creator; +const device_type INTERPOD = device_creator; diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp index 1d32117543b..d47cf61a0dc 100644 --- a/src/devices/bus/cbmiec/serialbox.cpp +++ b/src/devices/bus/cbmiec/serialbox.cpp @@ -32,7 +32,7 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type SERIAL_BOX = &device_creator; +const device_type SERIAL_BOX = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp index 005ef7ff337..77157cdea07 100644 --- a/src/devices/bus/cbmiec/vic1515.cpp +++ b/src/devices/bus/cbmiec/vic1515.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1515 = &device_creator; +const device_type VIC1515 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp index dc86dec9636..e2275224f1e 100644 --- a/src/devices/bus/cbmiec/vic1520.cpp +++ b/src/devices/bus/cbmiec/vic1520.cpp @@ -52,7 +52,7 @@ PD7 Y MOTOR COM D // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1520 = &device_creator; +const device_type VIC1520 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp index 6525e30c686..bdca08de3e6 100644 --- a/src/devices/bus/centronics/comxpl80.cpp +++ b/src/devices/bus/centronics/comxpl80.cpp @@ -31,7 +31,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_PL80 = &device_creator; +const device_type COMX_PL80 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp index b6f5b45fe69..1caea17daae 100644 --- a/src/devices/bus/centronics/covox.cpp +++ b/src/devices/bus/centronics/covox.cpp @@ -9,13 +9,14 @@ #include "emu.h" #include "covox.h" #include "sound/volt_reg.h" +#include "speaker.h" //************************************************************************** // COVOX DEVICE //************************************************************************** // device type definition -const device_type CENTRONICS_COVOX = &device_creator; +const device_type CENTRONICS_COVOX = device_creator; static MACHINE_CONFIG_FRAGMENT( covox ) /* sound hardware */ @@ -67,7 +68,7 @@ void centronics_covox_device::update_dac() //************************************************************************** // device type definition -const device_type CENTRONICS_COVOX_STEREO = &device_creator; +const device_type CENTRONICS_COVOX_STEREO = device_creator; static MACHINE_CONFIG_FRAGMENT( covox_stereo ) /* sound hardware */ diff --git a/src/devices/bus/centronics/ctronics.cpp b/src/devices/bus/centronics/ctronics.cpp index 211d5e34654..fd66f57d3ac 100644 --- a/src/devices/bus/centronics/ctronics.cpp +++ b/src/devices/bus/centronics/ctronics.cpp @@ -11,7 +11,7 @@ // class centronics_device -const device_type CENTRONICS = &device_creator; +const device_type CENTRONICS = device_creator; centronics_device::centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CENTRONICS, "Centronics", tag, owner, clock, "centronics", __FILE__), diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp index cea44838ecc..006fbb5068b 100644 --- a/src/devices/bus/centronics/digiblst.cpp +++ b/src/devices/bus/centronics/digiblst.cpp @@ -9,13 +9,14 @@ #include "emu.h" #include "digiblst.h" #include "sound/volt_reg.h" +#include "speaker.h" //************************************************************************** // COVOX DEVICE //************************************************************************** // device type definition -const device_type CENTRONICS_DIGIBLASTER = &device_creator; +const device_type CENTRONICS_DIGIBLASTER = device_creator; static MACHINE_CONFIG_FRAGMENT( digiblst ) /* sound hardware */ diff --git a/src/devices/bus/centronics/dsjoy.cpp b/src/devices/bus/centronics/dsjoy.cpp index b97125f48ed..7d1fa9dee78 100644 --- a/src/devices/bus/centronics/dsjoy.cpp +++ b/src/devices/bus/centronics/dsjoy.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "dsjoy.h" -const device_type DEMPA_SHINBUNSHA_JOYSTICK = &device_creator; +const device_type DEMPA_SHINBUNSHA_JOYSTICK = device_creator; dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DEMPA_SHINBUNSHA_JOYSTICK, "Dempa Shinbunsha Joystick", tag, owner, clock, "dempa_shinbunsha_joystick", __FILE__), diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index 2f7055b6a34..6c42844ca79 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -129,6 +129,7 @@ TODO: - The UPD7810 core is missing analog port emulation #include "emu.h" #include "epson_ex800.h" +#include "speaker.h" #include "ex800.lh" @@ -170,7 +171,7 @@ TODO: - The UPD7810 core is missing analog port emulation // DEVICE DEFINITIONS //************************************************************************** -const device_type EPSON_EX800 = &device_creator; +const device_type EPSON_EX800 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 0d043b46f09..7870d3c72da 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -16,6 +16,7 @@ #include "emu.h" #include "epson_lx800.h" +#include "speaker.h" #include "lx800.lh" @@ -24,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EPSON_LX800 = &device_creator; +const device_type EPSON_LX800 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index c4c00ebc8cf..65d423d49e0 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -28,6 +28,8 @@ #include "emu.h" #include "epson_lx810l.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" //extern const char layout_lx800[]; /* use layout from lx800 */ @@ -42,8 +44,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EPSON_LX810L = &device_creator; -const device_type EPSON_AP2000 = &device_creator; +const device_type EPSON_LX810L = device_creator; +const device_type EPSON_AP2000 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp index 0b06503bacd..1e0cbbc985a 100644 --- a/src/devices/bus/centronics/nec_p72.cpp +++ b/src/devices/bus/centronics/nec_p72.cpp @@ -9,7 +9,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEC_P72 = &device_creator; +const device_type NEC_P72 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp index 3306cbf2d46..318ac9bd597 100644 --- a/src/devices/bus/centronics/printer.cpp +++ b/src/devices/bus/centronics/printer.cpp @@ -8,7 +8,7 @@ //************************************************************************** // device type definition -const device_type CENTRONICS_PRINTER = &device_creator; +const device_type CENTRONICS_PRINTER = device_creator; static MACHINE_CONFIG_FRAGMENT( centronics_printer ) diff --git a/src/devices/bus/cgenie/expansion/expansion.cpp b/src/devices/bus/cgenie/expansion/expansion.cpp index fe4e2357db7..ab7e083b84b 100644 --- a/src/devices/bus/cgenie/expansion/expansion.cpp +++ b/src/devices/bus/cgenie/expansion/expansion.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EXPANSION_SLOT = &device_creator; +const device_type EXPANSION_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index d8c2664a254..74abf332b50 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -28,7 +28,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CGENIE_FDC = &device_creator; +const device_type CGENIE_FDC = device_creator; DEVICE_ADDRESS_MAP_START( mmio, 8, cgenie_fdc_device ) AM_RANGE(0xe0, 0xe3) AM_MIRROR(0x10) AM_READWRITE(irq_r, select_w) diff --git a/src/devices/bus/cgenie/parallel/joystick.cpp b/src/devices/bus/cgenie/parallel/joystick.cpp index bc9c3be5a73..2e54551959a 100644 --- a/src/devices/bus/cgenie/parallel/joystick.cpp +++ b/src/devices/bus/cgenie/parallel/joystick.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CGENIE_JOYSTICK = &device_creator; +const device_type CGENIE_JOYSTICK = device_creator; //------------------------------------------------- // input_ports - device-specific input ports diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp index 9237f976938..2f993298755 100644 --- a/src/devices/bus/cgenie/parallel/parallel.cpp +++ b/src/devices/bus/cgenie/parallel/parallel.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PARALLEL_SLOT = &device_creator; +const device_type PARALLEL_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp index ae26869a325..cd798e978d9 100644 --- a/src/devices/bus/cgenie/parallel/printer.cpp +++ b/src/devices/bus/cgenie/parallel/printer.cpp @@ -21,7 +21,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CGENIE_PRINTER = &device_creator; +const device_type CGENIE_PRINTER = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp index 9e2e0479e89..35e886aeb0d 100644 --- a/src/devices/bus/chanf/rom.cpp +++ b/src/devices/bus/chanf/rom.cpp @@ -23,12 +23,12 @@ // chanf_rom_device - constructor //------------------------------------------------- -const device_type CHANF_ROM_STD = &device_creator; -const device_type CHANF_ROM_MAZE = &device_creator; -const device_type CHANF_ROM_HANGMAN = &device_creator; -const device_type CHANF_ROM_CHESS = &device_creator; -const device_type CHANF_ROM_MULTI_OLD = &device_creator; -const device_type CHANF_ROM_MULTI_FINAL = &device_creator; +const device_type CHANF_ROM_STD = device_creator; +const device_type CHANF_ROM_MAZE = device_creator; +const device_type CHANF_ROM_HANGMAN = device_creator; +const device_type CHANF_ROM_CHESS = device_creator; +const device_type CHANF_ROM_MULTI_OLD = device_creator; +const device_type CHANF_ROM_MULTI_FINAL = device_creator; chanf_rom_device::chanf_rom_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) diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp index b2014db586e..a0be37a2fa5 100644 --- a/src/devices/bus/chanf/slot.cpp +++ b/src/devices/bus/chanf/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type CHANF_CART_SLOT = &device_creator; +const device_type CHANF_CART_SLOT = device_creator; //************************************************************************** // Channel F cartridges Interface diff --git a/src/devices/bus/coco/coco_232.cpp b/src/devices/bus/coco/coco_232.cpp index e6b005756bf..8973a36ccf6 100644 --- a/src/devices/bus/coco/coco_232.cpp +++ b/src/devices/bus/coco/coco_232.cpp @@ -31,7 +31,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type COCO_232 = &device_creator; +const device_type COCO_232 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp index 1d5322e1801..91fa892e950 100644 --- a/src/devices/bus/coco/coco_dwsock.cpp +++ b/src/devices/bus/coco/coco_dwsock.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COCO_DWSOCK = &device_creator; +const device_type COCO_DWSOCK = device_creator; //------------------------------------------------- // INPUT_PORTS( coco_drivewire ) diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h index eca128aa9c4..42978c56593 100644 --- a/src/devices/bus/coco/coco_dwsock.h +++ b/src/devices/bus/coco/coco_dwsock.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nathan Woods -#ifndef _DWSOCK_H_ -#define _DWSOCK_H_ +#ifndef MAME_DEVICES_BUS_COCO_DWSOCKH_H +#define MAME_DEVICES_BUS_COCO_DWSOCKH_H #include "osdcore.h" @@ -67,6 +67,6 @@ private: extern const device_type COCO_DWSOCK; // device iterator -typedef device_type_iterator<&device_creator, beckerport_device> beckerport_device_iterator; +typedef device_type_iterator beckerport_device_iterator; -#endif /* _DWSOCK_H_ */ +#endif // MAME_DEVICES_BUS_COCO_DWSOCKH_H diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 8846f386aef..1af110cacb2 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -428,7 +428,7 @@ namespace }; } -const device_type COCO_FDC = &device_creator; +const device_type COCO_FDC = device_creator; //************************************************************************** @@ -463,7 +463,7 @@ namespace }; }; -const device_type COCO_FDC_V11 = &device_creator; +const device_type COCO_FDC_V11 = device_creator; //************************************************************************** @@ -498,7 +498,7 @@ namespace }; }; -const device_type COCO3_HDB1 = &device_creator; +const device_type COCO3_HDB1 = device_creator; //************************************************************************** // CP400 FDC @@ -529,4 +529,4 @@ namespace }; }; -const device_type CP400_FDC = &device_creator; +const device_type CP400_FDC = device_creator; diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index dcfe5f062aa..70b663f3c6e 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -125,7 +125,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type COCO_MULTIPAK = &device_creator; +const device_type COCO_MULTIPAK = device_creator; diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp index 50503d592fa..1d3ee1c5a94 100644 --- a/src/devices/bus/coco/coco_orch90.cpp +++ b/src/devices/bus/coco/coco_orch90.cpp @@ -14,7 +14,10 @@ #include "emu.h" #include "coco_orch90.h" + #include "sound/volt_reg.h" +#include "speaker.h" + static MACHINE_CONFIG_FRAGMENT(coco_orch90) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -29,7 +32,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type COCO_ORCH90 = &device_creator; +const device_type COCO_ORCH90 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp index e3ba87bbbdb..873be31ca00 100644 --- a/src/devices/bus/coco/coco_pak.cpp +++ b/src/devices/bus/coco/coco_pak.cpp @@ -43,7 +43,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type COCO_PAK = &device_creator; +const device_type COCO_PAK = device_creator; //************************************************************************** // LIVE DEVICE @@ -138,7 +138,7 @@ uint8_t* coco_pak_device::get_cart_base() // GLOBAL VARIABLES //************************************************************************** -const device_type COCO_PAK_BANKED = &device_creator; +const device_type COCO_PAK_BANKED = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index 1d5c3b3fa2f..bb3c0e0b7ba 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -124,7 +124,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type COCO_T4426 = &device_creator; +const device_type COCO_T4426 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index d9c9db3aaee..9edc472b9bd 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -23,7 +23,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type COCOCART_SLOT = &device_creator; +const device_type COCOCART_SLOT = device_creator; diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp index f633d465f8c..b3b4c272e4e 100644 --- a/src/devices/bus/coco/dragon_fdc.cpp +++ b/src/devices/bus/coco/dragon_fdc.cpp @@ -297,7 +297,7 @@ namespace }; }; -const device_type DRAGON_FDC = &device_creator; +const device_type DRAGON_FDC = device_creator; //************************************************************************** @@ -329,4 +329,4 @@ namespace }; }; -const device_type SDTANDY_FDC = &device_creator; +const device_type SDTANDY_FDC = device_creator; diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp index f5df1198d57..6553f56b19a 100644 --- a/src/devices/bus/coleco/ctrl.cpp +++ b/src/devices/bus/coleco/ctrl.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITION //************************************************************************** -const device_type COLECOVISION_CONTROL_PORT = &device_creator; +const device_type COLECOVISION_CONTROL_PORT = device_creator; diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp index c70a4dabde1..4e5cc012456 100644 --- a/src/devices/bus/coleco/exp.cpp +++ b/src/devices/bus/coleco/exp.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COLECOVISION_CARTRIDGE_SLOT = &device_creator; +const device_type COLECOVISION_CARTRIDGE_SLOT = device_creator; diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp index aa08ab18735..9e9f7610dd4 100644 --- a/src/devices/bus/coleco/hand.cpp +++ b/src/devices/bus/coleco/hand.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COLECO_HAND_CONTROLLER = &device_creator; +const device_type COLECO_HAND_CONTROLLER = device_creator; CUSTOM_INPUT_MEMBER( coleco_hand_controller_t::keypad_r ) diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp index 2c1725fd507..28835f7ad85 100644 --- a/src/devices/bus/coleco/sac.cpp +++ b/src/devices/bus/coleco/sac.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COLECO_SUPER_ACTION_CONTROLLER = &device_creator; +const device_type COLECO_SUPER_ACTION_CONTROLLER = device_creator; CUSTOM_INPUT_MEMBER( coleco_super_action_controller_t::keypad_r ) diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp index e588a71f2ee..d6ba16eafa5 100644 --- a/src/devices/bus/coleco/std.cpp +++ b/src/devices/bus/coleco/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COLECOVISION_STANDARD = &device_creator; +const device_type COLECOVISION_STANDARD = device_creator; diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp index 62000ebd5a1..d7de9dde30c 100644 --- a/src/devices/bus/coleco/xin1.cpp +++ b/src/devices/bus/coleco/xin1.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COLECOVISION_XIN1 = &device_creator; +const device_type COLECOVISION_XIN1 = device_creator; diff --git a/src/devices/bus/compis/graphics.cpp b/src/devices/bus/compis/graphics.cpp index 1c02e77e005..7a52e547b35 100644 --- a/src/devices/bus/compis/graphics.cpp +++ b/src/devices/bus/compis/graphics.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMPIS_GRAPHICS_SLOT = &device_creator; +const device_type COMPIS_GRAPHICS_SLOT = device_creator; diff --git a/src/devices/bus/compis/hrg.cpp b/src/devices/bus/compis/hrg.cpp index 68afe3b0341..052f2d5ee98 100644 --- a/src/devices/bus/compis/hrg.cpp +++ b/src/devices/bus/compis/hrg.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "hrg.h" +#include "screen.h" //************************************************************************** @@ -23,8 +24,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMPIS_HRG = &device_creator; -const device_type COMPIS_UHRG = &device_creator; +const device_type COMPIS_HRG = device_creator; +const device_type COMPIS_UHRG = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp index bd59a7b1027..7c7fa88472b 100644 --- a/src/devices/bus/compucolor/floppy.cpp +++ b/src/devices/bus/compucolor/floppy.cpp @@ -15,8 +15,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMPUCOLOR_FLOPPY_PORT = &device_creator; -const device_type COMPUCOLOR_FLOPPY = &device_creator; +const device_type COMPUCOLOR_FLOPPY_PORT = device_creator; +const device_type COMPUCOLOR_FLOPPY = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp index 47e4f9bc93f..65a0b3fd9c9 100644 --- a/src/devices/bus/comx35/clm.cpp +++ b/src/devices/bus/comx35/clm.cpp @@ -46,6 +46,7 @@ Notes: #include "emu.h" #include "clm.h" +#include "screen.h" @@ -63,7 +64,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_CLM = &device_creator; +const device_type COMX_CLM = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/comx35/eprom.cpp b/src/devices/bus/comx35/eprom.cpp index 9bd790e620e..701a78a9f8b 100644 --- a/src/devices/bus/comx35/eprom.cpp +++ b/src/devices/bus/comx35/eprom.cpp @@ -21,7 +21,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_EPR = &device_creator; +const device_type COMX_EPR = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp index 1be1d2074e3..8e2aacf910e 100644 --- a/src/devices/bus/comx35/exp.cpp +++ b/src/devices/bus/comx35/exp.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_EXPANSION_SLOT = &device_creator; +const device_type COMX_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp index 0ee42ff79db..51962fb2d39 100644 --- a/src/devices/bus/comx35/expbox.cpp +++ b/src/devices/bus/comx35/expbox.cpp @@ -66,7 +66,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_EB = &device_creator; +const device_type COMX_EB = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp index 93f2b8452ef..8550fe414ec 100644 --- a/src/devices/bus/comx35/fdc.cpp +++ b/src/devices/bus/comx35/fdc.cpp @@ -58,7 +58,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_FD = &device_creator; +const device_type COMX_FD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/comx35/joycard.cpp b/src/devices/bus/comx35/joycard.cpp index 48bfe63ecfc..3a7a7b9b311 100644 --- a/src/devices/bus/comx35/joycard.cpp +++ b/src/devices/bus/comx35/joycard.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_JOY = &device_creator; +const device_type COMX_JOY = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp index 0aeb8adb7b4..1a24c93cae6 100644 --- a/src/devices/bus/comx35/printer.cpp +++ b/src/devices/bus/comx35/printer.cpp @@ -24,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_PRN = &device_creator; +const device_type COMX_PRN = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp index 2b6ab934237..89c7bfff728 100644 --- a/src/devices/bus/comx35/ram.cpp +++ b/src/devices/bus/comx35/ram.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_RAM = &device_creator; +const device_type COMX_RAM = device_creator; //************************************************************************** diff --git a/src/devices/bus/comx35/thermal.cpp b/src/devices/bus/comx35/thermal.cpp index a44a38bae96..d08aac2175e 100644 --- a/src/devices/bus/comx35/thermal.cpp +++ b/src/devices/bus/comx35/thermal.cpp @@ -21,7 +21,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMX_THM = &device_creator; +const device_type COMX_THM = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp index 18eea564be0..8cc82aea1cb 100644 --- a/src/devices/bus/cpc/amdrum.cpp +++ b/src/devices/bus/cpc/amdrum.cpp @@ -8,14 +8,16 @@ #include "emu.h" #include "amdrum.h" + #include "sound/volt_reg.h" +#include "speaker.h" //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_AMDRUM = &device_creator; +const device_type CPC_AMDRUM = device_creator; static MACHINE_CONFIG_FRAGMENT( cpc_amdrum ) diff --git a/src/devices/bus/cpc/brunword4.cpp b/src/devices/bus/cpc/brunword4.cpp index 45d90ccc96e..1118e0c8b61 100644 --- a/src/devices/bus/cpc/brunword4.cpp +++ b/src/devices/bus/cpc/brunword4.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "brunword4.h" -const device_type CPC_BRUNWORD_MK4 = &device_creator; +const device_type CPC_BRUNWORD_MK4 = device_creator; ROM_START( cpc_brunword4 ) diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp index 0708cb67f9a..b9ab288ec9a 100644 --- a/src/devices/bus/cpc/cpc_pds.cpp +++ b/src/devices/bus/cpc/cpc_pds.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_PDS = &device_creator; +const device_type CPC_PDS = device_creator; static MACHINE_CONFIG_FRAGMENT( cpc_pds ) diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp index aae1044dc26..3fa2848aa8c 100644 --- a/src/devices/bus/cpc/cpc_rom.cpp +++ b/src/devices/bus/cpc/cpc_rom.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "cpc_rom.h" -const device_type CPC_ROM = &device_creator; +const device_type CPC_ROM = device_creator; SLOT_INTERFACE_EXTERN(cpc_exp_cards); @@ -73,7 +73,7 @@ void cpc_rom_device::device_reset() /*** ROM image device ***/ // device type definition -const device_type ROMSLOT = &device_creator; +const device_type ROMSLOT = device_creator; //------------------------------------------------- // rom_image_device - constructor diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp index 585a87375ff..fee168423f0 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -15,8 +15,8 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_RS232 = &device_creator; -const device_type CPC_RS232_AMS = &device_creator; +const device_type CPC_RS232 = device_creator; +const device_type CPC_RS232_AMS = device_creator; // device machine config static MACHINE_CONFIG_FRAGMENT( cpc_rs232 ) diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index ef21af1e384..af2627e03bb 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -10,14 +10,17 @@ #include "emu.h" #include "cpc_ssa1.h" +#include "speaker.h" + + SLOT_INTERFACE_EXTERN(cpc_exp_cards); //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_SSA1 = &device_creator; -const device_type CPC_DKSPEECH = &device_creator; +const device_type CPC_SSA1 = device_creator; +const device_type CPC_DKSPEECH = device_creator; //------------------------------------------------- // device I/O handlers diff --git a/src/devices/bus/cpc/cpcexp.cpp b/src/devices/bus/cpc/cpcexp.cpp index 2e4f0c558a3..ff1db3d6741 100644 --- a/src/devices/bus/cpc/cpcexp.cpp +++ b/src/devices/bus/cpc/cpcexp.cpp @@ -16,7 +16,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type CPC_EXPANSION_SLOT = &device_creator; +const device_type CPC_EXPANSION_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp index be82f2f05b8..b78caa06129 100644 --- a/src/devices/bus/cpc/ddi1.cpp +++ b/src/devices/bus/cpc/ddi1.cpp @@ -13,7 +13,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_DDI1 = &device_creator; +const device_type CPC_DDI1 = device_creator; static SLOT_INTERFACE_START( ddi1_floppies ) SLOT_INTERFACE( "3ssdd", FLOPPY_3_SSDD ) diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp index 6a48a653016..5a26931e400 100644 --- a/src/devices/bus/cpc/doubler.cpp +++ b/src/devices/bus/cpc/doubler.cpp @@ -14,7 +14,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_DOUBLER = &device_creator; +const device_type CPC_DOUBLER = device_creator; static MACHINE_CONFIG_FRAGMENT( cpc_doubler ) diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp index 370b3076b8c..427ef00efd4 100644 --- a/src/devices/bus/cpc/hd20.cpp +++ b/src/devices/bus/cpc/hd20.cpp @@ -14,7 +14,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_HD20 = &device_creator; +const device_type CPC_HD20 = device_creator; static MACHINE_CONFIG_FRAGMENT( cpc_hd20 ) MCFG_DEVICE_ADD("hdc",ST11M_HDC,0) diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index d2bf11d2009..6736f2367dd 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -10,13 +10,16 @@ #include "emu.h" #include "magicsound.h" #include "sound/volt_reg.h" +#include "speaker.h" + + SLOT_INTERFACE_EXTERN(cpc_exp_cards); //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type AL_MAGICSOUND = &device_creator; +const device_type AL_MAGICSOUND = device_creator; static MACHINE_CONFIG_FRAGMENT( al_magicsound ) diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp index 90d08716e25..b67b4682649 100644 --- a/src/devices/bus/cpc/mface2.cpp +++ b/src/devices/bus/cpc/mface2.cpp @@ -14,7 +14,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_MFACE2 = &device_creator; +const device_type CPC_MFACE2 = device_creator; // device machine config static MACHINE_CONFIG_FRAGMENT( cpc_mface2 ) diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp index 6e4a7660527..de8da2d8377 100644 --- a/src/devices/bus/cpc/playcity.cpp +++ b/src/devices/bus/cpc/playcity.cpp @@ -12,13 +12,16 @@ #include "emu.h" #include "playcity.h" +#include "speaker.h" + + SLOT_INTERFACE_EXTERN(cpc_exp_cards); //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_PLAYCITY = &device_creator; +const device_type CPC_PLAYCITY = device_creator; // device machine config static MACHINE_CONFIG_FRAGMENT( cpc_playcity ) diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp index b6a453d79cd..89805cd607b 100644 --- a/src/devices/bus/cpc/smartwatch.cpp +++ b/src/devices/bus/cpc/smartwatch.cpp @@ -17,7 +17,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_SMARTWATCH = &device_creator; +const device_type CPC_SMARTWATCH = device_creator; static MACHINE_CONFIG_FRAGMENT( cpc_smartwatch ) diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp index 524d1ad228c..049e5f487f2 100644 --- a/src/devices/bus/cpc/symbfac2.cpp +++ b/src/devices/bus/cpc/symbfac2.cpp @@ -21,7 +21,7 @@ #include "symbfac2.h" -const device_type CPC_SYMBIFACE2 = &device_creator; +const device_type CPC_SYMBIFACE2 = device_creator; //************************************************************************** // DEVICE CONFIG INTERFACE diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp index 2dbfcbb5dea..231333dd0e6 100644 --- a/src/devices/bus/cpc/transtape.cpp +++ b/src/devices/bus/cpc/transtape.cpp @@ -16,7 +16,7 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards); // DEVICE DEFINITIONS //************************************************************************** -const device_type CPC_TRANSTAPE = &device_creator; +const device_type CPC_TRANSTAPE = device_creator; ROM_START( cpc_transtape ) ROM_REGION( 0x4000, "tt_rom", 0 ) diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp index 0f54308df9c..773eb00472b 100644 --- a/src/devices/bus/crvision/rom.cpp +++ b/src/devices/bus/crvision/rom.cpp @@ -17,13 +17,13 @@ // crvision_rom_device - constructor //------------------------------------------------- -const device_type CRVISION_ROM_4K = &device_creator; -const device_type CRVISION_ROM_6K = &device_creator; -const device_type CRVISION_ROM_8K = &device_creator; -const device_type CRVISION_ROM_10K = &device_creator; -const device_type CRVISION_ROM_12K = &device_creator; -const device_type CRVISION_ROM_16K = &device_creator; -const device_type CRVISION_ROM_18K = &device_creator; +const device_type CRVISION_ROM_4K = device_creator; +const device_type CRVISION_ROM_6K = device_creator; +const device_type CRVISION_ROM_8K = device_creator; +const device_type CRVISION_ROM_10K = device_creator; +const device_type CRVISION_ROM_12K = device_creator; +const device_type CRVISION_ROM_16K = device_creator; +const device_type CRVISION_ROM_18K = device_creator; crvision_rom_device::crvision_rom_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) diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp index 4a435aa729f..0cd05162add 100644 --- a/src/devices/bus/crvision/slot.cpp +++ b/src/devices/bus/crvision/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type CRVISION_CART_SLOT = &device_creator; +const device_type CRVISION_CART_SLOT = device_creator; //************************************************************************** // CreatiVision Cartridges Interface diff --git a/src/devices/bus/dmv/dmvbus.cpp b/src/devices/bus/dmv/dmvbus.cpp index 121eeafaafa..379be49cef2 100644 --- a/src/devices/bus/dmv/dmvbus.cpp +++ b/src/devices/bus/dmv/dmvbus.cpp @@ -162,7 +162,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type DMVCART_SLOT = &device_creator; +const device_type DMVCART_SLOT = device_creator; //************************************************************************** // DMV cartridge interface diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 00cb4004f51..cb3c67a5f4e 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -41,7 +41,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K210 = &device_creator; +const device_type DMV_K210 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp index f6ec770df19..9f5ad2dd154 100644 --- a/src/devices/bus/dmv/k220.cpp +++ b/src/devices/bus/dmv/k220.cpp @@ -122,7 +122,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K220 = &device_creator; +const device_type DMV_K220 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp index f3e04adf0fe..4aad694c433 100644 --- a/src/devices/bus/dmv/k230.cpp +++ b/src/devices/bus/dmv/k230.cpp @@ -93,10 +93,10 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K230 = &device_creator; -const device_type DMV_K231 = &device_creator; -const device_type DMV_K234 = &device_creator; -const device_type DMV_K235 = &device_creator; +const device_type DMV_K230 = device_creator; +const device_type DMV_K231 = device_creator; +const device_type DMV_K234 = device_creator; +const device_type DMV_K235 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/dmv/k233.cpp b/src/devices/bus/dmv/k233.cpp index 11e31431e9b..129823975a7 100644 --- a/src/devices/bus/dmv/k233.cpp +++ b/src/devices/bus/dmv/k233.cpp @@ -18,7 +18,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K233 = &device_creator; +const device_type DMV_K233 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index 211c678392b..c466e83e121 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -98,10 +98,10 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K801 = &device_creator; -const device_type DMV_K211 = &device_creator; -const device_type DMV_K212 = &device_creator; -const device_type DMV_K213 = &device_creator; +const device_type DMV_K801 = device_creator; +const device_type DMV_K211 = device_creator; +const device_type DMV_K212 = device_creator; +const device_type DMV_K213 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index b57e01c3b19..be80480bac6 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -38,7 +38,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K803 = &device_creator; +const device_type DMV_K803 = device_creator; //************************************************************************** diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp index 6667d267899..748080b41f9 100644 --- a/src/devices/bus/dmv/k806.cpp +++ b/src/devices/bus/dmv/k806.cpp @@ -65,7 +65,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K806 = &device_creator; +const device_type DMV_K806 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp index 1f2d5e2df2a..b676a7c3148 100644 --- a/src/devices/bus/dmv/ram.cpp +++ b/src/devices/bus/dmv/ram.cpp @@ -20,9 +20,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type DMV_K200 = &device_creator; -const device_type DMV_K202 = &device_creator; -const device_type DMV_K208 = &device_creator; +const device_type DMV_K200 = device_creator; +const device_type DMV_K202 = device_creator; +const device_type DMV_K208 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp index d9a5844a6c5..0947322dfc7 100644 --- a/src/devices/bus/ecbbus/ecbbus.cpp +++ b/src/devices/bus/ecbbus/ecbbus.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type ECBBUS_SLOT = &device_creator; +const device_type ECBBUS_SLOT = device_creator; @@ -63,7 +63,7 @@ void ecbbus_slot_device::device_start() // DEVICE DEFINITIONS //************************************************************************** -const device_type ECBBUS = &device_creator; +const device_type ECBBUS = device_creator; diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index c4da34f0e81..3dea8a6b486 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -9,6 +9,9 @@ #include "emu.h" #include "grip.h" +#include "screen.h" +#include "speaker.h" + //************************************************************************** @@ -32,7 +35,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ECB_GRIP21 = &device_creator; +const device_type ECB_GRIP21 = device_creator; diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index c2aef7cda8b..0dc2d86bf8b 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -6,19 +6,20 @@ **********************************************************************/ -#pragma once +#ifndef MAME_BUS_ECBBUS_GRIP_H +#define MAME_BUS_ECBBUS_GRIP_H -#ifndef __GRIP__ -#define __GRIP__ +#pragma once #include "ecbbus.h" + +#include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/keyboard.h" #include "machine/z80sti.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/mc6845.h" @@ -110,7 +111,6 @@ private: // timers emu_timer *m_kb_timer; -}; /* @@ -122,9 +122,10 @@ private: int m_dpage; // displayed video page */ +}; // device type definition extern const device_type ECB_GRIP21; -#endif +#endif // MAME_BUS_ECBBUS_GRIP_H diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 3ef261e174a..80fc8bb3029 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -75,8 +75,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type E01 = &device_creator; -const device_type E01S = &device_creator; +const device_type E01 = device_creator; +const device_type E01S = device_creator; e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "e01s", __FILE__) { m_variant = TYPE_E01S; } diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp index 56d1461124f..18e5134f459 100644 --- a/src/devices/bus/econet/econet.cpp +++ b/src/devices/bus/econet/econet.cpp @@ -26,8 +26,8 @@ static const char *const SIGNAL_NAME[] = { "CLK", "DATA" }; // DEVICE DEFINITIONS //************************************************************************** -const device_type ECONET = &device_creator; -const device_type ECONET_SLOT = &device_creator; +const device_type ECONET = device_creator; +const device_type ECONET_SLOT = device_creator; diff --git a/src/devices/bus/electron/exp.cpp b/src/devices/bus/electron/exp.cpp index 59df7604656..dad23b527e0 100644 --- a/src/devices/bus/electron/exp.cpp +++ b/src/devices/bus/electron/exp.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ELECTRON_EXPANSION_SLOT = &device_creator; +const device_type ELECTRON_EXPANSION_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp index bef3596db51..ba437842a4c 100644 --- a/src/devices/bus/electron/m2105.cpp +++ b/src/devices/bus/electron/m2105.cpp @@ -9,13 +9,14 @@ #include "emu.h" #include "m2105.h" +#include "speaker.h" //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type ELECTRON_M2105 = &device_creator; +const device_type ELECTRON_M2105 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp index ae56dbe98f3..98189b6cae7 100644 --- a/src/devices/bus/electron/plus3.cpp +++ b/src/devices/bus/electron/plus3.cpp @@ -24,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ELECTRON_PLUS3 = &device_creator; +const device_type ELECTRON_PLUS3 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp index 2fceed2bece..9b8d6ea9d48 100644 --- a/src/devices/bus/ep64/exdos.cpp +++ b/src/devices/bus/ep64/exdos.cpp @@ -62,7 +62,7 @@ This PCB plugs into the external expansion connector on the right side of the ma // DEVICE DEFINITIONS //************************************************************************** -const device_type EP64_EXDOS = &device_creator; +const device_type EP64_EXDOS = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ep64/exp.cpp b/src/devices/bus/ep64/exp.cpp index 8179015100d..028b397b6df 100644 --- a/src/devices/bus/ep64/exp.cpp +++ b/src/devices/bus/ep64/exp.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EP64_EXPANSION_BUS_SLOT = &device_creator; +const device_type EP64_EXPANSION_BUS_SLOT = device_creator; diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp index c77ba243810..6fd316989dc 100644 --- a/src/devices/bus/epson_sio/epson_sio.cpp +++ b/src/devices/bus/epson_sio/epson_sio.cpp @@ -18,7 +18,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type EPSON_SIO = &device_creator; +const device_type EPSON_SIO = device_creator; //************************************************************************** diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index 3dbe9de76c9..0e3bac64c1a 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -18,7 +18,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EPSON_PF10 = &device_creator; +const device_type EPSON_PF10 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp index 066c11af870..f1af2da2c74 100644 --- a/src/devices/bus/epson_sio/tf20.cpp +++ b/src/devices/bus/epson_sio/tf20.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EPSON_TF20 = &device_creator; +const device_type EPSON_TF20 = device_creator; //------------------------------------------------- // address maps diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp index 3b6c30949c2..6229965a151 100644 --- a/src/devices/bus/gameboy/gb_slot.cpp +++ b/src/devices/bus/gameboy/gb_slot.cpp @@ -25,8 +25,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type GB_CART_SLOT = &device_creator; -const device_type MEGADUCK_CART_SLOT = &device_creator; +const device_type GB_CART_SLOT = device_creator; +const device_type MEGADUCK_CART_SLOT = device_creator; //************************************************************************** // GB cartridges Interface diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp index 6d131f7aea2..6aba03a2124 100644 --- a/src/devices/bus/gameboy/mbc.cpp +++ b/src/devices/bus/gameboy/mbc.cpp @@ -18,23 +18,23 @@ // gb_rom_mbc*_device - constructor //------------------------------------------------- -const device_type GB_ROM_MBC1 = &device_creator; -const device_type GB_ROM_MBC2 = &device_creator; -const device_type GB_ROM_MBC3 = &device_creator; -const device_type GB_ROM_MBC5 = &device_creator; -const device_type GB_ROM_MBC6 = &device_creator; -const device_type GB_ROM_MBC7 = &device_creator; -const device_type GB_ROM_M161 = &device_creator; -const device_type GB_ROM_MMM01 = &device_creator; -const device_type GB_ROM_SACHEN1 = &device_creator; -const device_type GB_ROM_SACHEN2 = &device_creator; -const device_type GB_ROM_188IN1 = &device_creator; -const device_type GB_ROM_SINTAX = &device_creator; -const device_type GB_ROM_CHONGWU = &device_creator; -const device_type GB_ROM_LICHENG = &device_creator; -const device_type GB_ROM_DIGIMON = &device_creator; -const device_type GB_ROM_ROCKMAN8 = &device_creator; -const device_type GB_ROM_SM3SP = &device_creator; +const device_type GB_ROM_MBC1 = device_creator; +const device_type GB_ROM_MBC2 = device_creator; +const device_type GB_ROM_MBC3 = device_creator; +const device_type GB_ROM_MBC5 = device_creator; +const device_type GB_ROM_MBC6 = device_creator; +const device_type GB_ROM_MBC7 = device_creator; +const device_type GB_ROM_M161 = device_creator; +const device_type GB_ROM_MMM01 = device_creator; +const device_type GB_ROM_SACHEN1 = device_creator; +const device_type GB_ROM_SACHEN2 = device_creator; +const device_type GB_ROM_188IN1 = device_creator; +const device_type GB_ROM_SINTAX = device_creator; +const device_type GB_ROM_CHONGWU = device_creator; +const device_type GB_ROM_LICHENG = device_creator; +const device_type GB_ROM_DIGIMON = device_creator; +const device_type GB_ROM_ROCKMAN8 = device_creator; +const device_type GB_ROM_SM3SP = device_creator; gb_rom_mbc_device::gb_rom_mbc_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) diff --git a/src/devices/bus/gameboy/rom.cpp b/src/devices/bus/gameboy/rom.cpp index 609f30b8e52..f06164426ef 100644 --- a/src/devices/bus/gameboy/rom.cpp +++ b/src/devices/bus/gameboy/rom.cpp @@ -19,14 +19,14 @@ // gb_rom_device - constructor //------------------------------------------------- -const device_type GB_STD_ROM = &device_creator; -const device_type GB_ROM_TAMA5 = &device_creator; -const device_type GB_ROM_WISDOM = &device_creator; -const device_type GB_ROM_YONG = &device_creator; -const device_type GB_ROM_ATVRAC = &device_creator; -const device_type GB_ROM_LASAMA = &device_creator; - -const device_type MEGADUCK_ROM = &device_creator; +const device_type GB_STD_ROM = device_creator; +const device_type GB_ROM_TAMA5 = device_creator; +const device_type GB_ROM_WISDOM = device_creator; +const device_type GB_ROM_YONG = device_creator; +const device_type GB_ROM_ATVRAC = device_creator; +const device_type GB_ROM_LASAMA = device_creator; + +const device_type MEGADUCK_ROM = device_creator; gb_rom_device::gb_rom_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) diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp index ff45b646acb..3be7f8a1080 100644 --- a/src/devices/bus/gamegear/ggext.cpp +++ b/src/devices/bus/gamegear/ggext.cpp @@ -18,7 +18,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type GG_EXT_PORT = &device_creator; +const device_type GG_EXT_PORT = device_creator; diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp index a6212395d34..e829dd80e5e 100644 --- a/src/devices/bus/gamegear/smsctrladp.cpp +++ b/src/devices/bus/gamegear/smsctrladp.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_CTRL_ADAPTOR = &device_creator; +const device_type SMS_CTRL_ADAPTOR = device_creator; //************************************************************************** diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp index bb9f5b5f992..61dd7cda417 100644 --- a/src/devices/bus/gba/gba_slot.cpp +++ b/src/devices/bus/gba/gba_slot.cpp @@ -16,7 +16,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type GBA_CART_SLOT = &device_creator; +const device_type GBA_CART_SLOT = device_creator; //************************************************************************** // GBA cartridges Interface diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp index 7080a60dc01..78875860300 100644 --- a/src/devices/bus/gba/rom.cpp +++ b/src/devices/bus/gba/rom.cpp @@ -21,19 +21,19 @@ // gba_rom_device - constructor //------------------------------------------------- -const device_type GBA_ROM_STD = &device_creator; -const device_type GBA_ROM_SRAM = &device_creator; -const device_type GBA_ROM_DRILLDOZ = &device_creator; -const device_type GBA_ROM_WARIOTWS = &device_creator; -const device_type GBA_ROM_EEPROM = &device_creator; -const device_type GBA_ROM_YOSHIUG = &device_creator; -const device_type GBA_ROM_EEPROM64 = &device_creator; -const device_type GBA_ROM_BOKTAI = &device_creator; -const device_type GBA_ROM_FLASH = &device_creator; -const device_type GBA_ROM_FLASH_RTC = &device_creator; -const device_type GBA_ROM_FLASH1M = &device_creator; -const device_type GBA_ROM_FLASH1M_RTC = &device_creator; -const device_type GBA_ROM_3DMATRIX = &device_creator; +const device_type GBA_ROM_STD = device_creator; +const device_type GBA_ROM_SRAM = device_creator; +const device_type GBA_ROM_DRILLDOZ = device_creator; +const device_type GBA_ROM_WARIOTWS = device_creator; +const device_type GBA_ROM_EEPROM = device_creator; +const device_type GBA_ROM_YOSHIUG = device_creator; +const device_type GBA_ROM_EEPROM64 = device_creator; +const device_type GBA_ROM_BOKTAI = device_creator; +const device_type GBA_ROM_FLASH = device_creator; +const device_type GBA_ROM_FLASH_RTC = device_creator; +const device_type GBA_ROM_FLASH1M = device_creator; +const device_type GBA_ROM_FLASH1M_RTC = device_creator; +const device_type GBA_ROM_3DMATRIX = device_creator; gba_rom_device::gba_rom_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) diff --git a/src/devices/bus/generic/ram.cpp b/src/devices/bus/generic/ram.cpp index a27e0ddafcd..15db67732cc 100644 --- a/src/devices/bus/generic/ram.cpp +++ b/src/devices/bus/generic/ram.cpp @@ -26,12 +26,12 @@ // constructor //------------------------------------------------- -const device_type GENERIC_RAM_32K_PLAIN = &device_creator; -const device_type GENERIC_RAM_64K_PLAIN = &device_creator; -const device_type GENERIC_RAM_128K_PLAIN = &device_creator; -const device_type GENERIC_RAM_32K_LINEAR = &device_creator; -const device_type GENERIC_RAM_64K_LINEAR = &device_creator; -const device_type GENERIC_RAM_128K_LINEAR = &device_creator; +const device_type GENERIC_RAM_32K_PLAIN = device_creator; +const device_type GENERIC_RAM_64K_PLAIN = device_creator; +const device_type GENERIC_RAM_128K_PLAIN = device_creator; +const device_type GENERIC_RAM_32K_LINEAR = device_creator; +const device_type GENERIC_RAM_64K_LINEAR = device_creator; +const device_type GENERIC_RAM_128K_LINEAR = device_creator; generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t size, const char *shortname, const char *source) diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp index 41a35c8be2b..9a965cc2ccb 100644 --- a/src/devices/bus/generic/rom.cpp +++ b/src/devices/bus/generic/rom.cpp @@ -26,9 +26,9 @@ // constructor //------------------------------------------------- -const device_type GENERIC_ROM_PLAIN = &device_creator; -const device_type GENERIC_ROM_LINEAR = &device_creator; -const device_type GENERIC_ROMRAM_PLAIN = &device_creator; +const device_type GENERIC_ROM_PLAIN = device_creator; +const device_type GENERIC_ROM_LINEAR = device_creator; +const device_type GENERIC_ROMRAM_PLAIN = device_creator; generic_rom_device::generic_rom_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) diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp index d081ceb5fed..442c09de3f1 100644 --- a/src/devices/bus/generic/slot.cpp +++ b/src/devices/bus/generic/slot.cpp @@ -28,7 +28,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type GENERIC_SOCKET = &device_creator; +const device_type GENERIC_SOCKET = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp index 74da49aebca..d1a93b30fcb 100644 --- a/src/devices/bus/hp9845_io/98034.cpp +++ b/src/devices/bus/hp9845_io/98034.cpp @@ -380,4 +380,4 @@ machine_config_constructor hp98034_io_card::device_mconfig_additions() const } // device type definition -const device_type HP98034_IO_CARD = &device_creator; +const device_type HP98034_IO_CARD = device_creator; diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp index 459641cf7a3..bea33e32cf0 100644 --- a/src/devices/bus/hp9845_io/98035.cpp +++ b/src/devices/bus/hp9845_io/98035.cpp @@ -768,4 +768,4 @@ machine_config_constructor hp98035_io_card::device_mconfig_additions() const } // device type definition -const device_type HP98035_IO_CARD = &device_creator; +const device_type HP98035_IO_CARD = device_creator; diff --git a/src/devices/bus/hp9845_io/hp9845_io.cpp b/src/devices/bus/hp9845_io/hp9845_io.cpp index 16cdaa641d3..86e948cb5d3 100644 --- a/src/devices/bus/hp9845_io/hp9845_io.cpp +++ b/src/devices/bus/hp9845_io/hp9845_io.cpp @@ -13,7 +13,7 @@ #include "includes/hp9845.h" // device type definition -const device_type HP9845_IO_SLOT = &device_creator; +const device_type HP9845_IO_SLOT = device_creator; // +---------------------+ // |hp9845_io_slot_device| diff --git a/src/devices/bus/hp_optroms/hp_optrom.cpp b/src/devices/bus/hp_optroms/hp_optrom.cpp index 28eff4114af..49f9f2bc8e6 100644 --- a/src/devices/bus/hp_optroms/hp_optrom.cpp +++ b/src/devices/bus/hp_optroms/hp_optrom.cpp @@ -13,8 +13,8 @@ #include "softlist.h" #include "cpu/hphybrid/hphybrid.h" -const device_type HP_OPTROM_CART = &device_creator; -const device_type HP_OPTROM_SLOT = &device_creator; +const device_type HP_OPTROM_CART = device_creator; +const device_type HP_OPTROM_SLOT = device_creator; // +---------------------+ // |hp_optrom_cart_device| diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index 7966c596ac5..b23fb0c02d1 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -33,7 +33,7 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type C2031 = &device_creator; +const device_type C2031 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 23367e51a53..f16ba22261a 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -70,9 +70,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C2040 = &device_creator; -const device_type C3040 = &device_creator; -const device_type C4040 = &device_creator; +const device_type C2040 = device_creator; +const device_type C3040 = device_creator; +const device_type C4040 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp index 1d49dc6aec9..493cdb8ee69 100644 --- a/src/devices/bus/ieee488/c2040fdc.cpp +++ b/src/devices/bus/ieee488/c2040fdc.cpp @@ -38,7 +38,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C2040_FDC = &device_creator; +const device_type C2040_FDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index f0709f3046e..11ea6204870 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -54,10 +54,10 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type C8050 = &device_creator; -const device_type C8250 = &device_creator; -const device_type C8250LP = &device_creator; -const device_type SFD1001 = &device_creator; +const device_type C8050 = device_creator; +const device_type C8250 = device_creator; +const device_type C8250LP = device_creator; +const device_type SFD1001 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp index 0821d6a1bf7..ae0fe558153 100644 --- a/src/devices/bus/ieee488/c8050fdc.cpp +++ b/src/devices/bus/ieee488/c8050fdc.cpp @@ -40,7 +40,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C8050_FDC = &device_creator; +const device_type C8050_FDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index ef1156c8a2c..82fa2e1c4e0 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -36,7 +36,7 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type C8280 = &device_creator; +const device_type C8280 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index f2a0ef398d0..e89dea811eb 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -61,8 +61,8 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type D9060 = &device_creator; -const device_type D9090 = &device_creator; +const device_type D9060 = device_creator; +const device_type D9090 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index 31490a63f3f..5aa56ad92d9 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -58,7 +58,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type HARDBOX = &device_creator; +const device_type HARDBOX = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index d14e3ad7810..f581ab40d9e 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -130,7 +130,7 @@ enum { #define MIN_SYNC_BITS 29 // Number of bits to synchronize // device type definition -const device_type HP9895 = &device_creator; +const device_type HP9895 = device_creator; // Masks of drive selectors in XV register static const uint8_t xv_drive_masks[] = { diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp index f31009c2981..5b0ba2d9197 100644 --- a/src/devices/bus/ieee488/ieee488.cpp +++ b/src/devices/bus/ieee488/ieee488.cpp @@ -27,8 +27,8 @@ static const char *const SIGNAL_NAME[] = { "EOI", "DAV", "NRFD", "NDAC", "IFC", // DEVICE DEFINITIONS //************************************************************************** -const device_type IEEE488 = &device_creator; -const device_type IEEE488_SLOT = &device_creator; +const device_type IEEE488 = device_creator; +const device_type IEEE488_SLOT = device_creator; template class device_finder; template class device_finder; diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp index 259a3336b31..10c911cca61 100644 --- a/src/devices/bus/ieee488/shark.cpp +++ b/src/devices/bus/ieee488/shark.cpp @@ -27,7 +27,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SHARK = &device_creator; +const device_type SHARK = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index 922bc0f0897..b2086a995b9 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -36,7 +36,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SOFTBOX = &device_creator; +const device_type SOFTBOX = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp index 8e98b8414f5..5d72030ad44 100644 --- a/src/devices/bus/imi7000/imi5000h.cpp +++ b/src/devices/bus/imi7000/imi5000h.cpp @@ -29,7 +29,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type IMI5000H = &device_creator; +const device_type IMI5000H = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/imi7000/imi7000.cpp b/src/devices/bus/imi7000/imi7000.cpp index e28a3df72d7..c558770c4f6 100644 --- a/src/devices/bus/imi7000/imi7000.cpp +++ b/src/devices/bus/imi7000/imi7000.cpp @@ -23,8 +23,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type IMI7000_BUS = &device_creator; -const device_type IMI7000_SLOT = &device_creator; +const device_type IMI7000_BUS = device_creator; +const device_type IMI7000_SLOT = device_creator; diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp index f0e8540996e..006de780b73 100644 --- a/src/devices/bus/intv/ecs.cpp +++ b/src/devices/bus/intv/ecs.cpp @@ -19,21 +19,22 @@ #include "emu.h" #include "ecs.h" +#include "speaker.h" //------------------------------------------------- // intv_ecs_device - constructor //------------------------------------------------- -const device_type INTV_ROM_ECS = &device_creator; +const device_type INTV_ROM_ECS = device_creator; intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : intv_rom_device(mconfig, INTV_ROM_ECS, "Intellivision ECS Expansion", tag, owner, clock, "intv_ecs", __FILE__), - m_snd(*this, "ay8914"), - m_subslot(*this, "subslot"), - m_voice_enabled(false), - m_ramd0_enabled(false), - m_ram88_enabled(false) + : intv_rom_device(mconfig, INTV_ROM_ECS, "Intellivision ECS Expansion", tag, owner, clock, "intv_ecs", __FILE__), + m_snd(*this, "ay8914"), + m_subslot(*this, "subslot"), + m_voice_enabled(false), + m_ramd0_enabled(false), + m_ram88_enabled(false) { } diff --git a/src/devices/bus/intv/rom.cpp b/src/devices/bus/intv/rom.cpp index a9f2d2cde82..8fef5d47432 100644 --- a/src/devices/bus/intv/rom.cpp +++ b/src/devices/bus/intv/rom.cpp @@ -17,10 +17,10 @@ // intv_rom_device - constructor //------------------------------------------------- -const device_type INTV_ROM_STD = &device_creator; -const device_type INTV_ROM_RAM = &device_creator; -const device_type INTV_ROM_GFACT = &device_creator; -const device_type INTV_ROM_WSMLB = &device_creator; +const device_type INTV_ROM_STD = device_creator; +const device_type INTV_ROM_RAM = device_creator; +const device_type INTV_ROM_GFACT = device_creator; +const device_type INTV_ROM_WSMLB = device_creator; intv_rom_device::intv_rom_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) diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp index d6c3bad9d3c..b8a6e869ba2 100644 --- a/src/devices/bus/intv/slot.cpp +++ b/src/devices/bus/intv/slot.cpp @@ -86,7 +86,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type INTV_CART_SLOT = &device_creator; +const device_type INTV_CART_SLOT = device_creator; //************************************************************************** // Intellivision Cartridges Interface diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp index 9470e1314cf..b144b0008c4 100644 --- a/src/devices/bus/intv/voice.cpp +++ b/src/devices/bus/intv/voice.cpp @@ -13,20 +13,21 @@ #include "emu.h" #include "voice.h" +#include "speaker.h" //------------------------------------------------- // intv_voice_device - constructor //------------------------------------------------- -const device_type INTV_ROM_VOICE = &device_creator; +const device_type INTV_ROM_VOICE = device_creator; intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : intv_rom_device(mconfig, INTV_ROM_VOICE, "Intellivision Intellivoice Expansion", tag, owner, clock, "intv_voice", __FILE__), - m_speech(*this, "sp0256_speech"), - m_subslot(*this, "subslot"), - m_ramd0_enabled(false), - m_ram88_enabled(false) + : intv_rom_device(mconfig, INTV_ROM_VOICE, "Intellivision Intellivoice Expansion", tag, owner, clock, "intv_voice", __FILE__), + m_speech(*this, "sp0256_speech"), + m_subslot(*this, "subslot"), + m_ramd0_enabled(false), + m_ram88_enabled(false) { } diff --git a/src/devices/bus/intv_ctrl/ctrl.cpp b/src/devices/bus/intv_ctrl/ctrl.cpp index d34a25baff0..510ac13cba8 100644 --- a/src/devices/bus/intv_ctrl/ctrl.cpp +++ b/src/devices/bus/intv_ctrl/ctrl.cpp @@ -16,7 +16,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type INTV_CONTROL_PORT = &device_creator; +const device_type INTV_CONTROL_PORT = device_creator; //************************************************************************** diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp index 18b2c328263..4b187442585 100644 --- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp +++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp @@ -30,7 +30,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type INTVECS_CONTROL_PORT = &device_creator; +const device_type INTVECS_CONTROL_PORT = device_creator; //************************************************************************** @@ -137,7 +137,7 @@ SLOT_INTERFACE_END // ECS_CTRLS - A pair of hand controllers //------------------------------------------------- -const device_type ECS_CTRLS = &device_creator; +const device_type ECS_CTRLS = device_creator; static SLOT_INTERFACE_START( intvecs_controller ) SLOT_INTERFACE("handctrl", INTV_HANDCTRL) @@ -184,7 +184,7 @@ uint8_t intvecs_ctrls_device::read_portB() // ECS_KEYBD - Keyboard //------------------------------------------------- -const device_type ECS_KEYBD = &device_creator; +const device_type ECS_KEYBD = device_creator; static INPUT_PORTS_START( intvecs_keybd ) /* @@ -320,7 +320,7 @@ void intvecs_keybd_device::write_portA(uint8_t data) // ECS_SYNTH - Synth //------------------------------------------------- -const device_type ECS_SYNTH = &device_creator; +const device_type ECS_SYNTH = device_creator; static INPUT_PORTS_START( intvecs_synth ) diff --git a/src/devices/bus/intv_ctrl/handctrl.cpp b/src/devices/bus/intv_ctrl/handctrl.cpp index ae0e6910e6c..6208c270ab6 100644 --- a/src/devices/bus/intv_ctrl/handctrl.cpp +++ b/src/devices/bus/intv_ctrl/handctrl.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type INTV_HANDCTRL = &device_creator; +const device_type INTV_HANDCTRL = device_creator; static INPUT_PORTS_START( intv_handctrl ) diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp index d4eb9cb2139..3ce901c61fb 100644 --- a/src/devices/bus/iq151/disc2.cpp +++ b/src/devices/bus/iq151/disc2.cpp @@ -38,7 +38,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_DISC2 = &device_creator; +const device_type IQ151_DISC2 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp index 5e8793bb432..4eda406479f 100644 --- a/src/devices/bus/iq151/grafik.cpp +++ b/src/devices/bus/iq151/grafik.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "grafik.h" +#include "screen.h" #define LOG 0 @@ -27,7 +28,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_GRAFIK = &device_creator; +const device_type IQ151_GRAFIK = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/iq151/iq151.cpp b/src/devices/bus/iq151/iq151.cpp index 4ee7a96b31f..355c556d48e 100644 --- a/src/devices/bus/iq151/iq151.cpp +++ b/src/devices/bus/iq151/iq151.cpp @@ -20,7 +20,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151CART_SLOT = &device_creator; +const device_type IQ151CART_SLOT = device_creator; //************************************************************************** // IQ151 cartridge interface diff --git a/src/devices/bus/iq151/minigraf.cpp b/src/devices/bus/iq151/minigraf.cpp index 6aba0a7b8b5..10572aa553c 100644 --- a/src/devices/bus/iq151/minigraf.cpp +++ b/src/devices/bus/iq151/minigraf.cpp @@ -37,7 +37,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_MINIGRAF = &device_creator; +const device_type IQ151_MINIGRAF = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/iq151/ms151a.cpp b/src/devices/bus/iq151/ms151a.cpp index af894b85f40..12e514b15ac 100644 --- a/src/devices/bus/iq151/ms151a.cpp +++ b/src/devices/bus/iq151/ms151a.cpp @@ -36,7 +36,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_MS151A = &device_creator; +const device_type IQ151_MS151A = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/iq151/rom.cpp b/src/devices/bus/iq151/rom.cpp index 8a2f1816433..076efa1f5a2 100644 --- a/src/devices/bus/iq151/rom.cpp +++ b/src/devices/bus/iq151/rom.cpp @@ -27,11 +27,11 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_BASIC6 = &device_creator; -const device_type IQ151_BASICG = &device_creator; -const device_type IQ151_AMOS1 = &device_creator; -const device_type IQ151_AMOS2 = &device_creator; -const device_type IQ151_AMOS3 = &device_creator; +const device_type IQ151_BASIC6 = device_creator; +const device_type IQ151_BASICG = device_creator; +const device_type IQ151_AMOS1 = device_creator; +const device_type IQ151_AMOS2 = device_creator; +const device_type IQ151_AMOS3 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp index 7e9225e4297..692c4e9431a 100644 --- a/src/devices/bus/iq151/staper.cpp +++ b/src/devices/bus/iq151/staper.cpp @@ -34,7 +34,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_STAPER = &device_creator; +const device_type IQ151_STAPER = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/iq151/video32.cpp b/src/devices/bus/iq151/video32.cpp index 09b245d1336..b9d4beb92ea 100644 --- a/src/devices/bus/iq151/video32.cpp +++ b/src/devices/bus/iq151/video32.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "video32.h" +#include "screen.h" /*************************************************************************** @@ -40,7 +41,7 @@ static const gfx_layout iq151_video32_charlayout = // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_VIDEO32 = &device_creator; +const device_type IQ151_VIDEO32 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/iq151/video64.cpp b/src/devices/bus/iq151/video64.cpp index cfa70c7d469..0ee3b71dd4b 100644 --- a/src/devices/bus/iq151/video64.cpp +++ b/src/devices/bus/iq151/video64.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "video64.h" +#include "screen.h" + /*************************************************************************** IMPLEMENTATION @@ -40,7 +42,7 @@ static const gfx_layout iq151_video64_charlayout = // GLOBAL VARIABLES //************************************************************************** -const device_type IQ151_VIDEO64 = &device_creator; +const device_type IQ151_VIDEO64 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index 8caa4abe4e8..a34983062bb 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -12,7 +12,7 @@ static MACHINE_CONFIG_FRAGMENT(el2_3c503_config) MCFG_DP8390D_MEM_WRITE_CB(WRITE8(el2_3c503_device, el2_3c503_mem_write)) MACHINE_CONFIG_END -const device_type EL2_3C503 = &device_creator; +const device_type EL2_3C503 = device_creator; machine_config_constructor el2_3c503_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(el2_3c503_config); diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp index 9523a61ac61..3efe0d29213 100644 --- a/src/devices/bus/isa/3c505.cpp +++ b/src/devices/bus/isa/3c505.cpp @@ -296,7 +296,7 @@ INPUT_PORTS_END ***************************************************************************/ // device type definition -const device_type ISA16_3C505 = &device_creator ; +const device_type ISA16_3C505 = device_creator ; //------------------------------------------------- // threecom3c505_device - constructor diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp index 206ffe878cb..4193091f9d2 100644 --- a/src/devices/bus/isa/adlib.cpp +++ b/src/devices/bus/isa/adlib.cpp @@ -8,7 +8,10 @@ #include "emu.h" #include "adlib.h" -#include "sound/speaker.h" + +#include "sound/spkrdev.h" +#include "speaker.h" + #define ym3812_StdClock 3579545 @@ -41,7 +44,7 @@ WRITE8_MEMBER( isa8_adlib_device::ym3812_16_w ) // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_ADLIB = &device_creator; +const device_type ISA8_ADLIB = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index ff0c05c8e54..ad4269dba8b 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -51,7 +51,7 @@ INPUT_PORTS_END #define CGA_MONITOR (m_cga_config->read()&0x1C) #define CGA_MONITOR_COMPOSITE 0x08 /* Colour composite */ -const device_type ISA8_AGA = &device_creator; +const device_type ISA8_AGA = device_creator; //------------------------------------------------- // isa8_aga_device - constructor @@ -159,7 +159,7 @@ ioport_constructor isa8_aga_device::device_input_ports() const -const device_type ISA8_AGA_PC200 = &device_creator; +const device_type ISA8_AGA_PC200 = device_creator; //------------------------------------------------- // isa8_aga_pc200_device - constructor diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp index 9218b7cf08c..0ca3b9ca80e 100644 --- a/src/devices/bus/isa/aha1542.cpp +++ b/src/devices/bus/isa/aha1542.cpp @@ -134,7 +134,7 @@ #define CMD_EXTBIOS 0x28 // return extended BIOS information #define CMD_MBENABLE 0x29 // set mailbox interface enable -const device_type AHA1542 = &device_creator; +const device_type AHA1542 = device_creator; #define Z84C0010_TAG "u5" diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 99f446b7524..f44cdfb5900 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -273,7 +273,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_CGA = &device_creator; +const device_type ISA8_CGA = device_creator; //------------------------------------------------- // machine_config_additions - device-specific @@ -439,7 +439,7 @@ uint32_t isa8_cga_device::screen_update(screen_device &screen, bitmap_rgb32 &bit } -const device_type ISA8_CGA_POISK2 = &device_creator; +const device_type ISA8_CGA_POISK2 = device_creator; //------------------------------------------------- // isa8_cga_poisk2_device - constructor @@ -468,7 +468,7 @@ const tiny_rom_entry *isa8_cga_poisk2_device::device_rom_region() const /* for superimposing CGA over a different source video (i.e. tetriskr) */ -const device_type ISA8_CGA_SUPERIMPOSE = &device_creator; +const device_type ISA8_CGA_SUPERIMPOSE = device_creator; //------------------------------------------------- // isa8_cga_superimpose_device - constructor @@ -1538,7 +1538,7 @@ WRITE8_MEMBER( isa8_cga_pc1512_device::vram_w ) } -const device_type ISA8_CGA_PC1512 = &device_creator; +const device_type ISA8_CGA_PC1512 = device_creator; const offs_t isa8_cga_pc1512_device::vram_offset[4]= { 0x0000, 0x4000, 0x8000, 0xC000 }; const uint8_t isa8_cga_pc1512_device::mc6845_writeonce_register[31] = @@ -1673,7 +1673,7 @@ READ8_MEMBER( isa8_wyse700_device::io_read ) } -const device_type ISA8_WYSE700 = &device_creator; +const device_type ISA8_WYSE700 = device_creator; //------------------------------------------------- @@ -1762,7 +1762,7 @@ uint32_t isa8_wyse700_device::screen_update(screen_device &screen, bitmap_rgb32 } -const device_type ISA8_EC1841_0002 = &device_creator; +const device_type ISA8_EC1841_0002 = device_creator; //------------------------------------------------- // isa8_ec1841_0002_device - constructor @@ -1848,7 +1848,7 @@ READ8_MEMBER( isa8_ec1841_0002_device::io_read ) return data; } -const device_type ISA8_CGA_MC1502 = &device_creator; +const device_type ISA8_CGA_MC1502 = device_creator; //------------------------------------------------- // isa8_cga_mc1502_device - constructor @@ -1877,7 +1877,7 @@ const tiny_rom_entry *isa8_cga_iskr1031_device::device_rom_region() const return ROM_NAME( cga_iskr1031 ); } -const device_type ISA8_CGA_ISKR1031 = &device_creator; +const device_type ISA8_CGA_ISKR1031 = device_creator; //------------------------------------------------- // isa8_cga_iskr1031_device - constructor @@ -1902,7 +1902,7 @@ const tiny_rom_entry *isa8_cga_iskr1030m_device::device_rom_region() const return ROM_NAME( cga_iskr1030m ); } -const device_type ISA8_CGA_ISKR1030M = &device_creator; +const device_type ISA8_CGA_ISKR1030M = device_creator; //------------------------------------------------- // isa8_cga_iskr1030m_device - constructor @@ -1926,7 +1926,7 @@ const tiny_rom_entry *isa8_cga_mc1502_device::device_rom_region() const return ROM_NAME( mc1502 ); } -const device_type ISA8_CGA_M24 = &device_creator; +const device_type ISA8_CGA_M24 = device_creator; static MACHINE_CONFIG_DERIVED( m24, cga ) MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME) diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index 5d253340a50..2b34695cc83 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -1,12 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol -#pragma once +#ifndef MAME_DEVICE_BUS_ISA_CGA_H +#define MAME_DEVICE_BUS_ISA_CGA_H -#ifndef __ISA_CGA_H__ -#define __ISA_CGA_H__ +#pragma once #include "isa.h" #include "video/mc6845.h" +#include "screen.h" + //************************************************************************** // TYPE DEFINITIONS @@ -285,4 +287,4 @@ private: // device type definition extern const device_type ISA8_CGA_M24; -#endif /* __ISA_CGA_H__ */ +#endif // MAME_DEVICE_BUS_ISA_CGA_H diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index b3ebd9f7d41..bce1eab2120 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -76,7 +76,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_COM = &device_creator; +const device_type ISA8_COM = device_creator; //------------------------------------------------- // machine_config_additions - device-specific @@ -173,7 +173,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_COM_AT = &device_creator; +const device_type ISA8_COM_AT = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 958fb139920..5995db6b5a2 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -2,9 +2,12 @@ // copyright-holders:Carl #include "emu.h" #include "dectalk.h" + #include "sound/volt_reg.h" +#include "speaker.h" + -const device_type ISA8_DECTALK = &device_creator; +const device_type ISA8_DECTALK = device_creator; dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) : device_t(mconfig, ISA8_DECTALK, "DECTalk-PC", tag, owner, clock, "dectalk_isa", __FILE__), diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index e782c18573b..74ce338e480 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -446,6 +446,9 @@ located at I/O port 0x3CE, and a data register located at I/O port 0x3CF. #include "emu.h" #include "ega.h" +#include "screen.h" + + #define VERBOSE_EGA 1 #define EGA_SCREEN_NAME "ega_screen" @@ -535,7 +538,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_EGA = &device_creator; +const device_type ISA8_EGA = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp index 807e9cfebc5..a6b6cdd19ca 100644 --- a/src/devices/bus/isa/fdc.cpp +++ b/src/devices/bus/isa/fdc.cpp @@ -160,8 +160,8 @@ machine_config_constructor isa8_fdc_superio_device::device_mconfig_additions() c return MACHINE_CONFIG_NAME(cfg_superio); } -const device_type ISA8_FDC_XT = &device_creator; -const device_type ISA8_FDC_AT = &device_creator; -const device_type ISA8_FDC_SMC = &device_creator; -const device_type ISA8_FDC_PS2 = &device_creator; -const device_type ISA8_FDC_SUPERIO = &device_creator; +const device_type ISA8_FDC_XT = device_creator; +const device_type ISA8_FDC_AT = device_creator; +const device_type ISA8_FDC_SMC = device_creator; +const device_type ISA8_FDC_PS2 = device_creator; +const device_type ISA8_FDC_SUPERIO = device_creator; diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp index 53001ee026b..00ce6f31a92 100644 --- a/src/devices/bus/isa/finalchs.cpp +++ b/src/devices/bus/isa/finalchs.cpp @@ -69,7 +69,7 @@ WRITE8_MEMBER( isa8_finalchs_device::finalchs_w ) // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_FINALCHS = &device_creator; +const device_type ISA8_FINALCHS = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp index 59bd7086b85..9ff7d0d9f3c 100644 --- a/src/devices/bus/isa/gblaster.cpp +++ b/src/devices/bus/isa/gblaster.cpp @@ -8,7 +8,9 @@ #include "emu.h" #include "gblaster.h" -#include "sound/speaker.h" + +#include "sound/spkrdev.h" +#include "speaker.h" /* creative labs game blaster (CMS creative music system) @@ -76,7 +78,7 @@ WRITE8_MEMBER( isa8_gblaster_device::detect_w ) // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_GAME_BLASTER = &device_creator; +const device_type ISA8_GAME_BLASTER = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index e956a11abc2..a81a2f7a57f 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -9,8 +9,10 @@ #include "emu.h" #include "gus.h" + #include "bus/midi/midi.h" #include "machine/clock.h" +#include "speaker.h" //************************************************************************** @@ -34,8 +36,8 @@ static const uint16_t volume_ramp_table[4] = 1, 8, 64, 512 }; -const device_type GGF1 = &device_creator; -const device_type ISA16_GUS = &device_creator; +const device_type GGF1 = device_creator; +const device_type ISA16_GUS = device_creator; #ifdef LOG_SOUND FILE* f; diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 10bd50349d0..798f9a5d362 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -157,9 +157,9 @@ static INPUT_PORTS_START( isa_hdc ) PORT_DIPSETTING( 0x00, DEF_STR(No) ) INPUT_PORTS_END -const device_type XT_HDC = &device_creator; -const device_type EC1841_HDC = &device_creator; -const device_type ST11M_HDC = &device_creator; +const device_type XT_HDC = device_creator; +const device_type EC1841_HDC = device_creator; +const device_type ST11M_HDC = device_creator; xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), buffer_ptr(nullptr), csb(0), status(0), error(0), m_current_cmd(0), @@ -928,8 +928,8 @@ void xt_hdc_device::set_ready() // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_HDC = &device_creator; -const device_type ISA8_HDC_EC1841 = &device_creator; +const device_type ISA8_HDC = device_creator; +const device_type ISA8_HDC_EC1841 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index 223af4ed0dd..2b1b5f17fcb 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -18,9 +18,11 @@ #include "emu.h" #include "ibm_mfc.h" + #include "cpu/z80/z80.h" #include "machine/clock.h" #include "machine/pit8253.h" +#include "speaker.h" //------------------------------------------------- @@ -61,7 +63,7 @@ enum // Globals //------------------------------------------------- -const device_type ISA8_IBM_MFC = &device_creator; +const device_type ISA8_IBM_MFC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp index 9d32d017496..d932543a586 100644 --- a/src/devices/bus/isa/ide.cpp +++ b/src/devices/bus/isa/ide.cpp @@ -8,8 +8,11 @@ #include "emu.h" #include "ide.h" -#include "machine/idectrl.h" + #include "imagedev/harddriv.h" +#include "machine/idectrl.h" +#include "speaker.h" + READ8_MEMBER(isa16_ide_device::ide16_alt_r ) { @@ -70,7 +73,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_IDE = &device_creator; +const device_type ISA16_IDE = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 86c6a4f9687..17cbf8fc770 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -14,7 +14,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_SLOT = &device_creator; +const device_type ISA8_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -64,7 +64,7 @@ void isa8_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_SLOT = &device_creator; +const device_type ISA16_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -100,7 +100,7 @@ void isa16_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8 = &device_creator; +const device_type ISA8 = device_creator; void isa8_device::static_set_cputag(device_t &device, const char *tag) { @@ -455,7 +455,7 @@ void device_isa8_card_interface::set_isa_device() } -const device_type ISA16 = &device_creator; +const device_type ISA16 = device_creator; //------------------------------------------------- // isa16_device - constructor diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp index 6d43df86307..5f1e0f24917 100644 --- a/src/devices/bus/isa/lpt.cpp +++ b/src/devices/bus/isa/lpt.cpp @@ -10,7 +10,7 @@ #include "lpt.h" #include "machine/pc_lpt.h" -const device_type ISA8_LPT = &device_creator; +const device_type ISA8_LPT = device_creator; isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__), diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 716abcade1f..a40503f8769 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -12,10 +12,13 @@ #include "emu.h" #include "mach32.h" -const device_type ATIMACH32 = &device_creator; -const device_type ATIMACH32_8514A = &device_creator; -const device_type ATIMACH64 = &device_creator; -const device_type ATIMACH64_8514A = &device_creator; +#include "screen.h" + + +const device_type ATIMACH32 = device_creator; +const device_type ATIMACH32_8514A = device_creator; +const device_type ATIMACH64 = device_creator; +const device_type ATIMACH64_8514A = device_creator; /* diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index 7232cfb8236..6f514c7e3f3 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -29,7 +29,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MC1502_FDC = &device_creator; +const device_type MC1502_FDC = device_creator; FLOPPY_FORMATS_MEMBER( mc1502_fdc_device::floppy_formats ) FLOPPY_PC_FORMAT diff --git a/src/devices/bus/isa/mc1502_rom.cpp b/src/devices/bus/isa/mc1502_rom.cpp index 99aa8e5d84d..cbc36c38e18 100644 --- a/src/devices/bus/isa/mc1502_rom.cpp +++ b/src/devices/bus/isa/mc1502_rom.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MC1502_ROM = &device_creator; +const device_type MC1502_ROM = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/mcd.cpp b/src/devices/bus/isa/mcd.cpp index 5cd0b6bf378..d31896f43f0 100644 --- a/src/devices/bus/isa/mcd.cpp +++ b/src/devices/bus/isa/mcd.cpp @@ -17,7 +17,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_MCD = &device_creator; +const device_type ISA16_MCD = device_creator; //------------------------------------------------- // input_ports - device-specific input ports diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index 6887372003b..e311ce1c1ee 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -8,8 +8,11 @@ #include "emu.h" #include "mda.h" -#include "video/mc6845.h" + #include "machine/pc_lpt.h" +#include "video/mc6845.h" +#include "screen.h" + #define MDA_SCREEN_NAME "mda_screen" #define MDA_MC6845_NAME "mc6845_mda" @@ -120,7 +123,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_MDA = &device_creator; +const device_type ISA8_MDA = device_creator; //------------------------------------------------- @@ -558,7 +561,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_HERCULES = &device_creator; +const device_type ISA8_HERCULES = device_creator; //------------------------------------------------- // machine_config_additions - device-specific @@ -776,7 +779,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_ec1840_0002 ) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_mda_device, vsync_changed)) MACHINE_CONFIG_END -const device_type ISA8_EC1840_0002 = &device_creator; +const device_type ISA8_EC1840_0002 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp index bb80e14d7e1..2690f6e333f 100644 --- a/src/devices/bus/isa/mpu401.cpp +++ b/src/devices/bus/isa/mpu401.cpp @@ -45,7 +45,7 @@ WRITE_LINE_MEMBER( isa8_mpu401_device::mpu_irq_out ) // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_MPU401 = &device_creator; +const device_type ISA8_MPU401 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp index 87f9e668968..3a88ce16ec7 100644 --- a/src/devices/bus/isa/mufdc.cpp +++ b/src/devices/bus/isa/mufdc.cpp @@ -24,8 +24,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ISA8_FDC344 = &device_creator; -const device_type ISA8_FDCMAG = &device_creator; +const device_type ISA8_FDC344 = device_creator; +const device_type ISA8_FDCMAG = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp index ed4b46df88e..9f4e61491a3 100644 --- a/src/devices/bus/isa/ne1000.cpp +++ b/src/devices/bus/isa/ne1000.cpp @@ -10,7 +10,7 @@ static MACHINE_CONFIG_FRAGMENT(ne1000_config) MCFG_DP8390D_MEM_WRITE_CB(WRITE8(ne1000_device, ne1000_mem_write)) MACHINE_CONFIG_END -const device_type NE1000 = &device_creator; +const device_type NE1000 = device_creator; machine_config_constructor ne1000_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(ne1000_config); diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp index 8a6e44b8ced..d53564cb59f 100644 --- a/src/devices/bus/isa/ne2000.cpp +++ b/src/devices/bus/isa/ne2000.cpp @@ -11,7 +11,7 @@ static MACHINE_CONFIG_FRAGMENT(ne2000_config) MCFG_DP8390D_MEM_WRITE_CB(WRITE8(ne2000_device, ne2000_mem_write)) MACHINE_CONFIG_END -const device_type NE2000 = &device_creator; +const device_type NE2000 = device_creator; machine_config_constructor ne2000_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME(ne2000_config); diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index 69a4641206b..c2ee133c394 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -5,12 +5,14 @@ #include "emu.h" #include "num9rev.h" +#include "screen.h" + //************************************************************************** // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_NUM_9_REV = &device_creator; +const device_type ISA8_NUM_9_REV = device_creator; static ADDRESS_MAP_START( upd7220_map, AS_0, 16, isa8_number_9_rev_device ) AM_RANGE(0x00000, 0x3ffff) AM_NOP diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 096179a4d7e..f6c3bfff8d8 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -375,14 +375,14 @@ void omti8621_device::device_reset() alternate_track_address[1] = 0; } -const device_type ISA16_OMTI8621 = &device_creator; +const device_type ISA16_OMTI8621 = device_creator; omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : omti8621_device(mconfig, ISA16_OMTI8621, tag, owner, clock) { } -const device_type ISA16_OMTI8621_APOLLO = &device_creator; +const device_type ISA16_OMTI8621_APOLLO = device_creator; omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, tag, owner, clock) @@ -1309,7 +1309,7 @@ void omti8621_device::eop_w(int state) //########################################################################## // device type definition -const device_type OMTI_DISK = &device_creator; +const device_type OMTI_DISK = device_creator; omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, OMTI_DISK, "OMTI8621 ESDI disk", tag, owner, clock, "omti_disk_image", __FILE__), diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index 2c537923cdc..4cca541298a 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -29,7 +29,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type P1_FDC = &device_creator; +const device_type P1_FDC = device_creator; FLOPPY_FORMATS_MEMBER( p1_fdc_device::floppy_formats ) FLOPPY_PC_FORMAT diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp index 963a8b14b78..47ab6ed6853 100644 --- a/src/devices/bus/isa/p1_hdc.cpp +++ b/src/devices/bus/isa/p1_hdc.cpp @@ -33,7 +33,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type P1_HDC = &device_creator; +const device_type P1_HDC = device_creator; static MACHINE_CONFIG_FRAGMENT( hdc_b942 ) MCFG_DEVICE_ADD(KM1809VG7_TAG, WD2010, 5000000) // XXX clock? diff --git a/src/devices/bus/isa/p1_rom.cpp b/src/devices/bus/isa/p1_rom.cpp index 80aefe011e7..48d61233895 100644 --- a/src/devices/bus/isa/p1_rom.cpp +++ b/src/devices/bus/isa/p1_rom.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type P1_ROM = &device_creator; +const device_type P1_ROM = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index a1afa847a6b..4a173a8db47 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -13,13 +13,16 @@ #include "emu.h" #include "p1_sound.h" + #include "sound/volt_reg.h" +#include "speaker.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type P1_SOUND = &device_creator; +const device_type P1_SOUND = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/pc1640_iga.cpp b/src/devices/bus/isa/pc1640_iga.cpp index 5511d21ca42..69d3e037edf 100644 --- a/src/devices/bus/isa/pc1640_iga.cpp +++ b/src/devices/bus/isa/pc1640_iga.cpp @@ -36,7 +36,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ISA8_PC1640_IGA = &device_creator; +const device_type ISA8_PC1640_IGA = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp index 9b10e9c31b7..f4567c234e2 100644 --- a/src/devices/bus/isa/pds.cpp +++ b/src/devices/bus/isa/pds.cpp @@ -19,7 +19,7 @@ #include "emu.h" #include "pds.h" -const device_type ISA8_PDS = &device_creator; +const device_type ISA8_PDS = device_creator; isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ISA8_PDS, "Programmers Development System", tag, owner, clock, "isa_pds", __FILE__), diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 8225c4724fc..3d004231fbf 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -27,9 +27,11 @@ ***************************************************************************/ #include "emu.h" - #include "pgc.h" +#include "screen.h" + + #define VERBOSE_PGC 1 #define DBG_LOG(N,M,A) \ @@ -164,7 +166,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_PGC = &device_creator; +const device_type ISA8_PGC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 7812b38db69..b9df7bca59b 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -14,12 +14,15 @@ #include "emu.h" #include "s3virge.h" -#define CRTC_PORT_ADDR ((vga.miscellaneous_output&1)?0x3d0:0x3b0) +#include "screen.h" + + +#define CRTC_PORT_ADDR ((vga.miscellaneous_output & 1) ? 0x3d0 : 0x3b0) #define LOG_REG 1 -const device_type S3VIRGE = &device_creator; -const device_type S3VIRGEDX = &device_creator; -const device_type S3VIRGEDX1 = &device_creator; +const device_type S3VIRGE = device_creator; +const device_type S3VIRGEDX = device_creator; +const device_type S3VIRGEDX1 = device_creator; s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : s3_vga_device(mconfig, S3VIRGE, "S3 86C325", tag, owner, clock, "virge_vga", __FILE__) diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index bcd4d635ec1..f820f707adb 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -9,7 +9,10 @@ #include "emu.h" #include "sb16.h" -const device_type ISA16_SB16 = &device_creator; +#include "speaker.h" + + +const device_type ISA16_SB16 = device_creator; READ8_MEMBER( sb16_lle_device::dsp_data_r ) { diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 7288f654e90..64998b89a71 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -13,11 +13,15 @@ #include "emu.h" #include "sblaster.h" + #include "machine/pic8259.h" -#include "sound/speaker.h" #include "sound/262intf.h" +#include "sound/spkrdev.h" #include "sound/volt_reg.h" +#include "speaker.h" + + /* adlib (YM3812/OPL2 chip), part of many many soundcards (soundblaster) soundblaster: YM3812 also accessible at 0x228/9 (address jumperable) @@ -1190,9 +1194,9 @@ ioport_constructor sb16_device::device_input_ports() const // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_SOUND_BLASTER_1_0 = &device_creator; -const device_type ISA8_SOUND_BLASTER_1_5 = &device_creator; -const device_type ISA16_SOUND_BLASTER_16 = &device_creator; +const device_type ISA8_SOUND_BLASTER_1_0 = device_creator; +const device_type ISA8_SOUND_BLASTER_1_5 = device_creator; +const device_type ISA16_SOUND_BLASTER_16 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index 3d197791861..bc5525a2809 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -190,7 +190,7 @@ machine_config_constructor sc499_device::device_mconfig_additions() const // DEVICE DEFINITIONS //************************************************************************** -const device_type ISA8_SC499 = &device_creator; +const device_type ISA8_SC499 = device_creator; //************************************************************************** // CONSTANTS @@ -309,7 +309,7 @@ const device_type ISA8_SC499 = &device_creator; ***************************************************************************/ // device type definition -const device_type SC499 = &device_creator; +const device_type SC499 = device_creator; //------------------------------------------------- // sc499_device - constructor @@ -1301,7 +1301,7 @@ void sc499_device::block_set_filemark() //########################################################################## -const device_type SC499_CTAPE = &device_creator; +const device_type SC499_CTAPE = device_creator; sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SC499_CTAPE, "Cartridge Tape", tag, owner, clock, "sc499_ctape", __FILE__), diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp index 463e882896b..785703f07f8 100644 --- a/src/devices/bus/isa/side116.cpp +++ b/src/devices/bus/isa/side116.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ISA8_SIDE116 = &device_creator; +const device_type ISA8_SIDE116 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp index dd0ad8ad5b7..1d2669c8420 100644 --- a/src/devices/bus/isa/ssi2001.cpp +++ b/src/devices/bus/isa/ssi2001.cpp @@ -5,7 +5,10 @@ #include "emu.h" #include "ssi2001.h" -const device_type ISA8_SSI2001 = &device_creator; +#include "speaker.h" + + +const device_type ISA8_SSI2001 = device_creator; static MACHINE_CONFIG_FRAGMENT( ssi2001 ) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index fe83c94cf73..079c4d15b75 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -6,10 +6,13 @@ #include "emu.h" #include "stereo_fx.h" + #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + -const device_type ISA8_STEREO_FX = &device_creator; +const device_type ISA8_STEREO_FX = device_creator; READ8_MEMBER( stereo_fx_device::dev_dsp_data_r ) { diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index 1343d08e612..f5f117e76bb 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -9,6 +9,9 @@ #include "emu.h" #include "svga_cirrus.h" +#include "screen.h" + + ROM_START( dm_clgd5430 ) ROM_REGION(0x8000,"dm_clgd5430", 0) ROM_LOAD("speedstar_pro_se_v1.00.u2", 0x00000, 0x8000, CRC(ed79572c) SHA1(15131e2b2db7a34971083a250e4a21ab7bd64a9d) ) @@ -19,8 +22,8 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_SVGA_CIRRUS = &device_creator; -const device_type ISA16_SVGA_CIRRUS_GD542X = &device_creator; +const device_type ISA16_SVGA_CIRRUS = device_creator; +const device_type ISA16_SVGA_CIRRUS_GD542X = device_creator; static MACHINE_CONFIG_FRAGMENT( vga_cirrus ) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index cf539a0b8e3..1414022b132 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -9,6 +9,9 @@ #include "emu.h" #include "svga_s3.h" +#include "screen.h" + + ROM_START( s3_764 ) ROM_REGION(0x8000,"s3_764", 0) ROM_DEFAULT_BIOS("9fxv330") @@ -30,7 +33,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_SVGA_S3 = &device_creator; +const device_type ISA16_SVGA_S3 = device_creator; static MACHINE_CONFIG_FRAGMENT( vga_s3 ) @@ -142,7 +145,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_S3VIRGE = &device_creator; +const device_type ISA16_S3VIRGE = device_creator; static MACHINE_CONFIG_FRAGMENT( vga_s3virge ) @@ -239,7 +242,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_S3VIRGEDX = &device_creator; +const device_type ISA16_S3VIRGEDX = device_creator; //------------------------------------------------- @@ -327,7 +330,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_DMS3D2KPRO = &device_creator; +const device_type ISA16_DMS3D2KPRO = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index e12eb1153c8..505737ec8e6 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -10,6 +10,8 @@ #include "svga_trident.h" #include "video/pc_vga.h" +#include "screen.h" + ROM_START( tgui9680 ) ROM_REGION( 0x8000, "tgui9680", 0 ) @@ -21,7 +23,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_SVGA_TGUI9680 = &device_creator; +const device_type ISA16_SVGA_TGUI9680 = device_creator; static MACHINE_CONFIG_FRAGMENT( vga_trident ) diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index c71a6f9a82c..8fa56a6c4ff 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -10,6 +10,9 @@ #include "svga_tseng.h" #include "video/pc_vga.h" +#include "screen.h" + + ROM_START( et4000 ) ROM_REGION(0x8000,"et4000", 0) ROM_LOAD("et4000.bin", 0x00000, 0x8000, CRC(f1e817a8) SHA1(945d405b0fb4b8f26830d495881f8587d90e5ef9) ) @@ -19,7 +22,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_SVGA_ET4K = &device_creator; +const device_type ISA8_SVGA_ET4K = device_creator; static MACHINE_CONFIG_FRAGMENT( vga_tseng ) diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp index 5f97774ceba..72ff1f21fbd 100644 --- a/src/devices/bus/isa/trident.cpp +++ b/src/devices/bus/isa/trident.cpp @@ -10,10 +10,13 @@ #include "emu.h" #include "trident.h" + #include "debugger.h" +#include "screen.h" + -const device_type TRIDENT_VGA = &device_creator; -const device_type TVGA9000_VGA = &device_creator; +const device_type TRIDENT_VGA = device_creator; +const device_type TVGA9000_VGA = device_creator; #define CRTC_PORT_ADDR ((vga.miscellaneous_output&1)?0x3d0:0x3b0) diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp index 371ec5d899c..24c7d457958 100644 --- a/src/devices/bus/isa/vga.cpp +++ b/src/devices/bus/isa/vga.cpp @@ -19,7 +19,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_VGA = &device_creator; +const device_type ISA8_VGA = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index 57be162e365..1b0238d77ab 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -18,7 +18,10 @@ #include "emu.h" #include "vga_ati.h" #include "mach32.h" + #include "video/pc_vga.h" +#include "screen.h" + ROM_START( gfxultra ) ROM_REGION(0x8000,"gfxultra", 0) @@ -65,9 +68,9 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA16_VGA_GFXULTRA = &device_creator; -const device_type ISA16_SVGA_GFXULTRAPRO = &device_creator; -const device_type ISA16_SVGA_MACH64 = &device_creator; +const device_type ISA16_VGA_GFXULTRA = device_creator; +const device_type ISA16_SVGA_GFXULTRAPRO = device_creator; +const device_type ISA16_SVGA_MACH64 = device_creator; static MACHINE_CONFIG_FRAGMENT( vga_ati ) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/devices/bus/isa/wd1002a_wx1.cpp b/src/devices/bus/isa/wd1002a_wx1.cpp index 1c5cb2a8674..4ce188fda51 100644 --- a/src/devices/bus/isa/wd1002a_wx1.cpp +++ b/src/devices/bus/isa/wd1002a_wx1.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ISA8_WD1002A_WX1 = &device_creator; +const device_type ISA8_WD1002A_WX1 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp index f6f5f788168..d2f106092ae 100644 --- a/src/devices/bus/isa/wdxt_gen.cpp +++ b/src/devices/bus/isa/wdxt_gen.cpp @@ -62,7 +62,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ISA8_WDXT_GEN = &device_creator; +const device_type ISA8_WDXT_GEN = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp index b6f1150531e..a0e339be11e 100644 --- a/src/devices/bus/isa/xtide.cpp +++ b/src/devices/bus/isa/xtide.cpp @@ -262,7 +262,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type ISA8_XTIDE = &device_creator; +const device_type ISA8_XTIDE = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp index 0bd66ba6937..6f06976e925 100644 --- a/src/devices/bus/isbx/compis_fdc.cpp +++ b/src/devices/bus/isbx/compis_fdc.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMPIS_FDC = &device_creator; +const device_type COMPIS_FDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp index 1444d54bea7..4537dbd6261 100644 --- a/src/devices/bus/isbx/isbc_218a.cpp +++ b/src/devices/bus/isbx/isbc_218a.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ISBC_218A = &device_creator; +const device_type ISBC_218A = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/isbx/isbx.cpp b/src/devices/bus/isbx/isbx.cpp index 17d696317ce..6746969a5b7 100644 --- a/src/devices/bus/isbx/isbx.cpp +++ b/src/devices/bus/isbx/isbx.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ISBX_SLOT = &device_creator; +const device_type ISBX_SLOT = device_creator; diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp index 10d2290344f..d36ada24b53 100644 --- a/src/devices/bus/kc/d002.cpp +++ b/src/devices/bus/kc/d002.cpp @@ -98,7 +98,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type KC_D002 = &device_creator; +const device_type KC_D002 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index d698ec9b970..1a08758310e 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -117,8 +117,8 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type KC_D004 = &device_creator; -const device_type KC_D004_GIDE = &device_creator; +const device_type KC_D004 = device_creator; +const device_type KC_D004_GIDE = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/kc/kc.cpp b/src/devices/bus/kc/kc.cpp index 5ac9a424bd0..bcdef85b8a4 100644 --- a/src/devices/bus/kc/kc.cpp +++ b/src/devices/bus/kc/kc.cpp @@ -118,8 +118,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type KCEXP_SLOT = &device_creator; -const device_type KCCART_SLOT = &device_creator; +const device_type KCEXP_SLOT = device_creator; +const device_type KCCART_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp index 577d0c0a194..ed55a3a9784 100644 --- a/src/devices/bus/kc/ram.cpp +++ b/src/devices/bus/kc/ram.cpp @@ -27,12 +27,12 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type KC_M011 = &device_creator; -const device_type KC_M022 = &device_creator; -const device_type KC_M032 = &device_creator; -const device_type KC_M034 = &device_creator; -const device_type KC_M035 = &device_creator; -const device_type KC_M036 = &device_creator; +const device_type KC_M011 = device_creator; +const device_type KC_M022 = device_creator; +const device_type KC_M032 = device_creator; +const device_type KC_M034 = device_creator; +const device_type KC_M035 = device_creator; +const device_type KC_M036 = device_creator; //************************************************************************** // M011 64KB RAM diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp index 6c2c4b85292..027b7347398 100644 --- a/src/devices/bus/kc/rom.cpp +++ b/src/devices/bus/kc/rom.cpp @@ -30,9 +30,9 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type KC_STANDARD = &device_creator; -const device_type KC_M006 = &device_creator; -const device_type KC_M033 = &device_creator; +const device_type KC_STANDARD = device_creator; +const device_type KC_M006 = device_creator; +const device_type KC_M033 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp index 49d216845b7..611965d0419 100644 --- a/src/devices/bus/lpci/cirrus.cpp +++ b/src/devices/bus/lpci/cirrus.cpp @@ -73,7 +73,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CIRRUS = &device_creator; +const device_type CIRRUS = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/lpci/i82371ab.cpp b/src/devices/bus/lpci/i82371ab.cpp index 23b3b81121d..80c711f5f13 100644 --- a/src/devices/bus/lpci/i82371ab.cpp +++ b/src/devices/bus/lpci/i82371ab.cpp @@ -19,7 +19,7 @@ #include "emu.h" #include "i82371ab.h" -const device_type I82371AB = &device_creator; +const device_type I82371AB = device_creator; i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/lpci/i82371sb.cpp b/src/devices/bus/lpci/i82371sb.cpp index b57cea2bbd0..1193ed8d64e 100644 --- a/src/devices/bus/lpci/i82371sb.cpp +++ b/src/devices/bus/lpci/i82371sb.cpp @@ -24,7 +24,7 @@ IMPLEMENTATION ***************************************************************************/ -const device_type I82371SB = &device_creator; +const device_type I82371SB = device_creator; i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp index 03abcef7b2c..568cba45c08 100644 --- a/src/devices/bus/lpci/i82439tx.cpp +++ b/src/devices/bus/lpci/i82439tx.cpp @@ -13,7 +13,7 @@ IMPLEMENTATION ***************************************************************************/ -const device_type I82439TX = &device_creator; +const device_type I82439TX = device_creator; i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp index cbe94911a6b..45958b4196c 100644 --- a/src/devices/bus/lpci/mpc105.cpp +++ b/src/devices/bus/lpci/mpc105.cpp @@ -18,7 +18,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MPC105 = &device_creator; +const device_type MPC105 = device_creator; //************************************************************************** diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp index 710d04c35af..19e3d3ed63c 100644 --- a/src/devices/bus/lpci/pci.cpp +++ b/src/devices/bus/lpci/pci.cpp @@ -80,7 +80,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PCI_BUS = &device_creator; +const device_type PCI_BUS = device_creator; //************************************************************************** // LIVE DEVICE @@ -311,7 +311,7 @@ pci_device_interface::~pci_device_interface() } -const device_type PCI_CONNECTOR = &device_creator; +const device_type PCI_CONNECTOR = device_creator; pci_connector::pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 1bc7de119e1..362f5053295 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -7,9 +7,11 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/i386/i386.h" #include "southbridge.h" + #include "bus/pc_kbd/keyboards.h" +#include "cpu/i386/i386.h" +#include "speaker.h" static SLOT_INTERFACE_START(pc_isa_onboard) diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index 3ea83ef84af..f5e78c1af9e 100644 --- a/src/devices/bus/lpci/southbridge.h +++ b/src/devices/bus/lpci/southbridge.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic -#pragma once +#ifndef MAME_BUS_LPCI_SOUTHBRIDGE_H +#define MAME_BUS_LPCI_SOUTHBRIDGE_H -#ifndef __SOUTHBRIDGE_H__ -#define __SOUTHBRIDGE_H__ +#pragma once #include "machine/ins8250.h" @@ -17,7 +17,7 @@ #include "imagedev/harddriv.h" #include "pci.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "machine/ram.h" #include "machine/nvram.h" #include "bus/isa/isa.h" @@ -126,4 +126,4 @@ protected: void pc_select_dma_channel(int channel, bool state); }; -#endif /* __SOUTHBRIDGE_H__ */ +#endif // MAME_BUS_LPCI_SOUTHBRIDGE_H diff --git a/src/devices/bus/lpci/vt82c505.cpp b/src/devices/bus/lpci/vt82c505.cpp index a5adef41f5b..d6e2ea56302 100644 --- a/src/devices/bus/lpci/vt82c505.cpp +++ b/src/devices/bus/lpci/vt82c505.cpp @@ -14,7 +14,7 @@ IMPLEMENTATION ***************************************************************************/ -const device_type VT82C505 = &device_creator; +const device_type VT82C505 = device_creator; vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/m5/rom.cpp b/src/devices/bus/m5/rom.cpp index 8d326e05d8b..7ca9a2400d1 100644 --- a/src/devices/bus/m5/rom.cpp +++ b/src/devices/bus/m5/rom.cpp @@ -17,8 +17,8 @@ // m5_rom_device - constructor //------------------------------------------------- -const device_type M5_ROM_STD = &device_creator; -const device_type M5_ROM_RAM = &device_creator; +const device_type M5_ROM_STD = device_creator; +const device_type M5_ROM_RAM = device_creator; m5_rom_device::m5_rom_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) diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp index 9498e473322..3efed6adaf7 100644 --- a/src/devices/bus/m5/slot.cpp +++ b/src/devices/bus/m5/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type M5_CART_SLOT = &device_creator; +const device_type M5_CART_SLOT = device_creator; //************************************************************************** // M5 Cartridges Interface diff --git a/src/devices/bus/macpds/macpds.cpp b/src/devices/bus/macpds/macpds.cpp index 7757c622cbb..b28f864bb80 100644 --- a/src/devices/bus/macpds/macpds.cpp +++ b/src/devices/bus/macpds/macpds.cpp @@ -16,7 +16,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type MACPDS_SLOT = &device_creator; +const device_type MACPDS_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -61,7 +61,7 @@ void macpds_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type MACPDS = &device_creator; +const device_type MACPDS = device_creator; void macpds_device::static_set_cputag(device_t &device, const char *tag) { diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp index ed4d2259821..6b3260f74f5 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.cpp +++ b/src/devices/bus/macpds/pds_tpdfpd.cpp @@ -31,7 +31,10 @@ #include "emu.h" #include "pds_tpdfpd.h" + #include "cpu/m68000/m68000.h" +#include "screen.h" + #define SEDISPLAY_SCREEN_NAME "fpd_screen" #define SEDISPLAY_ROM_REGION "fpd_rom" @@ -56,7 +59,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type PDS_SEDISPLAY = &device_creator; +const device_type PDS_SEDISPLAY = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp index 49132e537e4..128de4da279 100644 --- a/src/devices/bus/megadrive/eeprom.cpp +++ b/src/devices/bus/megadrive/eeprom.cpp @@ -51,13 +51,13 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_STD_EEPROM = &device_creator; -const device_type MD_EEPROM_NBAJAM = &device_creator; -const device_type MD_EEPROM_NBAJAMTE = &device_creator; -const device_type MD_EEPROM_NFLQB = &device_creator; -const device_type MD_EEPROM_CSLAM = &device_creator; -const device_type MD_EEPROM_NHLPA = &device_creator; -const device_type MD_EEPROM_BLARA = &device_creator; +const device_type MD_STD_EEPROM = device_creator; +const device_type MD_EEPROM_NBAJAM = device_creator; +const device_type MD_EEPROM_NBAJAMTE = device_creator; +const device_type MD_EEPROM_NFLQB = device_creator; +const device_type MD_EEPROM_CSLAM = device_creator; +const device_type MD_EEPROM_NHLPA = device_creator; +const device_type MD_EEPROM_BLARA = device_creator; md_std_eeprom_device::md_std_eeprom_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) @@ -378,7 +378,7 @@ WRITE16_MEMBER(md_eeprom_blara_device::write) // TEMPORARY ADDITION UNTIL WE FIND OUT WHAT IS MISSING IN THE CORE X24C02 CODE // THIS IS A CUSTOM I2C EEPROM EMULATION THAT ALLOWS NBA JAM TO WORK -const device_type MD_EEPROM_NBAJAM_ALT = &device_creator; +const device_type MD_EEPROM_NBAJAM_ALT = device_creator; md_eeprom_nbajam_device_alt::md_eeprom_nbajam_device_alt(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM_ALT, "MD NBA Jam (Alt)", tag, owner, clock, "md_eeprom_nbajama", __FILE__) diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp index a8586e087eb..0fa81aa1022 100644 --- a/src/devices/bus/megadrive/ggenie.cpp +++ b/src/devices/bus/megadrive/ggenie.cpp @@ -29,7 +29,7 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_ROM_GAMEGENIE = &device_creator; +const device_type MD_ROM_GAMEGENIE = device_creator; md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp index 43d38e50a60..06ed2720eff 100644 --- a/src/devices/bus/megadrive/jcart.cpp +++ b/src/devices/bus/megadrive/jcart.cpp @@ -35,9 +35,9 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_JCART = &device_creator; -const device_type MD_SEPROM_CODEMAST = &device_creator; -const device_type MD_SEPROM_MM96 = &device_creator; +const device_type MD_JCART = device_creator; +const device_type MD_SEPROM_CODEMAST = device_creator; +const device_type MD_SEPROM_MM96 = device_creator; // Sampras, Super Skidmarks? md_jcart_device::md_jcart_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) diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index b6d864002f5..b363b6222cc 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -51,9 +51,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type MD_CART_SLOT = &device_creator; -const device_type PICO_CART_SLOT = &device_creator; -const device_type COPERA_CART_SLOT = &device_creator; +const device_type MD_CART_SLOT = device_creator; +const device_type PICO_CART_SLOT = device_creator; +const device_type COPERA_CART_SLOT = device_creator; //************************************************************************** // MD cartridges Interface diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp index 772a777d965..bb9e7c4fab0 100644 --- a/src/devices/bus/megadrive/rom.cpp +++ b/src/devices/bus/megadrive/rom.cpp @@ -24,45 +24,45 @@ //------------------------------------------------- // BASE CARTS + NVRAM -const device_type MD_STD_ROM = &device_creator; -const device_type MD_ROM_SRAM = &device_creator; -const device_type MD_ROM_FRAM = &device_creator; +const device_type MD_STD_ROM = device_creator; +const device_type MD_ROM_SRAM = device_creator; +const device_type MD_ROM_FRAM = device_creator; // BASE CARTS + BANKSWITCH AT RESET -const device_type MD_ROM_CM2IN1 = &device_creator; +const device_type MD_ROM_CM2IN1 = device_creator; // BASE CARTS + PROTECTION / BANKSWITCH -const device_type MD_ROM_SSF2 = &device_creator; -const device_type MD_ROM_BUGSLIFE = &device_creator; -const device_type MD_ROM_SMOUSE = &device_creator; -const device_type MD_ROM_SMW64 = &device_creator; -const device_type MD_ROM_SMB = &device_creator; -const device_type MD_ROM_SMB2 = &device_creator; -const device_type MD_ROM_SBUBL = &device_creator; -const device_type MD_ROM_RX3 = &device_creator; -const device_type MD_ROM_MJLOV = &device_creator; -const device_type MD_ROM_CJMJCLUB = &device_creator; -const device_type MD_ROM_KOF98 = &device_creator; -const device_type MD_ROM_KOF99 = &device_creator; -const device_type MD_ROM_SOULB = &device_creator; -const device_type MD_ROM_CHINF3 = &device_creator; -const device_type MD_ROM_16MJ2 = &device_creator; -const device_type MD_ROM_ELFWOR = &device_creator; -const device_type MD_ROM_YASECH = &device_creator; -const device_type MD_ROM_LION2 = &device_creator; -const device_type MD_ROM_LION3 = &device_creator; -const device_type MD_ROM_MCPIR = &device_creator; -const device_type MD_ROM_POKEA = &device_creator; -const device_type MD_ROM_POKESTAD = &device_creator; -const device_type MD_ROM_REALTEC = &device_creator; -const device_type MD_ROM_REDCL = &device_creator; -const device_type MD_ROM_SQUIR = &device_creator; -const device_type MD_ROM_TEKKENSP = &device_creator; -const device_type MD_ROM_TOPF = &device_creator; -const device_type MD_ROM_RADICA = &device_creator; -const device_type MD_ROM_BEGGARP = &device_creator; -const device_type MD_ROM_WUKONG = &device_creator; -const device_type MD_ROM_STARODYS = &device_creator; +const device_type MD_ROM_SSF2 = device_creator; +const device_type MD_ROM_BUGSLIFE = device_creator; +const device_type MD_ROM_SMOUSE = device_creator; +const device_type MD_ROM_SMW64 = device_creator; +const device_type MD_ROM_SMB = device_creator; +const device_type MD_ROM_SMB2 = device_creator; +const device_type MD_ROM_SBUBL = device_creator; +const device_type MD_ROM_RX3 = device_creator; +const device_type MD_ROM_MJLOV = device_creator; +const device_type MD_ROM_CJMJCLUB = device_creator; +const device_type MD_ROM_KOF98 = device_creator; +const device_type MD_ROM_KOF99 = device_creator; +const device_type MD_ROM_SOULB = device_creator; +const device_type MD_ROM_CHINF3 = device_creator; +const device_type MD_ROM_16MJ2 = device_creator; +const device_type MD_ROM_ELFWOR = device_creator; +const device_type MD_ROM_YASECH = device_creator; +const device_type MD_ROM_LION2 = device_creator; +const device_type MD_ROM_LION3 = device_creator; +const device_type MD_ROM_MCPIR = device_creator; +const device_type MD_ROM_POKEA = device_creator; +const device_type MD_ROM_POKESTAD = device_creator; +const device_type MD_ROM_REALTEC = device_creator; +const device_type MD_ROM_REDCL = device_creator; +const device_type MD_ROM_SQUIR = device_creator; +const device_type MD_ROM_TEKKENSP = device_creator; +const device_type MD_ROM_TOPF = device_creator; +const device_type MD_ROM_RADICA = device_creator; +const device_type MD_ROM_BEGGARP = device_creator; +const device_type MD_ROM_WUKONG = device_creator; +const device_type MD_ROM_STARODYS = device_creator; md_std_rom_device::md_std_rom_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) diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp index 5703a2a96ca..8260ae4abf4 100644 --- a/src/devices/bus/megadrive/sk.cpp +++ b/src/devices/bus/megadrive/sk.cpp @@ -24,7 +24,7 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_ROM_SK = &device_creator; +const device_type MD_ROM_SK = device_creator; md_rom_sk_device::md_rom_sk_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) diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp index dded370bdba..05adacac57f 100644 --- a/src/devices/bus/megadrive/stm95.cpp +++ b/src/devices/bus/megadrive/stm95.cpp @@ -172,7 +172,7 @@ void stm95_eeprom_device::set_sck_line(int state) // md_rom_device - constructor //------------------------------------------------- -const device_type MD_EEPROM_STM95 = &device_creator; +const device_type MD_EEPROM_STM95 = device_creator; md_eeprom_stm95_device::md_eeprom_stm95_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) diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp index 8aa370164f2..05ac7f024a2 100644 --- a/src/devices/bus/megadrive/svp.cpp +++ b/src/devices/bus/megadrive/svp.cpp @@ -34,7 +34,7 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_ROM_SVP = &device_creator; +const device_type MD_ROM_SVP = device_creator; md_rom_svp_device::md_rom_svp_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), diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp index ea827d106d2..eb3cd8a2803 100644 --- a/src/devices/bus/midi/midi.cpp +++ b/src/devices/bus/midi/midi.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "midi.h" -const device_type MIDI_PORT = &device_creator; +const device_type MIDI_PORT = device_creator; midi_port_device::midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MIDI_PORT, "Midi Port", tag, owner, clock, "midi_port", __FILE__), diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp index 745999faf79..4ad00742af1 100644 --- a/src/devices/bus/midi/midiinport.cpp +++ b/src/devices/bus/midi/midiinport.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "midiinport.h" -const device_type MIDIIN_PORT = &device_creator; +const device_type MIDIIN_PORT = device_creator; midiin_port_device::midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock, "midiin_port", __FILE__), diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp index 78646ce3394..f9a37ee486d 100644 --- a/src/devices/bus/midi/midioutport.cpp +++ b/src/devices/bus/midi/midioutport.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "midioutport.h" -const device_type MIDIOUT_PORT = &device_creator; +const device_type MIDIOUT_PORT = device_creator; midiout_port_device::midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock, "midiout_port", __FILE__), diff --git a/src/devices/bus/msx_cart/arc.cpp b/src/devices/bus/msx_cart/arc.cpp index 3aa7e52dcdd..b2e0395aadf 100644 --- a/src/devices/bus/msx_cart/arc.cpp +++ b/src/devices/bus/msx_cart/arc.cpp @@ -4,7 +4,7 @@ #include "arc.h" -const device_type MSX_CART_ARC = &device_creator; +const device_type MSX_CART_ARC = device_creator; msx_cart_arc::msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/ascii.cpp b/src/devices/bus/msx_cart/ascii.cpp index dadc92e6606..9263ca01b72 100644 --- a/src/devices/bus/msx_cart/ascii.cpp +++ b/src/devices/bus/msx_cart/ascii.cpp @@ -4,11 +4,11 @@ #include "ascii.h" -const device_type MSX_CART_ASCII8 = &device_creator; -const device_type MSX_CART_ASCII16 = &device_creator; -const device_type MSX_CART_ASCII8_SRAM = &device_creator; -const device_type MSX_CART_ASCII16_SRAM = &device_creator; -const device_type MSX_CART_MSXWRITE = &device_creator; +const device_type MSX_CART_ASCII8 = device_creator; +const device_type MSX_CART_ASCII16 = device_creator; +const device_type MSX_CART_ASCII8_SRAM = device_creator; +const device_type MSX_CART_ASCII16_SRAM = device_creator; +const device_type MSX_CART_MSXWRITE = device_creator; msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp index 0ef22130923..77ddcd71a06 100644 --- a/src/devices/bus/msx_cart/bm_012.cpp +++ b/src/devices/bus/msx_cart/bm_012.cpp @@ -19,7 +19,7 @@ TODO: #include "cpu/z80/z80.h" -const device_type MSX_CART_BM_012 = &device_creator; +const device_type MSX_CART_BM_012 = device_creator; msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/crossblaim.cpp b/src/devices/bus/msx_cart/crossblaim.cpp index 99f081e1eb0..97e875c5432 100644 --- a/src/devices/bus/msx_cart/crossblaim.cpp +++ b/src/devices/bus/msx_cart/crossblaim.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "crossblaim.h" -const device_type MSX_CART_CROSSBLAIM = &device_creator; +const device_type MSX_CART_CROSSBLAIM = device_creator; msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp index e025ae73ce2..2355f8959ca 100644 --- a/src/devices/bus/msx_cart/disk.cpp +++ b/src/devices/bus/msx_cart/disk.cpp @@ -105,10 +105,10 @@ #include "formats/msx_dsk.h" #include "softlist.h" -const device_type MSX_CART_VY0010 = &device_creator; -const device_type MSX_CART_FSFD1 = &device_creator; -const device_type MSX_CART_FSFD1A = &device_creator; -const device_type MSX_CART_FSCF351 = &device_creator; +const device_type MSX_CART_VY0010 = device_creator; +const device_type MSX_CART_FSFD1 = device_creator; +const device_type MSX_CART_FSFD1A = device_creator; +const device_type MSX_CART_FSCF351 = device_creator; FLOPPY_FORMATS_MEMBER( msx_cart_disk::floppy_formats ) diff --git a/src/devices/bus/msx_cart/dooly.cpp b/src/devices/bus/msx_cart/dooly.cpp index 494e1bf7207..05a29131cea 100644 --- a/src/devices/bus/msx_cart/dooly.cpp +++ b/src/devices/bus/msx_cart/dooly.cpp @@ -4,7 +4,7 @@ #include "dooly.h" -const device_type MSX_CART_DOOLY = &device_creator; +const device_type MSX_CART_DOOLY = device_creator; msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp index 0654c27b1fe..3eb388ddb8e 100644 --- a/src/devices/bus/msx_cart/fmpac.cpp +++ b/src/devices/bus/msx_cart/fmpac.cpp @@ -9,8 +9,9 @@ with: PAC2 BACKUP DATA. We only store the raw sram contents. #include "emu.h" #include "fmpac.h" +#include "speaker.h" -const device_type MSX_CART_FMPAC = &device_creator; +const device_type MSX_CART_FMPAC = device_creator; msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/fs_sr022.cpp b/src/devices/bus/msx_cart/fs_sr022.cpp index efea17e4153..6b7cb69c17a 100644 --- a/src/devices/bus/msx_cart/fs_sr022.cpp +++ b/src/devices/bus/msx_cart/fs_sr022.cpp @@ -4,7 +4,7 @@ #include "fs_sr022.h" -const device_type MSX_CART_FS_SR022 = &device_creator; +const device_type MSX_CART_FS_SR022 = device_creator; msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/halnote.cpp b/src/devices/bus/msx_cart/halnote.cpp index 13b85a3cf77..a4a25378d6e 100644 --- a/src/devices/bus/msx_cart/halnote.cpp +++ b/src/devices/bus/msx_cart/halnote.cpp @@ -4,7 +4,7 @@ #include "halnote.h" -const device_type MSX_CART_HALNOTE = &device_creator; +const device_type MSX_CART_HALNOTE = device_creator; msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/hfox.cpp b/src/devices/bus/msx_cart/hfox.cpp index e5879cee778..fa8ea7b8870 100644 --- a/src/devices/bus/msx_cart/hfox.cpp +++ b/src/devices/bus/msx_cart/hfox.cpp @@ -4,7 +4,7 @@ #include "hfox.h" -const device_type MSX_CART_HFOX = &device_creator; +const device_type MSX_CART_HFOX = device_creator; msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/holy_quran.cpp b/src/devices/bus/msx_cart/holy_quran.cpp index 3c5ae04dc0c..94373c6019a 100644 --- a/src/devices/bus/msx_cart/holy_quran.cpp +++ b/src/devices/bus/msx_cart/holy_quran.cpp @@ -4,7 +4,7 @@ #include "holy_quran.h" -const device_type MSX_CART_HOLY_QURAN = &device_creator; +const device_type MSX_CART_HOLY_QURAN = device_creator; msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp index f30685bf01f..b082e5c9703 100644 --- a/src/devices/bus/msx_cart/konami.cpp +++ b/src/devices/bus/msx_cart/konami.cpp @@ -2,15 +2,18 @@ // copyright-holders:Wilbert Pol #include "emu.h" #include "konami.h" + #include "sound/volt_reg.h" +#include "speaker.h" + -const device_type MSX_CART_KONAMI = &device_creator; -const device_type MSX_CART_KONAMI_SCC = &device_creator; -const device_type MSX_CART_GAMEMASTER2 = &device_creator; -const device_type MSX_CART_SYNTHESIZER = &device_creator; -const device_type MSX_CART_SOUND_SNATCHER = &device_creator; -const device_type MSX_CART_SOUND_SDSNATCHER = &device_creator; -const device_type MSX_CART_KEYBOARD_MASTER = &device_creator; +const device_type MSX_CART_KONAMI = device_creator; +const device_type MSX_CART_KONAMI_SCC = device_creator; +const device_type MSX_CART_GAMEMASTER2 = device_creator; +const device_type MSX_CART_SYNTHESIZER = device_creator; +const device_type MSX_CART_SOUND_SNATCHER = device_creator; +const device_type MSX_CART_SOUND_SDSNATCHER = device_creator; +const device_type MSX_CART_KEYBOARD_MASTER = device_creator; msx_cart_konami::msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/korean.cpp b/src/devices/bus/msx_cart/korean.cpp index 7f97f4bb49f..8ea5b5cfac3 100644 --- a/src/devices/bus/msx_cart/korean.cpp +++ b/src/devices/bus/msx_cart/korean.cpp @@ -3,9 +3,9 @@ #include "emu.h" #include "korean.h" -const device_type MSX_CART_KOREAN_80IN1 = &device_creator; -const device_type MSX_CART_KOREAN_90IN1 = &device_creator; -const device_type MSX_CART_KOREAN_126IN1 = &device_creator; +const device_type MSX_CART_KOREAN_80IN1 = device_creator; +const device_type MSX_CART_KOREAN_90IN1 = device_creator; +const device_type MSX_CART_KOREAN_126IN1 = device_creator; msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp index d81d79b95ec..8617860431d 100644 --- a/src/devices/bus/msx_cart/majutsushi.cpp +++ b/src/devices/bus/msx_cart/majutsushi.cpp @@ -2,9 +2,12 @@ // copyright-holders:Wilbert Pol #include "emu.h" #include "majutsushi.h" + #include "sound/volt_reg.h" +#include "speaker.h" + -const device_type MSX_CART_MAJUTSUSHI = &device_creator; +const device_type MSX_CART_MAJUTSUSHI = device_creator; msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp index 8596bfce530..95a212ebb67 100644 --- a/src/devices/bus/msx_cart/moonsound.cpp +++ b/src/devices/bus/msx_cart/moonsound.cpp @@ -11,12 +11,14 @@ TODO: #include "emu.h" #include "moonsound.h" +#include "speaker.h" + #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type MSX_CART_MOONSOUND = &device_creator; +const device_type MSX_CART_MOONSOUND = device_creator; msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp index aa96a165f89..19a48299e7c 100644 --- a/src/devices/bus/msx_cart/msx_audio.cpp +++ b/src/devices/bus/msx_cart/msx_audio.cpp @@ -64,10 +64,12 @@ and/or http://ngs.no.coocan.jp/doc/wiki.cgi/datapack?page=4.2+MSX-AUDIO+%B3%C8%C #include "msx_audio.h" #include "bus/msx_cart/msx_audio_kb.h" +#include "speaker.h" -const device_type MSX_CART_MSX_AUDIO_HXMU900 = &device_creator; -const device_type MSX_CART_MSX_AUDIO_NMS1205 = &device_creator; -const device_type MSX_CART_MSX_AUDIO_FSCA1 = &device_creator; + +const device_type MSX_CART_MSX_AUDIO_HXMU900 = device_creator; +const device_type MSX_CART_MSX_AUDIO_NMS1205 = device_creator; +const device_type MSX_CART_MSX_AUDIO_FSCA1 = device_creator; msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp index 2b0fd16f725..e606e0ffae9 100644 --- a/src/devices/bus/msx_cart/msx_audio_kb.cpp +++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp @@ -4,7 +4,7 @@ #include "msx_audio_kb.h" -const device_type MSX_AUDIO_KBDC_PORT = &device_creator; +const device_type MSX_AUDIO_KBDC_PORT = device_creator; msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -305,8 +305,8 @@ ioport_constructor msx_nms1160::device_input_ports() const -const device_type MSX_AUDIO_KB_HXMU901 = &device_creator; -const device_type MSX_AUDIO_KB_NMS1160 = &device_creator; +const device_type MSX_AUDIO_KB_HXMU901 = device_creator; +const device_type MSX_AUDIO_KB_NMS1160 = device_creator; SLOT_INTERFACE_START( msx_audio_keyboards ) diff --git a/src/devices/bus/msx_cart/msxdos2.cpp b/src/devices/bus/msx_cart/msxdos2.cpp index 3396ee67221..3fac4457d63 100644 --- a/src/devices/bus/msx_cart/msxdos2.cpp +++ b/src/devices/bus/msx_cart/msxdos2.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "msxdos2.h" -const device_type MSX_CART_MSXDOS2 = &device_creator; +const device_type MSX_CART_MSXDOS2 = device_creator; msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/nomapper.cpp b/src/devices/bus/msx_cart/nomapper.cpp index 2b9b756e628..32c49517fa9 100644 --- a/src/devices/bus/msx_cart/nomapper.cpp +++ b/src/devices/bus/msx_cart/nomapper.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "nomapper.h" -const device_type MSX_CART_NOMAPPER = &device_creator; +const device_type MSX_CART_NOMAPPER = device_creator; msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/rtype.cpp b/src/devices/bus/msx_cart/rtype.cpp index d45dbac407b..d6c432a7dd4 100644 --- a/src/devices/bus/msx_cart/rtype.cpp +++ b/src/devices/bus/msx_cart/rtype.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "rtype.h" -const device_type MSX_CART_RTYPE = &device_creator; +const device_type MSX_CART_RTYPE = device_creator; msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/super_swangi.cpp b/src/devices/bus/msx_cart/super_swangi.cpp index c020e1f311f..8983b57e429 100644 --- a/src/devices/bus/msx_cart/super_swangi.cpp +++ b/src/devices/bus/msx_cart/super_swangi.cpp @@ -4,7 +4,7 @@ #include "super_swangi.h" -const device_type MSX_CART_SUPER_SWANGI = &device_creator; +const device_type MSX_CART_SUPER_SWANGI = device_creator; msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/superloderunner.cpp b/src/devices/bus/msx_cart/superloderunner.cpp index c738d19ebbb..64fd457377a 100644 --- a/src/devices/bus/msx_cart/superloderunner.cpp +++ b/src/devices/bus/msx_cart/superloderunner.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "superloderunner.h" -const device_type MSX_CART_SUPERLODERUNNER = &device_creator; +const device_type MSX_CART_SUPERLODERUNNER = device_creator; msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp index f3f2bfb3815..dff91b2ce54 100644 --- a/src/devices/bus/msx_cart/yamaha.cpp +++ b/src/devices/bus/msx_cart/yamaha.cpp @@ -11,11 +11,13 @@ TODO: #include "emu.h" #include "yamaha.h" + #include "bus/midi/midi.h" +#include "speaker.h" -const device_type MSX_CART_SFG01 = &device_creator; -const device_type MSX_CART_SFG05 = &device_creator; +const device_type MSX_CART_SFG01 = device_creator; +const device_type MSX_CART_SFG05 = device_creator; msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname) diff --git a/src/devices/bus/msx_slot/bunsetsu.cpp b/src/devices/bus/msx_slot/bunsetsu.cpp index ce144821213..99da86b1a9a 100644 --- a/src/devices/bus/msx_slot/bunsetsu.cpp +++ b/src/devices/bus/msx_slot/bunsetsu.cpp @@ -8,7 +8,7 @@ #include "bunsetsu.h" -const device_type MSX_SLOT_BUNSETSU = &device_creator; +const device_type MSX_SLOT_BUNSETSU = device_creator; msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp index 0727dce6151..9e929f44046 100644 --- a/src/devices/bus/msx_slot/cartridge.cpp +++ b/src/devices/bus/msx_slot/cartridge.cpp @@ -29,8 +29,8 @@ enum }; -const device_type MSX_SLOT_CARTRIDGE = &device_creator; -const device_type MSX_SLOT_YAMAHA_EXPANSION = &device_creator; +const device_type MSX_SLOT_CARTRIDGE = device_creator; +const device_type MSX_SLOT_YAMAHA_EXPANSION = device_creator; msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_slot/disk.cpp b/src/devices/bus/msx_slot/disk.cpp index f2110a16791..7e3e0370ef1 100644 --- a/src/devices/bus/msx_slot/disk.cpp +++ b/src/devices/bus/msx_slot/disk.cpp @@ -35,12 +35,12 @@ set on 7FFDH bit 2 always to 0 (some use it as disk change reset) #include "disk.h" -const device_type MSX_SLOT_DISK1 = &device_creator; -const device_type MSX_SLOT_DISK2 = &device_creator; -const device_type MSX_SLOT_DISK3 = &device_creator; -const device_type MSX_SLOT_DISK4 = &device_creator; -const device_type MSX_SLOT_DISK5 = &device_creator; -const device_type MSX_SLOT_DISK6 = &device_creator; +const device_type MSX_SLOT_DISK1 = device_creator; +const device_type MSX_SLOT_DISK2 = device_creator; +const device_type MSX_SLOT_DISK3 = device_creator; +const device_type MSX_SLOT_DISK4 = device_creator; +const device_type MSX_SLOT_DISK5 = device_creator; +const device_type MSX_SLOT_DISK6 = device_creator; msx_slot_disk_device::msx_slot_disk_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) diff --git a/src/devices/bus/msx_slot/fs4600.cpp b/src/devices/bus/msx_slot/fs4600.cpp index 0b452695bf5..0b15cb77048 100644 --- a/src/devices/bus/msx_slot/fs4600.cpp +++ b/src/devices/bus/msx_slot/fs4600.cpp @@ -8,7 +8,7 @@ #include "fs4600.h" -const device_type MSX_SLOT_FS4600 = &device_creator; +const device_type MSX_SLOT_FS4600 = device_creator; msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_slot/music.cpp b/src/devices/bus/msx_slot/music.cpp index 26173425866..ae11b71df2b 100644 --- a/src/devices/bus/msx_slot/music.cpp +++ b/src/devices/bus/msx_slot/music.cpp @@ -4,7 +4,7 @@ #include "music.h" -const device_type MSX_SLOT_MUSIC = &device_creator; +const device_type MSX_SLOT_MUSIC = device_creator; msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp index ce861c3e7da..b1f30ca70cc 100644 --- a/src/devices/bus/msx_slot/panasonic08.cpp +++ b/src/devices/bus/msx_slot/panasonic08.cpp @@ -13,7 +13,7 @@ Todo: #include "panasonic08.h" -const device_type MSX_SLOT_PANASONIC08 = &device_creator; +const device_type MSX_SLOT_PANASONIC08 = device_creator; msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_slot/ram.cpp b/src/devices/bus/msx_slot/ram.cpp index 85b645b448d..e03a8ed4e7c 100644 --- a/src/devices/bus/msx_slot/ram.cpp +++ b/src/devices/bus/msx_slot/ram.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "ram.h" -const device_type MSX_SLOT_RAM = &device_creator; +const device_type MSX_SLOT_RAM = device_creator; msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MSX_SLOT_RAM, "MSX Internal RAM", tag, owner, clock, "msx_slot_ram", __FILE__) diff --git a/src/devices/bus/msx_slot/ram_mm.cpp b/src/devices/bus/msx_slot/ram_mm.cpp index 86078ca280f..75ea33d06c5 100644 --- a/src/devices/bus/msx_slot/ram_mm.cpp +++ b/src/devices/bus/msx_slot/ram_mm.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "ram_mm.h" -const device_type MSX_SLOT_RAM_MM = &device_creator; +const device_type MSX_SLOT_RAM_MM = device_creator; msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MSX_SLOT_RAM_MM, "MSX Internal Memory Mapped RAM", tag, owner, clock, "msx_slot_ram_mm", __FILE__) diff --git a/src/devices/bus/msx_slot/rom.cpp b/src/devices/bus/msx_slot/rom.cpp index 85c9930cfc7..46d468b8121 100644 --- a/src/devices/bus/msx_slot/rom.cpp +++ b/src/devices/bus/msx_slot/rom.cpp @@ -4,7 +4,7 @@ #include "rom.h" -const device_type MSX_SLOT_ROM = &device_creator; +const device_type MSX_SLOT_ROM = device_creator; msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/msx_slot/sony08.cpp b/src/devices/bus/msx_slot/sony08.cpp index 61b6b836f13..4c575c9f94d 100644 --- a/src/devices/bus/msx_slot/sony08.cpp +++ b/src/devices/bus/msx_slot/sony08.cpp @@ -10,7 +10,7 @@ #include "sony08.h" -const device_type MSX_SLOT_SONY08 = &device_creator; +const device_type MSX_SLOT_SONY08 = device_creator; msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp index 7203420fdf8..4c7b95abdc9 100644 --- a/src/devices/bus/nasbus/avc.cpp +++ b/src/devices/bus/nasbus/avc.cpp @@ -9,12 +9,14 @@ #include "emu.h" #include "avc.h" +#include "screen.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type NASCOM_AVC = &device_creator; +const device_type NASCOM_AVC = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp index 2f832b27b3a..d61180e0216 100644 --- a/src/devices/bus/nasbus/floppy.cpp +++ b/src/devices/bus/nasbus/floppy.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NASCOM_FDC = &device_creator; +const device_type NASCOM_FDC = device_creator; FLOPPY_FORMATS_MEMBER( nascom_fdc_device::floppy_formats ) FLOPPY_NASCOM_FORMAT diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp index 32fef766f81..414d14bf27e 100644 --- a/src/devices/bus/nasbus/nasbus.cpp +++ b/src/devices/bus/nasbus/nasbus.cpp @@ -16,7 +16,7 @@ // NASBUS SLOT DEVICE //************************************************************************** -const device_type NASBUS_SLOT = &device_creator; +const device_type NASBUS_SLOT = device_creator; //------------------------------------------------- // nasbus_slot_device - constructor @@ -64,7 +64,7 @@ void nasbus_slot_device::device_start() // NASBUS DEVICE //************************************************************************** -const device_type NASBUS = &device_creator; +const device_type NASBUS = device_creator; //------------------------------------------------- // nasbus_device - constructor diff --git a/src/devices/bus/neogeo/boot_cthd.cpp b/src/devices/bus/neogeo/boot_cthd.cpp index af8f38ec254..79189841fdf 100644 --- a/src/devices/bus/neogeo/boot_cthd.cpp +++ b/src/devices/bus/neogeo/boot_cthd.cpp @@ -16,7 +16,7 @@ // neogeo_cthd2k3_cart - constructor //------------------------------------------------- -const device_type NEOGEO_CTHD2K3_CART = &device_creator; +const device_type NEOGEO_CTHD2K3_CART = device_creator; neogeo_cthd2k3_cart::neogeo_cthd2k3_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -74,7 +74,7 @@ void neogeo_cthd2k3_cart::decrypt_all(DECRYPT_ALL_PARAMS) **************************************************/ -const device_type NEOGEO_CT2K3SP_CART = &device_creator; +const device_type NEOGEO_CT2K3SP_CART = device_creator; neogeo_ct2k3sp_cart::neogeo_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cthd2k3_cart(mconfig, NEOGEO_CT2K3SP_CART, "Neo Geo CTHD 2003 Sp Cart", tag, owner, clock, "neocart_ct2k3sp", __FILE__) @@ -90,7 +90,7 @@ void neogeo_ct2k3sp_cart::decrypt_all(DECRYPT_ALL_PARAMS) ct2k3sa **************************************************/ -const device_type NEOGEO_CT2K3SA_CART = &device_creator; +const device_type NEOGEO_CT2K3SA_CART = device_creator; neogeo_ct2k3sa_cart::neogeo_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cthd2k3_cart(mconfig, NEOGEO_CT2K3SA_CART, "Neo Geo CTHD 2003 Sp Alt Cart", tag, owner, clock, "neocart_ct2k3sa", __FILE__) @@ -107,7 +107,7 @@ void neogeo_ct2k3sa_cart::decrypt_all(DECRYPT_ALL_PARAMS) matrimbl **************************************************/ -const device_type NEOGEO_MATRIMBL_CART = &device_creator; +const device_type NEOGEO_MATRIMBL_CART = device_creator; neogeo_matrimbl_cart::neogeo_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cthd2k3_cart(mconfig, NEOGEO_MATRIMBL_CART, "Neo Geo Matrimelee Bootleg Cart", tag, owner, clock, "neocart_matrimbl", __FILE__), diff --git a/src/devices/bus/neogeo/boot_kof10th.cpp b/src/devices/bus/neogeo/boot_kof10th.cpp index 5420fbd52a9..1ce38f14785 100644 --- a/src/devices/bus/neogeo/boot_kof10th.cpp +++ b/src/devices/bus/neogeo/boot_kof10th.cpp @@ -16,7 +16,7 @@ // neogeo_kof10th_cart - constructor //------------------------------------------------- -const device_type NEOGEO_KOF10TH_CART = &device_creator; +const device_type NEOGEO_KOF10TH_CART = device_creator; neogeo_kof10th_cart::neogeo_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) : diff --git a/src/devices/bus/neogeo/boot_kof2k2.cpp b/src/devices/bus/neogeo/boot_kof2k2.cpp index eff560a3bc2..522f83e65aa 100644 --- a/src/devices/bus/neogeo/boot_kof2k2.cpp +++ b/src/devices/bus/neogeo/boot_kof2k2.cpp @@ -44,7 +44,7 @@ machine_config_constructor neogeo_kf2k2mp2_cart::device_mconfig_additions() cons kof2002b **************************************************/ -const device_type NEOGEO_KOF2002B_CART = &device_creator; +const device_type NEOGEO_KOF2002B_CART = device_creator; neogeo_kof2002b_cart::neogeo_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KOF2002B_CART, "Neo Geo KOF 2002 Bootleg Cart", tag, owner, clock, "neocart_kof2002b", __FILE__), @@ -67,7 +67,7 @@ void neogeo_kof2002b_cart::decrypt_all(DECRYPT_ALL_PARAMS) kf2k2mp **************************************************/ -const device_type NEOGEO_KF2K2MP_CART = &device_creator; +const device_type NEOGEO_KF2K2MP_CART = device_creator; neogeo_kf2k2mp_cart::neogeo_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF2K2MP_CART, "Neo Geo KOF 2002 MP Cart", tag, owner, clock, "neocart_kf2k2mp", __FILE__), @@ -89,7 +89,7 @@ void neogeo_kf2k2mp_cart::decrypt_all(DECRYPT_ALL_PARAMS) kf2k2mp2 **************************************************/ -const device_type NEOGEO_KF2K2MP2_CART = &device_creator; +const device_type NEOGEO_KF2K2MP2_CART = device_creator; neogeo_kf2k2mp2_cart::neogeo_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF2K2MP2_CART, "Neo Geo KOF 2002 MP2 Cart", tag, owner, clock, "neocart_kf2k2mp2", __FILE__), diff --git a/src/devices/bus/neogeo/boot_kof2k3.cpp b/src/devices/bus/neogeo/boot_kof2k3.cpp index 25b3560c45f..b5394a3a652 100644 --- a/src/devices/bus/neogeo/boot_kof2k3.cpp +++ b/src/devices/bus/neogeo/boot_kof2k3.cpp @@ -38,7 +38,7 @@ machine_config_constructor neogeo_kf2k3upl_cart::device_mconfig_additions() cons kf2k3bl **************************************************/ -const device_type NEOGEO_KF2K3BL_CART = &device_creator; +const device_type NEOGEO_KF2K3BL_CART = device_creator; neogeo_kf2k3bl_cart::neogeo_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3BL_CART, "Neo Geo KOF 2003 Bootleg Cart", tag, owner, clock, "neocart_kf2k3bl", __FILE__), @@ -59,7 +59,7 @@ void neogeo_kf2k3bl_cart::decrypt_all(DECRYPT_ALL_PARAMS) kf2k3pl **************************************************/ -const device_type NEOGEO_KF2K3PL_CART = &device_creator; +const device_type NEOGEO_KF2K3PL_CART = device_creator; neogeo_kf2k3pl_cart::neogeo_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3PL_CART, "Neo Geo KOF 2003 PL Cart", tag, owner, clock, "neocart_kf2k3pl", __FILE__), @@ -81,7 +81,7 @@ void neogeo_kf2k3pl_cart::decrypt_all(DECRYPT_ALL_PARAMS) kf2k3upl **************************************************/ -const device_type NEOGEO_KF2K3UPL_CART = &device_creator; +const device_type NEOGEO_KF2K3UPL_CART = device_creator; neogeo_kf2k3upl_cart::neogeo_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3UPL_CART, "Neo Geo KOF 2003 UPL Cart", tag, owner, clock, "neocart_kf2k3upl", __FILE__), diff --git a/src/devices/bus/neogeo/boot_misc.cpp b/src/devices/bus/neogeo/boot_misc.cpp index 082d011d9ac..4740d770729 100644 --- a/src/devices/bus/neogeo/boot_misc.cpp +++ b/src/devices/bus/neogeo/boot_misc.cpp @@ -16,7 +16,7 @@ // neogeo_bootleg_cart - constructor //------------------------------------------------- -const device_type NEOGEO_BOOTLEG_CART = &device_creator; +const device_type NEOGEO_BOOTLEG_CART = device_creator; neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -62,7 +62,7 @@ machine_config_constructor neogeo_bootleg_cart::device_mconfig_additions() const garoubl **************************************************/ -const device_type NEOGEO_GAROUBL_CART = &device_creator; +const device_type NEOGEO_GAROUBL_CART = device_creator; neogeo_garoubl_cart::neogeo_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_GAROUBL_CART, "Neo Geo Garou Bootleg Cart", tag, owner, clock, "neocart_garoubl", __FILE__) @@ -80,7 +80,7 @@ void neogeo_garoubl_cart::decrypt_all(DECRYPT_ALL_PARAMS) kof97oro **************************************************/ -const device_type NEOGEO_KOF97ORO_CART = &device_creator; +const device_type NEOGEO_KOF97ORO_CART = device_creator; neogeo_kof97oro_cart::neogeo_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KOF97ORO_CART, "Neo Geo KOF 97 Orochi Bootleg Cart", tag, owner, clock, "neocart_kof97oro", __FILE__) @@ -99,7 +99,7 @@ void neogeo_kof97oro_cart::decrypt_all(DECRYPT_ALL_PARAMS) kf10thep **************************************************/ -const device_type NEOGEO_KF10THEP_CART = &device_creator; +const device_type NEOGEO_KF10THEP_CART = device_creator; neogeo_kf10thep_cart::neogeo_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF10THEP_CART, "Neo Geo KOF 10th Ann. EP Bootleg Cart", tag, owner, clock, "neocart_kf10thep", __FILE__) @@ -117,7 +117,7 @@ void neogeo_kf10thep_cart::decrypt_all(DECRYPT_ALL_PARAMS) kf2k5uni **************************************************/ -const device_type NEOGEO_KF2K5UNI_CART = &device_creator; +const device_type NEOGEO_KF2K5UNI_CART = device_creator; neogeo_kf2k5uni_cart::neogeo_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF2K5UNI_CART, "Neo Geo KOF 2005 Unique Bootleg Cart", tag, owner, clock, "neocart_kf2k5uni", __FILE__) @@ -136,7 +136,7 @@ void neogeo_kf2k5uni_cart::decrypt_all(DECRYPT_ALL_PARAMS) kf2k4se **************************************************/ -const device_type NEOGEO_KF2K4SE_CART = &device_creator; +const device_type NEOGEO_KF2K4SE_CART = device_creator; neogeo_kf2k4se_cart::neogeo_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KF2K4SE_CART, "Neo Geo KOF 2004 SE Bootleg Cart", tag, owner, clock, "neocart_kf2k4se", __FILE__) @@ -153,7 +153,7 @@ void neogeo_kf2k4se_cart::decrypt_all(DECRYPT_ALL_PARAMS) lans2004 **************************************************/ -const device_type NEOGEO_LANS2004_CART = &device_creator; +const device_type NEOGEO_LANS2004_CART = device_creator; neogeo_lans2004_cart::neogeo_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_LANS2004_CART, "Neo Geo Lansquenet 2004 Bootleg Cart", tag, owner, clock, "neocart_lans2004", __FILE__) @@ -172,7 +172,7 @@ void neogeo_lans2004_cart::decrypt_all(DECRYPT_ALL_PARAMS) samsho5b **************************************************/ -const device_type NEOGEO_SAMSHO5B_CART = &device_creator; +const device_type NEOGEO_SAMSHO5B_CART = device_creator; neogeo_samsho5b_cart::neogeo_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_SAMSHO5B_CART, "Neo Geo Samurai Shodown 5 Bootleg Cart", tag, owner, clock, "neocart_samsho5b", __FILE__) @@ -191,7 +191,7 @@ void neogeo_samsho5b_cart::decrypt_all(DECRYPT_ALL_PARAMS) mslug3b6 **************************************************/ -const device_type NEOGEO_MSLUG3B6_CART = &device_creator; +const device_type NEOGEO_MSLUG3B6_CART = device_creator; neogeo_mslug3b6_cart::neogeo_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_MSLUG3B6_CART, "Neo Geo Metal Slug 6 Bootleg Cart", tag, owner, clock, "neocart_mslug3b6", __FILE__), @@ -219,7 +219,7 @@ machine_config_constructor neogeo_mslug3b6_cart::device_mconfig_additions() cons ms5plus **************************************************/ -const device_type NEOGEO_MS5PLUS_CART = &device_creator; +const device_type NEOGEO_MS5PLUS_CART = device_creator; neogeo_ms5plus_cart::neogeo_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_MS5PLUS_CART, "Neo Geo Metal Slug 5 Plus Bootleg Cart", tag, owner, clock, "neocart_ms5plus", __FILE__), @@ -251,7 +251,7 @@ machine_config_constructor neogeo_ms5plus_cart::device_mconfig_additions() const kog **************************************************/ -const device_type NEOGEO_KOG_CART = &device_creator; +const device_type NEOGEO_KOG_CART = device_creator; neogeo_kog_cart::neogeo_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_KOG_CART, "Neo Geo King of Gladiators Bootleg Cart", tag, owner, clock, "neocart_kog", __FILE__), diff --git a/src/devices/bus/neogeo/boot_svc.cpp b/src/devices/bus/neogeo/boot_svc.cpp index 869bcea516d..9f9a9fdce35 100644 --- a/src/devices/bus/neogeo/boot_svc.cpp +++ b/src/devices/bus/neogeo/boot_svc.cpp @@ -16,7 +16,7 @@ svcboot **************************************************/ -const device_type NEOGEO_SVCBOOT_CART = &device_creator; +const device_type NEOGEO_SVCBOOT_CART = device_creator; neogeo_svcboot_cart::neogeo_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_SVCBOOT_CART, "Neo Geo SVC Bootleg Cart", tag, owner, clock, "neocart_svcboot", __FILE__), @@ -44,7 +44,7 @@ machine_config_constructor neogeo_svcboot_cart::device_mconfig_additions() const svcplus **************************************************/ -const device_type NEOGEO_SVCPLUS_CART = &device_creator; +const device_type NEOGEO_SVCPLUS_CART = device_creator; neogeo_svcplus_cart::neogeo_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_SVCPLUS_CART, "Neo Geo SVC Plus Bootleg Cart", tag, owner, clock, "neocart_svcplus", __FILE__) @@ -63,7 +63,7 @@ void neogeo_svcplus_cart::decrypt_all(DECRYPT_ALL_PARAMS) svcplusa **************************************************/ -const device_type NEOGEO_SVCPLUSA_CART = &device_creator; +const device_type NEOGEO_SVCPLUSA_CART = device_creator; neogeo_svcplusa_cart::neogeo_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_SVCPLUSA_CART, "Neo Geo SVC Plus Alt Bootleg Cart", tag, owner, clock, "neocart_svcplusa", __FILE__) @@ -80,7 +80,7 @@ void neogeo_svcplusa_cart::decrypt_all(DECRYPT_ALL_PARAMS) svcsplus **************************************************/ -const device_type NEOGEO_SVCSPLUS_CART = &device_creator; +const device_type NEOGEO_SVCSPLUS_CART = device_creator; neogeo_svcsplus_cart::neogeo_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_bootleg_cart(mconfig, NEOGEO_SVCSPLUS_CART, "Neo Geo SVC S.Plus Bootleg Cart", tag, owner, clock, "neocart_svcsplus", __FILE__), diff --git a/src/devices/bus/neogeo/cmc.cpp b/src/devices/bus/neogeo/cmc.cpp index 687a1faad07..a630d9fe0a3 100644 --- a/src/devices/bus/neogeo/cmc.cpp +++ b/src/devices/bus/neogeo/cmc.cpp @@ -16,7 +16,7 @@ // neogeo_cmc_cart - constructor //------------------------------------------------- -const device_type NEOGEO_CMC_CART = &device_creator; +const device_type NEOGEO_CMC_CART = device_creator; neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -57,7 +57,7 @@ machine_config_constructor neogeo_cmc_cart::device_mconfig_additions() const zupapa **************************************************/ -const device_type NEOGEO_CMC_ZUPAPA_CART = &device_creator; +const device_type NEOGEO_CMC_ZUPAPA_CART = device_creator; neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_ZUPAPA_CART, "Neo Geo Zupapa CMC42 Cart", tag, owner, clock, "neocart_zupapa", __FILE__) @@ -74,7 +74,7 @@ void neogeo_cmc_zupapa_cart::decrypt_all(DECRYPT_ALL_PARAMS) mslug3h **************************************************/ -const device_type NEOGEO_CMC_MSLUG3H_CART = &device_creator; +const device_type NEOGEO_CMC_MSLUG3H_CART = device_creator; neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_MSLUG3H_CART, "Neo Geo Metal Slug 3 AES CMC42 Cart", tag, owner, clock, "neocart_mslug3h", __FILE__) @@ -91,7 +91,7 @@ void neogeo_cmc_mslug3h_cart::decrypt_all(DECRYPT_ALL_PARAMS) ganryu **************************************************/ -const device_type NEOGEO_CMC_GANRYU_CART = &device_creator; +const device_type NEOGEO_CMC_GANRYU_CART = device_creator; neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_GANRYU_CART, "Neo Geo Ganryu CMC42 Cart", tag, owner, clock, "neocart_ganryu", __FILE__) @@ -108,7 +108,7 @@ void neogeo_cmc_ganryu_cart::decrypt_all(DECRYPT_ALL_PARAMS) s1945p **************************************************/ -const device_type NEOGEO_CMC_S1945P_CART = &device_creator; +const device_type NEOGEO_CMC_S1945P_CART = device_creator; neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_S1945P_CART, "Neo Geo Strikers 1945 Plus CMC42 Cart", tag, owner, clock, "neocart_s1945p", __FILE__) @@ -124,7 +124,7 @@ void neogeo_cmc_s1945p_cart::decrypt_all(DECRYPT_ALL_PARAMS) preisle2 **************************************************/ -const device_type NEOGEO_CMC_PREISLE2_CART = &device_creator; +const device_type NEOGEO_CMC_PREISLE2_CART = device_creator; neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_PREISLE2_CART, "Neo Geo Prehistorik Isle 2 CMC42 Cart", tag, owner, clock, "neocart_preisle2", __FILE__) @@ -140,7 +140,7 @@ void neogeo_cmc_preisle2_cart::decrypt_all(DECRYPT_ALL_PARAMS) bangbead **************************************************/ -const device_type NEOGEO_CMC_BANGBEAD_CART = &device_creator; +const device_type NEOGEO_CMC_BANGBEAD_CART = device_creator; neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_BANGBEAD_CART, "Neo Geo Bangbead CMC42 Cart", tag, owner, clock, "neocart_bangbead", __FILE__) @@ -156,7 +156,7 @@ void neogeo_cmc_bangbead_cart::decrypt_all(DECRYPT_ALL_PARAMS) ntd **************************************************/ -const device_type NEOGEO_CMC_NITD_CART = &device_creator; +const device_type NEOGEO_CMC_NITD_CART = device_creator; neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_NITD_CART, "Neo Geo NITD CMC42 Cart", tag, owner, clock, "neocart_nitd", __FILE__) @@ -173,7 +173,7 @@ void neogeo_cmc_nitd_cart::decrypt_all(DECRYPT_ALL_PARAMS) sengoku3 **************************************************/ -const device_type NEOGEO_CMC_SENGOKU3_CART = &device_creator; +const device_type NEOGEO_CMC_SENGOKU3_CART = device_creator; neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_SENGOKU3_CART, "Neo Geo Sengoku 3 CMC42 Cart", tag, owner, clock, "neocart_sengoku3", __FILE__) @@ -189,7 +189,7 @@ void neogeo_cmc_sengoku3_cart::decrypt_all(DECRYPT_ALL_PARAMS) kof99k **************************************************/ -const device_type NEOGEO_CMC_KOF99K_CART = &device_creator; +const device_type NEOGEO_CMC_KOF99K_CART = device_creator; neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF99K_CART, "Neo Geo KOF 99 Korea CMC42 Cart", tag, owner, clock, "neocart_kof99k", __FILE__) @@ -206,7 +206,7 @@ void neogeo_cmc_kof99k_cart::decrypt_all(DECRYPT_ALL_PARAMS) kof2001 **************************************************/ -const device_type NEOGEO_CMC_KOF2001_CART = &device_creator; +const device_type NEOGEO_CMC_KOF2001_CART = device_creator; neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2001_CART, "Neo Geo KOF 2001 CMC50 Cart", tag, owner, clock, "neocart_kof2001", __FILE__) @@ -223,7 +223,7 @@ void neogeo_cmc_kof2001_cart::decrypt_all(DECRYPT_ALL_PARAMS) kof2000n **************************************************/ -const device_type NEOGEO_CMC_KOF2000N_CART = &device_creator; +const device_type NEOGEO_CMC_KOF2000N_CART = device_creator; neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2000N_CART, "Neo Geo KOF 2000 CMC50 Cart", tag, owner, clock, "neocart_kof2000n", __FILE__) @@ -241,7 +241,7 @@ void neogeo_cmc_kof2000n_cart::decrypt_all(DECRYPT_ALL_PARAMS) jockeygp **************************************************/ -const device_type NEOGEO_CMC_JOCKEYGP_CART = &device_creator; +const device_type NEOGEO_CMC_JOCKEYGP_CART = device_creator; neogeo_cmc_jockeygp_cart::neogeo_cmc_jockeygp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_cmc_cart(mconfig, NEOGEO_CMC_JOCKEYGP_CART, "Neo Geo Jockey GP CMC50 Cart", tag, owner, clock, "neocart_jockeygp", __FILE__) diff --git a/src/devices/bus/neogeo/fatfury2.cpp b/src/devices/bus/neogeo/fatfury2.cpp index 64a2f44c6b1..995d576b5a3 100644 --- a/src/devices/bus/neogeo/fatfury2.cpp +++ b/src/devices/bus/neogeo/fatfury2.cpp @@ -16,7 +16,7 @@ // neogeo_fatfury2_cart - constructor //------------------------------------------------- -const device_type NEOGEO_FATFURY2_CART = &device_creator; +const device_type NEOGEO_FATFURY2_CART = device_creator; neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) : diff --git a/src/devices/bus/neogeo/kof2k2.cpp b/src/devices/bus/neogeo/kof2k2.cpp index 8848e7e68e0..50d2cfa94f8 100644 --- a/src/devices/bus/neogeo/kof2k2.cpp +++ b/src/devices/bus/neogeo/kof2k2.cpp @@ -16,7 +16,7 @@ // neogeo_kof2002_cart - constructor //------------------------------------------------- -const device_type NEOGEO_K2K2_CART = &device_creator; +const device_type NEOGEO_K2K2_CART = device_creator; neogeo_kof2k2type_cart::neogeo_kof2k2type_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -67,7 +67,7 @@ machine_config_constructor neogeo_kof2k2type_cart::device_mconfig_additions() co kof2002 **************************************************/ -const device_type NEOGEO_K2K2_KOF2002_CART = &device_creator; +const device_type NEOGEO_K2K2_KOF2002_CART = device_creator; neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_KOF2002_CART, "Neo Geo KOF2002 Cart", tag, owner, clock, "neocart_kof2002", __FILE__) @@ -83,7 +83,7 @@ void neogeo_kof2002_cart::decrypt_all(DECRYPT_ALL_PARAMS) m_pcm2_prot->swap(ym_region, ym_region_size, 0); } -const device_type NEOGEO_K2K2_KF2K2PLS_CART = &device_creator; +const device_type NEOGEO_K2K2_KF2K2PLS_CART = device_creator; /************************************************* kf2k2pls @@ -106,7 +106,7 @@ void neogeo_kf2k2pls_cart::decrypt_all(DECRYPT_ALL_PARAMS) matrim **************************************************/ -const device_type NEOGEO_K2K2_MATRIM_CART = &device_creator; +const device_type NEOGEO_K2K2_MATRIM_CART = device_creator; neogeo_matrim_cart::neogeo_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_MATRIM_CART, "Neo Geo Matrimelee Cart", tag, owner, clock, "neocart_matrim", __FILE__) @@ -125,7 +125,7 @@ void neogeo_matrim_cart::decrypt_all(DECRYPT_ALL_PARAMS) samsho5 **************************************************/ -const device_type NEOGEO_K2K2_SAMSHO5_CART = &device_creator; +const device_type NEOGEO_K2K2_SAMSHO5_CART = device_creator; neogeo_samsho5_cart::neogeo_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_SAMSHO5_CART, "Neo Geo Samurai Shodown 5 Cart", tag, owner, clock, "neocart_samsho5", __FILE__) @@ -144,7 +144,7 @@ void neogeo_samsho5_cart::decrypt_all(DECRYPT_ALL_PARAMS) samsh5sp **************************************************/ -const device_type NEOGEO_K2K2_SAMSHO5SP_CART = &device_creator; +const device_type NEOGEO_K2K2_SAMSHO5SP_CART = device_creator; neogeo_samsho5sp_cart::neogeo_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_SAMSHO5SP_CART, "Neo Geo Samurai Shodown 5 Special Cart", tag, owner, clock, "neocart_samsh5sp", __FILE__) diff --git a/src/devices/bus/neogeo/kof98.cpp b/src/devices/bus/neogeo/kof98.cpp index 1f7c5559ae0..0451ee6ae6b 100644 --- a/src/devices/bus/neogeo/kof98.cpp +++ b/src/devices/bus/neogeo/kof98.cpp @@ -16,7 +16,7 @@ // neogeo_kof98_cart - constructor //------------------------------------------------- -const device_type NEOGEO_KOF98_CART = &device_creator; +const device_type NEOGEO_KOF98_CART = device_creator; neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) : diff --git a/src/devices/bus/neogeo/mslugx.cpp b/src/devices/bus/neogeo/mslugx.cpp index 85dcab3ddc9..71af2d783d4 100644 --- a/src/devices/bus/neogeo/mslugx.cpp +++ b/src/devices/bus/neogeo/mslugx.cpp @@ -16,7 +16,7 @@ // neogeo_mslugx_cart - constructor //------------------------------------------------- -const device_type NEOGEO_MSLUGX_CART = &device_creator; +const device_type NEOGEO_MSLUGX_CART = device_creator; neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) : diff --git a/src/devices/bus/neogeo/pcm2.cpp b/src/devices/bus/neogeo/pcm2.cpp index e49ebd06261..54ff35b8e33 100644 --- a/src/devices/bus/neogeo/pcm2.cpp +++ b/src/devices/bus/neogeo/pcm2.cpp @@ -16,7 +16,7 @@ // neogeo_pcm2_cart - constructor //------------------------------------------------- -const device_type NEOGEO_PCM2_CART = &device_creator; +const device_type NEOGEO_PCM2_CART = device_creator; neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -64,7 +64,7 @@ machine_config_constructor neogeo_pcm2_cart::device_mconfig_additions() const mslug4 **************************************************/ -const device_type NEOGEO_PCM2_MSLUG4_CART = &device_creator; +const device_type NEOGEO_PCM2_MSLUG4_CART = device_creator; neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MSLUG4_CART, "Neo Geo Metal Slug 4 PCM2 Cart", tag, owner, clock, "neocart_mslug4", __FILE__) @@ -83,7 +83,7 @@ void neogeo_pcm2_mslug4_cart::decrypt_all(DECRYPT_ALL_PARAMS) ms4plus **************************************************/ -const device_type NEOGEO_PCM2_MS4PLUS_CART = &device_creator; +const device_type NEOGEO_PCM2_MS4PLUS_CART = device_creator; neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MS4PLUS_CART, "Neo Geo Metal Slug 4 Plus PCM2 Cart", tag, owner, clock, "neocart_ms4plus", __FILE__) @@ -101,7 +101,7 @@ void neogeo_pcm2_ms4plus_cart::decrypt_all(DECRYPT_ALL_PARAMS) rotd **************************************************/ -const device_type NEOGEO_PCM2_ROTD_CART = &device_creator; +const device_type NEOGEO_PCM2_ROTD_CART = device_creator; neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_ROTD_CART, "Neo Geo Rage of the Dragon PCM2 Cart", tag, owner, clock, "neocart_rotd", __FILE__) @@ -119,7 +119,7 @@ void neogeo_pcm2_rotd_cart::decrypt_all(DECRYPT_ALL_PARAMS) pnyaa **************************************************/ -const device_type NEOGEO_PCM2_PNYAA_CART = &device_creator; +const device_type NEOGEO_PCM2_PNYAA_CART = device_creator; neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_PNYAA_CART, "Neo Geo Pnyaa PCM2 Cart", tag, owner, clock, "neocart_pnyaa", __FILE__) diff --git a/src/devices/bus/neogeo/prot_cmc.cpp b/src/devices/bus/neogeo/prot_cmc.cpp index a08f9ede36b..98cc9ce990e 100644 --- a/src/devices/bus/neogeo/prot_cmc.cpp +++ b/src/devices/bus/neogeo/prot_cmc.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "prot_cmc.h" -extern const device_type CMC_PROT = &device_creator; +const device_type CMC_PROT = device_creator; cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_cthd.cpp b/src/devices/bus/neogeo/prot_cthd.cpp index f94993d1228..226ae50d40b 100644 --- a/src/devices/bus/neogeo/prot_cthd.cpp +++ b/src/devices/bus/neogeo/prot_cthd.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "prot_cthd.h" -extern const device_type CTHD_PROT = &device_creator; +const device_type CTHD_PROT = device_creator; cthd_prot_device::cthd_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_fatfury2.cpp b/src/devices/bus/neogeo/prot_fatfury2.cpp index 6398a0db2e5..ccf29bb3484 100644 --- a/src/devices/bus/neogeo/prot_fatfury2.cpp +++ b/src/devices/bus/neogeo/prot_fatfury2.cpp @@ -6,7 +6,7 @@ -extern const device_type FATFURY2_PROT = &device_creator; +const device_type FATFURY2_PROT = device_creator; fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_kof2k2.cpp b/src/devices/bus/neogeo/prot_kof2k2.cpp index 4fc088adc53..a735a34e52e 100644 --- a/src/devices/bus/neogeo/prot_kof2k2.cpp +++ b/src/devices/bus/neogeo/prot_kof2k2.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "prot_kof2k2.h" -extern const device_type KOF2002_PROT = &device_creator; +const device_type KOF2002_PROT = device_creator; kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/neogeo/prot_kof2k3bl.cpp b/src/devices/bus/neogeo/prot_kof2k3bl.cpp index 2806af3a45b..bdf46df09c2 100644 --- a/src/devices/bus/neogeo/prot_kof2k3bl.cpp +++ b/src/devices/bus/neogeo/prot_kof2k3bl.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "prot_kof2k3bl.h" -extern const device_type KOF2K3BL_PROT = &device_creator; +const device_type KOF2K3BL_PROT = device_creator; kof2k3bl_prot_device::kof2k3bl_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_kof98.cpp b/src/devices/bus/neogeo/prot_kof98.cpp index ee72c203273..bc1d1cb43ba 100644 --- a/src/devices/bus/neogeo/prot_kof98.cpp +++ b/src/devices/bus/neogeo/prot_kof98.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "prot_kof98.h" -extern const device_type KOF98_PROT = &device_creator; +const device_type KOF98_PROT = device_creator; kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_misc.cpp b/src/devices/bus/neogeo/prot_misc.cpp index 825d630e1d9..349d294deb6 100644 --- a/src/devices/bus/neogeo/prot_misc.cpp +++ b/src/devices/bus/neogeo/prot_misc.cpp @@ -23,7 +23,7 @@ #include "prot_misc.h" -extern const device_type NEOBOOT_PROT = &device_creator; +const device_type NEOBOOT_PROT = device_creator; neoboot_prot_device::neoboot_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_mslugx.cpp b/src/devices/bus/neogeo/prot_mslugx.cpp index 85321f8c92c..d505fea7df8 100644 --- a/src/devices/bus/neogeo/prot_mslugx.cpp +++ b/src/devices/bus/neogeo/prot_mslugx.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "prot_mslugx.h" -extern const device_type MSLUGX_PROT = &device_creator; +const device_type MSLUGX_PROT = device_creator; mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_pcm2.cpp b/src/devices/bus/neogeo/prot_pcm2.cpp index 36d5557d817..01f56a8fb0a 100644 --- a/src/devices/bus/neogeo/prot_pcm2.cpp +++ b/src/devices/bus/neogeo/prot_pcm2.cpp @@ -6,7 +6,7 @@ #include "prot_pcm2.h" -extern const device_type PCM2_PROT = &device_creator; +const device_type PCM2_PROT = device_creator; pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/neogeo/prot_pvc.cpp b/src/devices/bus/neogeo/prot_pvc.cpp index 82ca811a111..a07af85222d 100644 --- a/src/devices/bus/neogeo/prot_pvc.cpp +++ b/src/devices/bus/neogeo/prot_pvc.cpp @@ -7,7 +7,7 @@ -extern const device_type PVC_PROT = &device_creator; +const device_type PVC_PROT = device_creator; pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/prot_sma.cpp b/src/devices/bus/neogeo/prot_sma.cpp index 9262178be4f..8c4dfa169d5 100644 --- a/src/devices/bus/neogeo/prot_sma.cpp +++ b/src/devices/bus/neogeo/prot_sma.cpp @@ -5,7 +5,7 @@ #include "prot_sma.h" -extern const device_type SMA_PROT = &device_creator; +const device_type SMA_PROT = device_creator; sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/neogeo/pvc.cpp b/src/devices/bus/neogeo/pvc.cpp index 4787aee080f..4830603b209 100644 --- a/src/devices/bus/neogeo/pvc.cpp +++ b/src/devices/bus/neogeo/pvc.cpp @@ -16,7 +16,7 @@ // neogeo_pvc_cart - constructor //------------------------------------------------- -const device_type NEOGEO_PVC_CART = &device_creator; +const device_type NEOGEO_PVC_CART = device_creator; neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -69,7 +69,7 @@ machine_config_constructor neogeo_pvc_cart::device_mconfig_additions() const mslug5 **************************************************/ -const device_type NEOGEO_PVC_MSLUG5_CART = &device_creator; +const device_type NEOGEO_PVC_MSLUG5_CART = device_creator; neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_MSLUG5_CART, "Neo Geo Metal Slug 5 PVC Cart", tag, owner, clock, "neocart_mslug5", __FILE__) {} @@ -87,7 +87,7 @@ void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS) svc **************************************************/ -const device_type NEOGEO_PVC_SVC_CART = &device_creator; +const device_type NEOGEO_PVC_SVC_CART = device_creator; neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_SVC_CART, "Neo Geo SNK vs Capcom PVC Cart", tag, owner, clock, "neocart_svc", __FILE__) @@ -107,7 +107,7 @@ void neogeo_pvc_svc_cart::decrypt_all(DECRYPT_ALL_PARAMS) kof2003 **************************************************/ -const device_type NEOGEO_PVC_KOF2003_CART = &device_creator; +const device_type NEOGEO_PVC_KOF2003_CART = device_creator; neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003_CART, "Neo Geo KOF 2003 PVC Cart", tag, owner, clock, "neocart_kof2003", __FILE__) @@ -126,7 +126,7 @@ void neogeo_pvc_kof2003_cart::decrypt_all(DECRYPT_ALL_PARAMS) kof2003h **************************************************/ -const device_type NEOGEO_PVC_KOF2003H_CART = &device_creator; +const device_type NEOGEO_PVC_KOF2003H_CART = device_creator; neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003H_CART, "Neo Geo KOF 2003 AES PVC Cart", tag, owner, clock, "neocart_kof2003h", __FILE__) diff --git a/src/devices/bus/neogeo/rom.cpp b/src/devices/bus/neogeo/rom.cpp index ddfdb18213d..e01bfbe6249 100644 --- a/src/devices/bus/neogeo/rom.cpp +++ b/src/devices/bus/neogeo/rom.cpp @@ -17,7 +17,7 @@ // neogeo_rom_device - constructor //------------------------------------------------- -const device_type NEOGEO_ROM = &device_creator; +const device_type NEOGEO_ROM = device_creator; neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -69,7 +69,7 @@ WRITE16_MEMBER(neogeo_rom_device::banksel_w) V-Liner : this is plain NeoGeo cart + RAM **************************************************/ -const device_type NEOGEO_VLINER_CART = &device_creator; +const device_type NEOGEO_VLINER_CART = device_creator; neogeo_vliner_cart::neogeo_vliner_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_rom_device(mconfig, NEOGEO_VLINER_CART, "Neo Geo V-Liner Cart", tag, owner, clock, "neocart_vliner", __FILE__) diff --git a/src/devices/bus/neogeo/sbp.cpp b/src/devices/bus/neogeo/sbp.cpp index 5947bab07da..82b6ef897c4 100644 --- a/src/devices/bus/neogeo/sbp.cpp +++ b/src/devices/bus/neogeo/sbp.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "sbp.h" -extern const device_type NEOGEO_SBP_CART = &device_creator; +const device_type NEOGEO_SBP_CART = device_creator; neogeo_sbp_cart::neogeo_sbp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_rom_device(mconfig, NEOGEO_SBP_CART, "Neo Geo Super Bubble Pop Cart", tag, owner, clock, "neocart_sbp", __FILE__) diff --git a/src/devices/bus/neogeo/slot.cpp b/src/devices/bus/neogeo/slot.cpp index b4dcf7ddfff..3cf6d9f51bb 100644 --- a/src/devices/bus/neogeo/slot.cpp +++ b/src/devices/bus/neogeo/slot.cpp @@ -13,7 +13,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type NEOGEO_CART_SLOT = &device_creator; +const device_type NEOGEO_CART_SLOT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/neogeo/sma.cpp b/src/devices/bus/neogeo/sma.cpp index f376297b24d..4c2beb8c9b4 100644 --- a/src/devices/bus/neogeo/sma.cpp +++ b/src/devices/bus/neogeo/sma.cpp @@ -16,7 +16,7 @@ // neogeo_sma_cart - constructor //------------------------------------------------- -const device_type NEOGEO_SMA_CART = &device_creator; +const device_type NEOGEO_SMA_CART = device_creator; neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) : @@ -64,7 +64,7 @@ machine_config_constructor neogeo_sma_cart::device_mconfig_additions() const kof99 **************************************************/ -const device_type NEOGEO_SMA_KOF99_CART = &device_creator; +const device_type NEOGEO_SMA_KOF99_CART = device_creator; neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF99_CART, "Neo Geo KOF 99 SMA Cart", tag, owner, clock, "neocart_kof99", __FILE__) @@ -82,7 +82,7 @@ void neogeo_sma_kof99_cart::decrypt_all(DECRYPT_ALL_PARAMS) garou **************************************************/ -const device_type NEOGEO_SMA_GAROU_CART = &device_creator; +const device_type NEOGEO_SMA_GAROU_CART = device_creator; neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "Neo Geo Garou SMA Cart", tag, owner, clock, "neocart_garou", __FILE__) @@ -100,7 +100,7 @@ void neogeo_sma_garou_cart::decrypt_all(DECRYPT_ALL_PARAMS) garouh **************************************************/ -const device_type NEOGEO_SMA_GAROUH_CART = &device_creator; +const device_type NEOGEO_SMA_GAROUH_CART = device_creator; neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROUH_CART, "Neo Geo Garou AES SMA Cart", tag, owner, clock, "neocart_garouh", __FILE__) @@ -118,7 +118,7 @@ void neogeo_sma_garouh_cart::decrypt_all(DECRYPT_ALL_PARAMS) mslug3 **************************************************/ -const device_type NEOGEO_SMA_MSLUG3_CART = &device_creator; +const device_type NEOGEO_SMA_MSLUG3_CART = device_creator; neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_MSLUG3_CART, "Neo Geo Metal Slug 3 SMA Cart", tag, owner, clock, "neocart_mslug3", __FILE__) @@ -136,7 +136,7 @@ void neogeo_sma_mslug3_cart::decrypt_all(DECRYPT_ALL_PARAMS) kof2000 **************************************************/ -const device_type NEOGEO_SMA_KOF2000_CART = &device_creator; +const device_type NEOGEO_SMA_KOF2000_CART = device_creator; neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF2000_CART, "Neo Geo KOF 2000 SMA Cart", tag, owner, clock, "neocart_kof2000", __FILE__) diff --git a/src/devices/bus/neogeo_ctrl/ctrl.cpp b/src/devices/bus/neogeo_ctrl/ctrl.cpp index 0ec1db0bfa7..870f830c4d1 100644 --- a/src/devices/bus/neogeo_ctrl/ctrl.cpp +++ b/src/devices/bus/neogeo_ctrl/ctrl.cpp @@ -30,8 +30,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type NEOGEO_CONTROL_PORT = &device_creator; -const device_type NEOGEO_CTRL_EDGE_CONNECTOR = &device_creator; +const device_type NEOGEO_CONTROL_PORT = device_creator; +const device_type NEOGEO_CTRL_EDGE_CONNECTOR = device_creator; //************************************************************************** diff --git a/src/devices/bus/neogeo_ctrl/dial.cpp b/src/devices/bus/neogeo_ctrl/dial.cpp index 95eaec1b5f2..6211a5b9ee1 100644 --- a/src/devices/bus/neogeo_ctrl/dial.cpp +++ b/src/devices/bus/neogeo_ctrl/dial.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEOGEO_DIAL = &device_creator; +const device_type NEOGEO_DIAL = device_creator; static INPUT_PORTS_START( neogeo_dial ) diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.cpp b/src/devices/bus/neogeo_ctrl/irrmaze.cpp index e612df7130b..51bc3cb043d 100644 --- a/src/devices/bus/neogeo_ctrl/irrmaze.cpp +++ b/src/devices/bus/neogeo_ctrl/irrmaze.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEOGEO_IRRMAZE = &device_creator; +const device_type NEOGEO_IRRMAZE = device_creator; static INPUT_PORTS_START( neogeo_irrmaze ) diff --git a/src/devices/bus/neogeo_ctrl/joystick.cpp b/src/devices/bus/neogeo_ctrl/joystick.cpp index 3441a522e34..dabed0aa13e 100644 --- a/src/devices/bus/neogeo_ctrl/joystick.cpp +++ b/src/devices/bus/neogeo_ctrl/joystick.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEOGEO_JOY = &device_creator; +const device_type NEOGEO_JOY = device_creator; static INPUT_PORTS_START( neogeo_joy ) @@ -118,7 +118,7 @@ uint8_t neogeo_joystick_device::read_start_sel() // DEVICE DEFINITIONS //************************************************************************** -const device_type NEOGEO_JOY_AC = &device_creator; +const device_type NEOGEO_JOY_AC = device_creator; static INPUT_PORTS_START( neogeo_joy_ac ) diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp index f4dc05779f7..72854f62241 100644 --- a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp +++ b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEOGEO_KIZ4P = &device_creator; +const device_type NEOGEO_KIZ4P = device_creator; static INPUT_PORTS_START( neogeo_kiz4p ) diff --git a/src/devices/bus/neogeo_ctrl/mahjong.cpp b/src/devices/bus/neogeo_ctrl/mahjong.cpp index 2eeb5b7586f..149c252f386 100644 --- a/src/devices/bus/neogeo_ctrl/mahjong.cpp +++ b/src/devices/bus/neogeo_ctrl/mahjong.cpp @@ -13,8 +13,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEOGEO_MJCTRL_AC = &device_creator; -const device_type NEOGEO_MJCTRL = &device_creator; +const device_type NEOGEO_MJCTRL_AC = device_creator; +const device_type NEOGEO_MJCTRL = device_creator; static INPUT_PORTS_START( neogeo_mj_ac ) diff --git a/src/devices/bus/nes/2a03pur.cpp b/src/devices/bus/nes/2a03pur.cpp index 9fc9da33883..8382814efe0 100644 --- a/src/devices/bus/nes/2a03pur.cpp +++ b/src/devices/bus/nes/2a03pur.cpp @@ -31,7 +31,7 @@ // constructor //------------------------------------------------- -const device_type NES_2A03PURITANS = &device_creator; +const device_type NES_2A03PURITANS = device_creator; nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp index 98bc04539ef..6dce9e066c3 100644 --- a/src/devices/bus/nes/act53.cpp +++ b/src/devices/bus/nes/act53.cpp @@ -29,7 +29,7 @@ // constructor //------------------------------------------------- -const device_type NES_ACTION53 = &device_creator; +const device_type NES_ACTION53 = device_creator; nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index 9eb9983f6b9..ce58a7e54c1 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -64,7 +64,7 @@ READ8_MEMBER(aladdin_cart_interface::read) // sub-cart slot device //------------------------------------------------- -const device_type NES_ALADDIN_SLOT = &device_creator; +const device_type NES_ALADDIN_SLOT = device_creator; nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NES_ALADDIN_SLOT, "NES Aladdin Deck Enhancer Cartridge Slot", tag, owner, clock, "nes_ade_slot", __FILE__), @@ -174,8 +174,8 @@ ROM_START( ade_rom ) ROM_REGION(0x40000, "aderom", ROMREGION_ERASEFF) ROM_END -const device_type NES_ALGN_ROM = &device_creator; -const device_type NES_ALGQ_ROM = &device_creator; +const device_type NES_ALGN_ROM = device_creator; +const device_type NES_ALGQ_ROM = device_creator; nes_algn_rom_device::nes_algn_rom_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), @@ -262,7 +262,7 @@ void nes_algq_rom_device::write_prg(uint32_t offset, uint8_t data) // //----------------------------------------------- -const device_type NES_ALADDIN = &device_creator; +const device_type NES_ALADDIN = device_creator; nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nes_nrom_device(mconfig, NES_ALADDIN, "NES Cart Camerica Aladdin PCB", tag, owner, clock, "nes_aladdin", __FILE__), diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp index 9634f39e202..fcc757b7651 100644 --- a/src/devices/bus/nes/ave.cpp +++ b/src/devices/bus/nes/ave.cpp @@ -33,9 +33,9 @@ // constructor //------------------------------------------------- -const device_type NES_NINA001 = &device_creator; -const device_type NES_NINA006 = &device_creator; -const device_type NES_MAXI15 = &device_creator; +const device_type NES_NINA001 = device_creator; +const device_type NES_NINA006 = device_creator; +const device_type NES_MAXI15 = device_creator; nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 8a3af94a65f..e75b6401205 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -50,12 +50,12 @@ // constructor //------------------------------------------------- -const device_type NES_OEKAKIDS = &device_creator; -const device_type NES_FCG = &device_creator; -const device_type NES_LZ93D50 = &device_creator; -const device_type NES_LZ93D50_24C01 = &device_creator; -const device_type NES_LZ93D50_24C02 = &device_creator; -const device_type NES_FJUMP2 = &device_creator; +const device_type NES_OEKAKIDS = device_creator; +const device_type NES_FCG = device_creator; +const device_type NES_LZ93D50 = device_creator; +const device_type NES_LZ93D50_24C01 = device_creator; +const device_type NES_LZ93D50_24C02 = device_creator; +const device_type NES_FJUMP2 = device_creator; nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp index 803b4413c54..0d41c8b3ae0 100644 --- a/src/devices/bus/nes/benshieng.cpp +++ b/src/devices/bus/nes/benshieng.cpp @@ -28,7 +28,7 @@ // constructor //------------------------------------------------- -const device_type NES_BENSHIENG = &device_creator; +const device_type NES_BENSHIENG = device_creator; nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp index 094ec65dd22..f38e92d8e97 100644 --- a/src/devices/bus/nes/bootleg.cpp +++ b/src/devices/bus/nes/bootleg.cpp @@ -23,6 +23,7 @@ #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE +#include "screen.h" #ifdef NES_PCB_DEBUG @@ -38,27 +39,27 @@ // constructor //------------------------------------------------- -const device_type NES_AX5705 = &device_creator; -const device_type NES_SC127 = &device_creator; -const device_type NES_MARIOBABY = &device_creator; -const device_type NES_ASN = &device_creator; -const device_type NES_SMB3PIRATE = &device_creator; -const device_type NES_BTL_DNINJA = &device_creator; -const device_type NES_WHIRLWIND_2706 = &device_creator; -const device_type NES_SMB2J = &device_creator; -const device_type NES_SMB2JA = &device_creator; -const device_type NES_SMB2JB = &device_creator; -const device_type NES_09034A = &device_creator; -const device_type NES_TOBIDASE = &device_creator; -const device_type NES_LH32 = &device_creator; -const device_type NES_LH10 = &device_creator; -const device_type NES_LH53 = &device_creator; -const device_type NES_2708 = &device_creator; -const device_type NES_AC08 = &device_creator; -const device_type NES_UNL_BB = &device_creator; -const device_type NES_MMALEE = &device_creator; -const device_type NES_SHUIGUAN = &device_creator; -const device_type NES_RT01 = &device_creator; +const device_type NES_AX5705 = device_creator; +const device_type NES_SC127 = device_creator; +const device_type NES_MARIOBABY = device_creator; +const device_type NES_ASN = device_creator; +const device_type NES_SMB3PIRATE = device_creator; +const device_type NES_BTL_DNINJA = device_creator; +const device_type NES_WHIRLWIND_2706 = device_creator; +const device_type NES_SMB2J = device_creator; +const device_type NES_SMB2JA = device_creator; +const device_type NES_SMB2JB = device_creator; +const device_type NES_09034A = device_creator; +const device_type NES_TOBIDASE = device_creator; +const device_type NES_LH32 = device_creator; +const device_type NES_LH10 = device_creator; +const device_type NES_LH53 = device_creator; +const device_type NES_2708 = device_creator; +const device_type NES_AC08 = device_creator; +const device_type NES_UNL_BB = device_creator; +const device_type NES_MMALEE = device_creator; +const device_type NES_SHUIGUAN = device_creator; +const device_type NES_RT01 = device_creator; nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp index 9d9a9a6f8ec..ca4e31bc11f 100644 --- a/src/devices/bus/nes/camerica.cpp +++ b/src/devices/bus/nes/camerica.cpp @@ -41,9 +41,9 @@ // constructor //------------------------------------------------- -const device_type NES_BF9093 = &device_creator; -const device_type NES_BF9096 = &device_creator; -const device_type NES_GOLDEN5 = &device_creator; +const device_type NES_BF9093 = device_creator; +const device_type NES_BF9096 = device_creator; +const device_type NES_GOLDEN5 = device_creator; nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp index eb4a2c8d33a..616814bbdc2 100644 --- a/src/devices/bus/nes/cne.cpp +++ b/src/devices/bus/nes/cne.cpp @@ -32,9 +32,9 @@ // constructor //------------------------------------------------- -const device_type NES_CNE_DECATHL = &device_creator; -const device_type NES_CNE_FSB = &device_creator; -const device_type NES_CNE_SHLZ = &device_creator; +const device_type NES_CNE_DECATHL = device_creator; +const device_type NES_CNE_FSB = device_creator; +const device_type NES_CNE_SHLZ = device_creator; nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp index 0fbebcda02f..3dbb66a7fb0 100644 --- a/src/devices/bus/nes/cony.cpp +++ b/src/devices/bus/nes/cony.cpp @@ -35,8 +35,8 @@ // constructor //------------------------------------------------- -const device_type NES_CONY = &device_creator; -const device_type NES_YOKO = &device_creator; +const device_type NES_CONY = device_creator; +const device_type NES_YOKO = device_creator; nes_cony_device::nes_cony_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) diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index c67c077ce4a..f4ac341d65b 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -65,7 +65,7 @@ READ8_MEMBER(datach_cart_interface::read) // sub-cart slot device //------------------------------------------------- -const device_type NES_DATACH_SLOT = &device_creator; +const device_type NES_DATACH_SLOT = device_creator; nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NES_DATACH_SLOT, "NES Datach Cartridge Slot", tag, owner, clock, "nes_datach_slot", __FILE__), @@ -159,8 +159,8 @@ ROM_START( datach_rom ) ROM_REGION(0x40000, "datachrom", ROMREGION_ERASEFF) ROM_END -const device_type NES_DATACH_ROM = &device_creator; -const device_type NES_DATACH_24C01 = &device_creator; +const device_type NES_DATACH_ROM = device_creator; +const device_type NES_DATACH_24C01 = device_creator; nes_datach_rom_device::nes_datach_rom_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), @@ -218,7 +218,7 @@ machine_config_constructor nes_datach_24c01_device::device_mconfig_additions() c // //--------------------------------- -const device_type NES_DATACH = &device_creator; +const device_type NES_DATACH = device_creator; nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp index a99b66fd77a..99751d689a1 100644 --- a/src/devices/bus/nes/discrete.cpp +++ b/src/devices/bus/nes/discrete.cpp @@ -35,10 +35,10 @@ // constructor //------------------------------------------------- -const device_type NES_74X161X161X32 = &device_creator; -const device_type NES_74X139X74 = &device_creator; -const device_type NES_74X377 = &device_creator; -const device_type NES_74X161X138 = &device_creator; +const device_type NES_74X161X161X32 = device_creator; +const device_type NES_74X139X74 = device_creator; +const device_type NES_74X377 = device_creator; +const device_type NES_74X161X138 = device_creator; nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index 9411c6bf8b0..11ad8c7c7a9 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -100,7 +100,7 @@ void nes_disksys_device::unload_proc(device_image_interface &image) // //------------------------------------------------ -const device_type NES_DISKSYS = &device_creator; +const device_type NES_DISKSYS = device_creator; nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp index 95197bb70bb..2440926cd1a 100644 --- a/src/devices/bus/nes/event.cpp +++ b/src/devices/bus/nes/event.cpp @@ -32,7 +32,7 @@ // constructor //------------------------------------------------- -const device_type NES_EVENT = &device_creator; +const device_type NES_EVENT = device_creator; nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp index 7831f91b717..2064b6e014b 100644 --- a/src/devices/bus/nes/ggenie.cpp +++ b/src/devices/bus/nes/ggenie.cpp @@ -30,7 +30,7 @@ // constructor //------------------------------------------------- -const device_type NES_GGENIE = &device_creator; +const device_type NES_GGENIE = device_creator; nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp index 2665dff69a2..eb69e5b3d94 100644 --- a/src/devices/bus/nes/henggedianzi.cpp +++ b/src/devices/bus/nes/henggedianzi.cpp @@ -38,9 +38,9 @@ // constructor //------------------------------------------------- -const device_type NES_HENGG_SRICH = &device_creator; -const device_type NES_HENGG_XHZS = &device_creator; -const device_type NES_HENGG_SHJY3 = &device_creator; +const device_type NES_HENGG_SRICH = device_creator; +const device_type NES_HENGG_XHZS = device_creator; +const device_type NES_HENGG_SHJY3 = device_creator; nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/hes.cpp b/src/devices/bus/nes/hes.cpp index 5daae861b6e..25d34fc4677 100644 --- a/src/devices/bus/nes/hes.cpp +++ b/src/devices/bus/nes/hes.cpp @@ -30,7 +30,7 @@ // constructor //------------------------------------------------- -const device_type NES_HES = &device_creator; +const device_type NES_HES = device_creator; nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/hosenkan.cpp b/src/devices/bus/nes/hosenkan.cpp index f9dccb9dbd8..a0eedabcd79 100644 --- a/src/devices/bus/nes/hosenkan.cpp +++ b/src/devices/bus/nes/hosenkan.cpp @@ -14,6 +14,7 @@ #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE +#include "screen.h" #ifdef NES_PCB_DEBUG @@ -29,7 +30,7 @@ // constructor //------------------------------------------------- -const device_type NES_HOSENKAN = &device_creator; +const device_type NES_HOSENKAN = device_creator; nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp index 5dea3e46832..c780d67315d 100644 --- a/src/devices/bus/nes/irem.cpp +++ b/src/devices/bus/nes/irem.cpp @@ -35,11 +35,11 @@ // constructor //------------------------------------------------- -const device_type NES_LROG017 = &device_creator; -const device_type NES_HOLYDIVR = &device_creator; -const device_type NES_TAM_S1 = &device_creator; -const device_type NES_G101 = &device_creator; -const device_type NES_H3001 = &device_creator; +const device_type NES_LROG017 = device_creator; +const device_type NES_HOLYDIVR = device_creator; +const device_type NES_TAM_S1 = device_creator; +const device_type NES_G101 = device_creator; +const device_type NES_H3001 = device_creator; nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index f910b840b70..9a3ca8922fa 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -23,6 +23,8 @@ #include "cpu/m6502/m6502.h" #include "sound/samples.h" +#include "speaker.h" + #ifdef NES_PCB_DEBUG #define VERBOSE 1 @@ -37,18 +39,18 @@ // constructor //------------------------------------------------- -const device_type NES_JF11 = &device_creator; -const device_type NES_JF16 = &device_creator; -const device_type NES_JF17 = &device_creator; -const device_type NES_JF19 = &device_creator; -const device_type NES_SS88006 = &device_creator; -const device_type NES_JF13 = &device_creator; -const device_type NES_JF17_ADPCM = &device_creator; -const device_type NES_JF19_ADPCM = &device_creator; -const device_type NES_JF23 = &device_creator; -const device_type NES_JF24 = &device_creator; -const device_type NES_JF29 = &device_creator; -const device_type NES_JF33 = &device_creator; +const device_type NES_JF11 = device_creator; +const device_type NES_JF16 = device_creator; +const device_type NES_JF17 = device_creator; +const device_type NES_JF19 = device_creator; +const device_type NES_SS88006 = device_creator; +const device_type NES_JF13 = device_creator; +const device_type NES_JF17_ADPCM = device_creator; +const device_type NES_JF19_ADPCM = device_creator; +const device_type NES_JF23 = device_creator; +const device_type NES_JF24 = device_creator; +const device_type NES_JF29 = device_creator; +const device_type NES_JF33 = device_creator; nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index acba59d0a18..d7582128e80 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -37,9 +37,9 @@ // constructor //------------------------------------------------- -const device_type NES_JY_TYPEA = &device_creator; -const device_type NES_JY_TYPEB = &device_creator; -const device_type NES_JY_TYPEC = &device_creator; +const device_type NES_JY_TYPEA = device_creator; +const device_type NES_JY_TYPEB = device_creator; +const device_type NES_JY_TYPEC = device_creator; nes_jy_typea_device::nes_jy_typea_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) diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index 4dfdeb867d6..c01d4819541 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -48,16 +48,16 @@ // constructor //------------------------------------------------- -const device_type NES_KS7058 = &device_creator; -const device_type NES_KS7022 = &device_creator; -const device_type NES_KS7032 = &device_creator; -const device_type NES_KS202 = &device_creator; -const device_type NES_KS7017 = &device_creator; -const device_type NES_KS7012 = &device_creator; -const device_type NES_KS7013B = &device_creator; -const device_type NES_KS7031 = &device_creator; -const device_type NES_KS7016 = &device_creator; -const device_type NES_KS7037 = &device_creator; +const device_type NES_KS7058 = device_creator; +const device_type NES_KS7022 = device_creator; +const device_type NES_KS7032 = device_creator; +const device_type NES_KS202 = device_creator; +const device_type NES_KS7017 = device_creator; +const device_type NES_KS7012 = device_creator; +const device_type NES_KS7013B = device_creator; +const device_type NES_KS7031 = device_creator; +const device_type NES_KS7016 = device_creator; +const device_type NES_KS7037 = device_creator; nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp index 74c9704c766..8e78ee20e75 100644 --- a/src/devices/bus/nes/karastudio.cpp +++ b/src/devices/bus/nes/karastudio.cpp @@ -69,7 +69,7 @@ READ8_MEMBER(kstudio_cart_interface::read) // sub-cart slot device //------------------------------------------------- -const device_type NES_KSEXPANSION_SLOT = &device_creator; +const device_type NES_KSEXPANSION_SLOT = device_creator; nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NES_KSEXPANSION_SLOT, "NES Karaoke Studio Expansion Slot", tag, owner, clock, "nes_ks_slot", __FILE__), @@ -142,7 +142,7 @@ ROM_START( ks_exp_rom ) ROM_REGION(0x20000, "exrom", ROMREGION_ERASEFF) ROM_END -const device_type NES_KSEXPANSION_ROM = &device_creator; +const device_type NES_KSEXPANSION_ROM = device_creator; nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NES_KSEXPANSION_ROM, "NES Karaoke Studio Expansion ROM", tag, owner, clock, "nes_ks_rom", __FILE__), @@ -178,7 +178,7 @@ uint8_t *nes_kstudio_rom_device::get_cart_base() // //------------------------------------------ -const device_type NES_KARAOKESTUDIO = &device_creator; +const device_type NES_KARAOKESTUDIO = device_creator; nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index a7565d5af96..e807b813091 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -28,6 +28,8 @@ #include "konami.h" #include "cpu/m6502/m6502.h" +#include "speaker.h" + #ifdef NES_PCB_DEBUG #define VERBOSE 1 @@ -43,12 +45,12 @@ // constructor //------------------------------------------------- -const device_type NES_VRC1 = &device_creator; -const device_type NES_VRC2 = &device_creator; -const device_type NES_VRC3 = &device_creator; -const device_type NES_VRC4 = &device_creator; -const device_type NES_VRC6 = &device_creator; -const device_type NES_VRC7 = &device_creator; +const device_type NES_VRC1 = device_creator; +const device_type NES_VRC2 = device_creator; +const device_type NES_VRC3 = device_creator; +const device_type NES_VRC4 = device_creator; +const device_type NES_VRC6 = device_creator; +const device_type NES_VRC7 = device_creator; nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index 888a5077146..c5342004351 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -34,9 +34,9 @@ // constructor //------------------------------------------------- -const device_type NES_FFE3 = &device_creator; -const device_type NES_FFE4 = &device_creator; -const device_type NES_FFE8 = &device_creator; +const device_type NES_FFE3 = device_creator; +const device_type NES_FFE4 = device_creator; +const device_type NES_FFE8 = device_creator; nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp index 983fb5bfcb8..fe1680116af 100644 --- a/src/devices/bus/nes/mmc1.cpp +++ b/src/devices/bus/nes/mmc1.cpp @@ -32,10 +32,10 @@ // constructor //------------------------------------------------- -const device_type NES_SXROM = &device_creator; -const device_type NES_SOROM = &device_creator; -const device_type NES_SXROM_A = &device_creator; -const device_type NES_SOROM_A = &device_creator; +const device_type NES_SXROM = device_creator; +const device_type NES_SOROM = device_creator; +const device_type NES_SXROM_A = device_creator; +const device_type NES_SOROM_A = device_creator; diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp index 1fedbab04df..d1871483a68 100644 --- a/src/devices/bus/nes/mmc2.cpp +++ b/src/devices/bus/nes/mmc2.cpp @@ -28,8 +28,8 @@ // constructor //------------------------------------------------- -const device_type NES_PXROM = &device_creator; -const device_type NES_FXROM = &device_creator; +const device_type NES_PXROM = device_creator; +const device_type NES_FXROM = device_creator; nes_pxrom_device::nes_pxrom_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) diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp index 1357ceb119b..75aa036d39b 100644 --- a/src/devices/bus/nes/mmc3.cpp +++ b/src/devices/bus/nes/mmc3.cpp @@ -30,6 +30,7 @@ #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE +#include "screen.h" #ifdef NES_PCB_DEBUG @@ -45,12 +46,12 @@ // constructor //------------------------------------------------- -const device_type NES_TXROM = &device_creator; -const device_type NES_HKROM = &device_creator; -const device_type NES_TXSROM = &device_creator; -const device_type NES_TQROM = &device_creator; -const device_type NES_QJ_PCB = &device_creator; -const device_type NES_ZZ_PCB = &device_creator; +const device_type NES_TXROM = device_creator; +const device_type NES_HKROM = device_creator; +const device_type NES_TXSROM = device_creator; +const device_type NES_TQROM = device_creator; +const device_type NES_QJ_PCB = device_creator; +const device_type NES_ZZ_PCB = device_creator; nes_txrom_device::nes_txrom_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) diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp index b9866c1e63e..1485e6411ce 100644 --- a/src/devices/bus/nes/mmc3_clones.cpp +++ b/src/devices/bus/nes/mmc3_clones.cpp @@ -28,42 +28,42 @@ // constructor //------------------------------------------------- -const device_type NES_NITRA = &device_creator; -const device_type NES_KS7057 = &device_creator; -const device_type NES_SBROS11 = &device_creator; -const device_type NES_MALISB = &device_creator; -const device_type NES_FAMILY4646 = &device_creator; -const device_type NES_PIKAY2K = &device_creator; -const device_type NES_8237 = &device_creator; -const device_type NES_SG_LIONK = &device_creator; -const device_type NES_SG_BOOG = &device_creator; -const device_type NES_KASING = &device_creator; -const device_type NES_KAY = &device_creator; -const device_type NES_H2288 = &device_creator; -const device_type NES_6035052 = &device_creator; -const device_type NES_TXC_TW = &device_creator; -const device_type NES_KOF97 = &device_creator; -const device_type NES_KOF96 = &device_creator; -const device_type NES_SF3 = &device_creator; -const device_type NES_GOUDER = &device_creator; -const device_type NES_SA9602B = &device_creator; -const device_type NES_SACHEN_SHERO = &device_creator; -//const device_type NES_A9746 = &device_creator; - -const device_type NES_FK23C = &device_creator; -const device_type NES_FK23CA = &device_creator; -const device_type NES_S24IN1SC03 = &device_creator; -const device_type NES_BMC_15IN1 = &device_creator; -const device_type NES_BMC_SBIG7 = &device_creator; -const device_type NES_BMC_HIK8 = &device_creator; -const device_type NES_BMC_HIK4 = &device_creator; -const device_type NES_BMC_MARIO7IN1 = &device_creator; -const device_type NES_BMC_GOLD7IN1 = &device_creator; -const device_type NES_BMC_GC6IN1 = &device_creator; -const device_type NES_BMC_411120C = &device_creator; -const device_type NES_BMC_830118C = &device_creator; -const device_type NES_PJOY84 = &device_creator; -const device_type NES_COOLBOY = &device_creator; +const device_type NES_NITRA = device_creator; +const device_type NES_KS7057 = device_creator; +const device_type NES_SBROS11 = device_creator; +const device_type NES_MALISB = device_creator; +const device_type NES_FAMILY4646 = device_creator; +const device_type NES_PIKAY2K = device_creator; +const device_type NES_8237 = device_creator; +const device_type NES_SG_LIONK = device_creator; +const device_type NES_SG_BOOG = device_creator; +const device_type NES_KASING = device_creator; +const device_type NES_KAY = device_creator; +const device_type NES_H2288 = device_creator; +const device_type NES_6035052 = device_creator; +const device_type NES_TXC_TW = device_creator; +const device_type NES_KOF97 = device_creator; +const device_type NES_KOF96 = device_creator; +const device_type NES_SF3 = device_creator; +const device_type NES_GOUDER = device_creator; +const device_type NES_SA9602B = device_creator; +const device_type NES_SACHEN_SHERO = device_creator; +//const device_type NES_A9746 = device_creator; + +const device_type NES_FK23C = device_creator; +const device_type NES_FK23CA = device_creator; +const device_type NES_S24IN1SC03 = device_creator; +const device_type NES_BMC_15IN1 = device_creator; +const device_type NES_BMC_SBIG7 = device_creator; +const device_type NES_BMC_HIK8 = device_creator; +const device_type NES_BMC_HIK4 = device_creator; +const device_type NES_BMC_MARIO7IN1 = device_creator; +const device_type NES_BMC_GOLD7IN1 = device_creator; +const device_type NES_BMC_GC6IN1 = device_creator; +const device_type NES_BMC_411120C = device_creator; +const device_type NES_BMC_830118C = device_creator; +const device_type NES_PJOY84 = device_creator; +const device_type NES_COOLBOY = device_creator; nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp index 239fbe633cf..ff0f382626b 100644 --- a/src/devices/bus/nes/mmc5.cpp +++ b/src/devices/bus/nes/mmc5.cpp @@ -41,7 +41,7 @@ static const int m_mmc5_attrib[4] = {0x00, 0x55, 0xaa, 0xff}; // constructor //------------------------------------------------- -const device_type NES_EXROM = &device_creator; +const device_type NES_EXROM = device_creator; nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp index 52ae1baccbe..0f01641de1a 100644 --- a/src/devices/bus/nes/multigame.cpp +++ b/src/devices/bus/nes/multigame.cpp @@ -28,53 +28,53 @@ // constructor //------------------------------------------------- -const device_type NES_ACTION52 = &device_creator; -const device_type NES_CALTRON6IN1 = &device_creator; -const device_type NES_RUMBLESTATION = &device_creator; -const device_type NES_SVISION16 = &device_creator; -const device_type NES_N625092 = &device_creator; -const device_type NES_A65AS = &device_creator; -const device_type NES_T262 = &device_creator; -const device_type NES_NOVEL1 = &device_creator; -const device_type NES_NOVEL2 = &device_creator; -const device_type NES_STUDYNGAME = &device_creator; -const device_type NES_SUPERGUN20IN1 = &device_creator; -const device_type NES_VT5201 = &device_creator; -const device_type NES_810544C = &device_creator; -const device_type NES_NTD03 = &device_creator; -const device_type NES_BMC_GB63 = &device_creator; -const device_type NES_BMC_GKA = &device_creator; -const device_type NES_BMC_GKB = &device_creator; -const device_type NES_BMC_WS = &device_creator; -const device_type NES_BMC_11160 = &device_creator; -const device_type NES_BMC_G146 = &device_creator; -const device_type NES_BMC_8157 = &device_creator; -const device_type NES_BMC_HIK300 = &device_creator; -const device_type NES_BMC_S700 = &device_creator; -const device_type NES_BMC_BALL11 = &device_creator; -const device_type NES_BMC_22GAMES = &device_creator; -const device_type NES_BMC_64Y2K = &device_creator; -const device_type NES_BMC_12IN1 = &device_creator; -const device_type NES_BMC_20IN1 = &device_creator; -const device_type NES_BMC_21IN1 = &device_creator; -const device_type NES_BMC_31IN1 = &device_creator; -const device_type NES_BMC_35IN1 = &device_creator; -const device_type NES_BMC_36IN1 = &device_creator; -const device_type NES_BMC_64IN1 = &device_creator; -const device_type NES_BMC_70IN1 = &device_creator; -const device_type NES_BMC_72IN1 = &device_creator; -const device_type NES_BMC_76IN1 = &device_creator; -const device_type NES_BMC_110IN1 = &device_creator; -const device_type NES_BMC_150IN1 = &device_creator; -const device_type NES_BMC_190IN1 = &device_creator; -const device_type NES_BMC_800IN1 = &device_creator; -const device_type NES_BMC_1200IN1 = &device_creator; -const device_type NES_BMC_GOLD150 = &device_creator; -const device_type NES_BMC_GOLD260 = &device_creator; -const device_type NES_BMC_CH001 = &device_creator; -const device_type NES_BMC_SUPER22 = &device_creator; -const device_type NES_BMC_4IN1RESET = &device_creator; -const device_type NES_BMC_42IN1RESET = &device_creator; +const device_type NES_ACTION52 = device_creator; +const device_type NES_CALTRON6IN1 = device_creator; +const device_type NES_RUMBLESTATION = device_creator; +const device_type NES_SVISION16 = device_creator; +const device_type NES_N625092 = device_creator; +const device_type NES_A65AS = device_creator; +const device_type NES_T262 = device_creator; +const device_type NES_NOVEL1 = device_creator; +const device_type NES_NOVEL2 = device_creator; +const device_type NES_STUDYNGAME = device_creator; +const device_type NES_SUPERGUN20IN1 = device_creator; +const device_type NES_VT5201 = device_creator; +const device_type NES_810544C = device_creator; +const device_type NES_NTD03 = device_creator; +const device_type NES_BMC_GB63 = device_creator; +const device_type NES_BMC_GKA = device_creator; +const device_type NES_BMC_GKB = device_creator; +const device_type NES_BMC_WS = device_creator; +const device_type NES_BMC_11160 = device_creator; +const device_type NES_BMC_G146 = device_creator; +const device_type NES_BMC_8157 = device_creator; +const device_type NES_BMC_HIK300 = device_creator; +const device_type NES_BMC_S700 = device_creator; +const device_type NES_BMC_BALL11 = device_creator; +const device_type NES_BMC_22GAMES = device_creator; +const device_type NES_BMC_64Y2K = device_creator; +const device_type NES_BMC_12IN1 = device_creator; +const device_type NES_BMC_20IN1 = device_creator; +const device_type NES_BMC_21IN1 = device_creator; +const device_type NES_BMC_31IN1 = device_creator; +const device_type NES_BMC_35IN1 = device_creator; +const device_type NES_BMC_36IN1 = device_creator; +const device_type NES_BMC_64IN1 = device_creator; +const device_type NES_BMC_70IN1 = device_creator; +const device_type NES_BMC_72IN1 = device_creator; +const device_type NES_BMC_76IN1 = device_creator; +const device_type NES_BMC_110IN1 = device_creator; +const device_type NES_BMC_150IN1 = device_creator; +const device_type NES_BMC_190IN1 = device_creator; +const device_type NES_BMC_800IN1 = device_creator; +const device_type NES_BMC_1200IN1 = device_creator; +const device_type NES_BMC_GOLD150 = device_creator; +const device_type NES_BMC_GOLD260 = device_creator; +const device_type NES_BMC_CH001 = device_creator; +const device_type NES_BMC_SUPER22 = device_creator; +const device_type NES_BMC_4IN1RESET = device_creator; +const device_type NES_BMC_42IN1RESET = device_creator; nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp index e65f15906be..8b443efcbd2 100644 --- a/src/devices/bus/nes/namcot.cpp +++ b/src/devices/bus/nes/namcot.cpp @@ -41,12 +41,12 @@ // constructor //------------------------------------------------- -const device_type NES_NAMCOT3433 = &device_creator; -const device_type NES_NAMCOT3446 = &device_creator; -const device_type NES_NAMCOT3425 = &device_creator; -const device_type NES_NAMCOT175 = &device_creator; -const device_type NES_NAMCOT340 = &device_creator; -const device_type NES_NAMCOT163 = &device_creator; +const device_type NES_NAMCOT3433 = device_creator; +const device_type NES_NAMCOT3446 = device_creator; +const device_type NES_NAMCOT3425 = device_creator; +const device_type NES_NAMCOT175 = device_creator; +const device_type NES_NAMCOT340 = device_creator; +const device_type NES_NAMCOT163 = device_creator; nes_namcot3433_device::nes_namcot3433_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) diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp index 8163cb7e156..8acc871f81c 100644 --- a/src/devices/bus/nes/nanjing.cpp +++ b/src/devices/bus/nes/nanjing.cpp @@ -30,7 +30,7 @@ // constructor //------------------------------------------------- -const device_type NES_NANJING = &device_creator; +const device_type NES_NANJING = device_creator; nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index d2cf5491d69..9832b2265ed 100644 --- a/src/devices/bus/nes/nes_slot.cpp +++ b/src/devices/bus/nes/nes_slot.cpp @@ -93,7 +93,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type NES_CART_SLOT = &device_creator; +const device_type NES_CART_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp index 2e75216664d..a2547a97185 100644 --- a/src/devices/bus/nes/ntdec.cpp +++ b/src/devices/bus/nes/ntdec.cpp @@ -34,8 +34,8 @@ // constructor //------------------------------------------------- -const device_type NES_NTDEC_ASDER = &device_creator; -const device_type NES_NTDEC_FH = &device_creator; +const device_type NES_NTDEC_ASDER = device_creator; +const device_type NES_NTDEC_FH = device_creator; nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index 4af56430356..6996fe50faa 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -45,18 +45,18 @@ // constructor //------------------------------------------------- -const device_type NES_NROM = &device_creator; -const device_type NES_NROM368 = &device_creator; -const device_type NES_FCBASIC = &device_creator; -const device_type NES_AXROM = &device_creator; -const device_type NES_BXROM = &device_creator; -const device_type NES_CNROM = &device_creator; -const device_type NES_CPROM = &device_creator; -const device_type NES_GXROM = &device_creator; -const device_type NES_UXROM = &device_creator; -const device_type NES_UXROM_CC = &device_creator; -const device_type NES_UN1ROM = &device_creator; -const device_type NES_NOCHR = &device_creator; +const device_type NES_NROM = device_creator; +const device_type NES_NROM368 = device_creator; +const device_type NES_FCBASIC = device_creator; +const device_type NES_AXROM = device_creator; +const device_type NES_BXROM = device_creator; +const device_type NES_CNROM = device_creator; +const device_type NES_CPROM = device_creator; +const device_type NES_GXROM = device_creator; +const device_type NES_UXROM = device_creator; +const device_type NES_UXROM_CC = device_creator; +const device_type NES_UN1ROM = device_creator; +const device_type NES_NOCHR = device_creator; nes_nrom_device::nes_nrom_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) diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp index 69e6117b977..7dc16f516a3 100644 --- a/src/devices/bus/nes/pirate.cpp +++ b/src/devices/bus/nes/pirate.cpp @@ -19,6 +19,7 @@ #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE +#include "screen.h" #ifdef NES_PCB_DEBUG @@ -34,23 +35,23 @@ // constructor //------------------------------------------------- -const device_type NES_AGCI_50282 = &device_creator; -const device_type NES_DREAMTECH01 = &device_creator; -const device_type NES_FUKUTAKE = &device_creator; -const device_type NES_FUTUREMEDIA = &device_creator; -const device_type NES_MAGSERIES = &device_creator; -const device_type NES_DAOU306 = &device_creator; -const device_type NES_SUBOR0 = &device_creator; -const device_type NES_SUBOR1 = &device_creator; -const device_type NES_CC21 = &device_creator; -const device_type NES_XIAOZY = &device_creator; -const device_type NES_EDU2K = &device_creator; -const device_type NES_T230 = &device_creator; -const device_type NES_MK2 = &device_creator; -const device_type NES_WHERO = &device_creator; -const device_type NES_43272 = &device_creator; -const device_type NES_TF1201 = &device_creator; -const device_type NES_CITYFIGHT = &device_creator; +const device_type NES_AGCI_50282 = device_creator; +const device_type NES_DREAMTECH01 = device_creator; +const device_type NES_FUKUTAKE = device_creator; +const device_type NES_FUTUREMEDIA = device_creator; +const device_type NES_MAGSERIES = device_creator; +const device_type NES_DAOU306 = device_creator; +const device_type NES_SUBOR0 = device_creator; +const device_type NES_SUBOR1 = device_creator; +const device_type NES_CC21 = device_creator; +const device_type NES_XIAOZY = device_creator; +const device_type NES_EDU2K = device_creator; +const device_type NES_T230 = device_creator; +const device_type NES_MK2 = device_creator; +const device_type NES_WHERO = device_creator; +const device_type NES_43272 = device_creator; +const device_type NES_TF1201 = device_creator; +const device_type NES_CITYFIGHT = device_creator; nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp index 2794a78a55e..a12d3e63145 100644 --- a/src/devices/bus/nes/pt554.cpp +++ b/src/devices/bus/nes/pt554.cpp @@ -16,6 +16,7 @@ #include "emu.h" #include "pt554.h" +#include "speaker.h" #ifdef NES_PCB_DEBUG @@ -31,7 +32,7 @@ // constructor //------------------------------------------------- -const device_type NES_BANDAI_PT554 = &device_creator; +const device_type NES_BANDAI_PT554 = device_creator; nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp index f56733d2127..680433e4ed4 100644 --- a/src/devices/bus/nes/racermate.cpp +++ b/src/devices/bus/nes/racermate.cpp @@ -32,7 +32,7 @@ // constructor //------------------------------------------------- -const device_type NES_RACERMATE = &device_creator; +const device_type NES_RACERMATE = device_creator; nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp index 30f867cb39b..aedda67cc46 100644 --- a/src/devices/bus/nes/rcm.cpp +++ b/src/devices/bus/nes/rcm.cpp @@ -39,11 +39,11 @@ // constructor //------------------------------------------------- -const device_type NES_GS2015 = &device_creator; -const device_type NES_GS2004 = &device_creator; -const device_type NES_GS2013 = &device_creator; -const device_type NES_TF9IN1 = &device_creator; -const device_type NES_3DBLOCK = &device_creator; +const device_type NES_GS2015 = device_creator; +const device_type NES_GS2004 = device_creator; +const device_type NES_GS2013 = device_creator; +const device_type NES_TF9IN1 = device_creator; +const device_type NES_3DBLOCK = device_creator; nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp index de49c5d9af9..9aaaed7721b 100644 --- a/src/devices/bus/nes/rexsoft.cpp +++ b/src/devices/bus/nes/rexsoft.cpp @@ -35,8 +35,8 @@ // constructor //------------------------------------------------- -const device_type NES_REX_DBZ5 = &device_creator; -const device_type NES_REX_SL1632 = &device_creator; +const device_type NES_REX_DBZ5 = device_creator; +const device_type NES_REX_SL1632 = device_creator; nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp index e000b23216e..317f2e7e78c 100644 --- a/src/devices/bus/nes/sachen.cpp +++ b/src/devices/bus/nes/sachen.cpp @@ -44,20 +44,20 @@ // constructor //------------------------------------------------- -const device_type NES_SACHEN_SA009 = &device_creator; -const device_type NES_SACHEN_SA0036 = &device_creator; -const device_type NES_SACHEN_SA0037 = &device_creator; -const device_type NES_SACHEN_SA72007 = &device_creator; -const device_type NES_SACHEN_SA72008 = &device_creator; -const device_type NES_SACHEN_TCA01 = &device_creator; -const device_type NES_SACHEN_TCU01 = &device_creator; -const device_type NES_SACHEN_TCU02 = &device_creator; -const device_type NES_SACHEN_74X374 = &device_creator; -const device_type NES_SACHEN_74X374_ALT = &device_creator; -const device_type NES_SACHEN_8259A = &device_creator; -const device_type NES_SACHEN_8259B = &device_creator; -const device_type NES_SACHEN_8259C = &device_creator; -const device_type NES_SACHEN_8259D = &device_creator; +const device_type NES_SACHEN_SA009 = device_creator; +const device_type NES_SACHEN_SA0036 = device_creator; +const device_type NES_SACHEN_SA0037 = device_creator; +const device_type NES_SACHEN_SA72007 = device_creator; +const device_type NES_SACHEN_SA72008 = device_creator; +const device_type NES_SACHEN_TCA01 = device_creator; +const device_type NES_SACHEN_TCU01 = device_creator; +const device_type NES_SACHEN_TCU02 = device_creator; +const device_type NES_SACHEN_74X374 = device_creator; +const device_type NES_SACHEN_74X374_ALT = device_creator; +const device_type NES_SACHEN_8259A = device_creator; +const device_type NES_SACHEN_8259B = device_creator; +const device_type NES_SACHEN_8259C = device_creator; +const device_type NES_SACHEN_8259D = device_creator; nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp index 9990ae8d9db..b1f172567fe 100644 --- a/src/devices/bus/nes/somari.cpp +++ b/src/devices/bus/nes/somari.cpp @@ -36,7 +36,7 @@ // constructor //------------------------------------------------- -const device_type NES_SOMARI = &device_creator; +const device_type NES_SOMARI = device_creator; nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index 133bdcf2858..bf35510946e 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -26,6 +26,8 @@ #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" +#include "speaker.h" + #ifdef NES_PCB_DEBUG #define VERBOSE 1 @@ -40,12 +42,12 @@ // constructor //------------------------------------------------- -const device_type NES_SUNSOFT_1 = &device_creator; -const device_type NES_SUNSOFT_2 = &device_creator; -const device_type NES_SUNSOFT_3 = &device_creator; -const device_type NES_SUNSOFT_4 = &device_creator; -const device_type NES_SUNSOFT_FME7 = &device_creator; -const device_type NES_SUNSOFT_5 = &device_creator; +const device_type NES_SUNSOFT_1 = device_creator; +const device_type NES_SUNSOFT_2 = device_creator; +const device_type NES_SUNSOFT_3 = device_creator; +const device_type NES_SUNSOFT_4 = device_creator; +const device_type NES_SUNSOFT_FME7 = device_creator; +const device_type NES_SUNSOFT_5 = device_creator; nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp index 0ad26e2374e..0a960b5d1d8 100644 --- a/src/devices/bus/nes/sunsoft_dcs.cpp +++ b/src/devices/bus/nes/sunsoft_dcs.cpp @@ -48,7 +48,7 @@ ntb_cart_interface::~ntb_cart_interface() // sub-cart slot device //------------------------------------------------- -const device_type NES_NTB_SLOT = &device_creator; +const device_type NES_NTB_SLOT = device_creator; nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock, "nes_ntb_slot", __FILE__), @@ -120,7 +120,7 @@ ROM_START( ntb_rom ) ROM_REGION(0x4000, "ntbrom", ROMREGION_ERASEFF) ROM_END -const device_type NES_NTB_ROM = &device_creator; +const device_type NES_NTB_ROM = device_creator; nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NES_NTB_ROM, "NES NTB ROM", tag, owner, clock, "nes_ntbrom", __FILE__), @@ -153,7 +153,7 @@ uint8_t *nes_ntb_rom_device::get_cart_base() // //------------------------------------------------ -const device_type NES_SUNSOFT_DCS = &device_creator; +const device_type NES_SUNSOFT_DCS = device_creator; nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index 38f156080ae..b417f6dcc3a 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -41,10 +41,10 @@ // constructor //------------------------------------------------- -const device_type NES_TC0190FMC = &device_creator; -const device_type NES_TC0190FMC_PAL16R4 = &device_creator; -const device_type NES_X1_005 = &device_creator; -const device_type NES_X1_017 = &device_creator; +const device_type NES_TC0190FMC = device_creator; +const device_type NES_TC0190FMC_PAL16R4 = device_creator; +const device_type NES_X1_005 = device_creator; +const device_type NES_X1_017 = device_creator; nes_tc0190fmc_device::nes_tc0190fmc_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) diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index af37dc223e0..24c8843637f 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -38,9 +38,9 @@ // constructor //------------------------------------------------- -const device_type NES_TENGEN_800008 = &device_creator; -const device_type NES_TENGEN_800032 = &device_creator; -const device_type NES_TENGEN_800037 = &device_creator; +const device_type NES_TENGEN_800008 = device_creator; +const device_type NES_TENGEN_800032 = device_creator; +const device_type NES_TENGEN_800037 = device_creator; nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp index daa01bca558..c6c4b6b9ad1 100644 --- a/src/devices/bus/nes/txc.cpp +++ b/src/devices/bus/nes/txc.cpp @@ -37,11 +37,11 @@ // constructor //------------------------------------------------- -const device_type NES_TXC_22211 = &device_creator; -const device_type NES_TXC_DUMARACING = &device_creator; -const device_type NES_TXC_MJBLOCK = &device_creator; -const device_type NES_TXC_STRIKEW = &device_creator; -const device_type NES_TXC_COMMANDOS = &device_creator; +const device_type NES_TXC_22211 = device_creator; +const device_type NES_TXC_DUMARACING = device_creator; +const device_type NES_TXC_MJBLOCK = device_creator; +const device_type NES_TXC_STRIKEW = device_creator; +const device_type NES_TXC_COMMANDOS = device_creator; nes_txc_22211_device::nes_txc_22211_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) diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index 509797a22ab..14dad5f7144 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -33,27 +33,27 @@ // constructor //------------------------------------------------- -const device_type NES_WAIXING_A = &device_creator; -const device_type NES_WAIXING_A1 = &device_creator; -const device_type NES_WAIXING_B = &device_creator; -const device_type NES_WAIXING_C = &device_creator; -const device_type NES_WAIXING_D = &device_creator; -const device_type NES_WAIXING_E = &device_creator; -const device_type NES_WAIXING_F = &device_creator; -const device_type NES_WAIXING_G = &device_creator; -const device_type NES_WAIXING_H = &device_creator; -const device_type NES_WAIXING_H1 = &device_creator; -const device_type NES_WAIXING_I = &device_creator; -const device_type NES_WAIXING_J = &device_creator; -const device_type NES_WAIXING_SH2 = &device_creator; -const device_type NES_WAIXING_SEC = &device_creator; -const device_type NES_WAIXING_SGZ = &device_creator; -const device_type NES_WAIXING_SGZLZ = &device_creator; -const device_type NES_WAIXING_FFV = &device_creator; -const device_type NES_WAIXING_WXZS = &device_creator; -const device_type NES_WAIXING_DQ8 = &device_creator; -const device_type NES_WAIXING_WXZS2 = &device_creator; -const device_type NES_WAIXING_FS304 = &device_creator; +const device_type NES_WAIXING_A = device_creator; +const device_type NES_WAIXING_A1 = device_creator; +const device_type NES_WAIXING_B = device_creator; +const device_type NES_WAIXING_C = device_creator; +const device_type NES_WAIXING_D = device_creator; +const device_type NES_WAIXING_E = device_creator; +const device_type NES_WAIXING_F = device_creator; +const device_type NES_WAIXING_G = device_creator; +const device_type NES_WAIXING_H = device_creator; +const device_type NES_WAIXING_H1 = device_creator; +const device_type NES_WAIXING_I = device_creator; +const device_type NES_WAIXING_J = device_creator; +const device_type NES_WAIXING_SH2 = device_creator; +const device_type NES_WAIXING_SEC = device_creator; +const device_type NES_WAIXING_SGZ = device_creator; +const device_type NES_WAIXING_SGZLZ = device_creator; +const device_type NES_WAIXING_FFV = device_creator; +const device_type NES_WAIXING_WXZS = device_creator; +const device_type NES_WAIXING_DQ8 = device_creator; +const device_type NES_WAIXING_WXZS2 = device_creator; +const device_type NES_WAIXING_FS304 = device_creator; nes_waixing_a_device::nes_waixing_a_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) diff --git a/src/devices/bus/nes/zemina.cpp b/src/devices/bus/nes/zemina.cpp index f17e3eb981e..bc20a8b3efb 100644 --- a/src/devices/bus/nes/zemina.cpp +++ b/src/devices/bus/nes/zemina.cpp @@ -21,7 +21,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_ZEMINA = &device_creator; +const device_type NES_ZEMINA = device_creator; //************************************************************************** // LIVE DEVICE @@ -32,7 +32,7 @@ const device_type NES_ZEMINA = &device_creator; //------------------------------------------------- nes_zemina_device::nes_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : nes_nrom_device(mconfig, NES_ZEMINA, "NES Cart Zemina PCB", tag, owner, clock, "nes_zemina", __FILE__) + : nes_nrom_device(mconfig, NES_ZEMINA, "NES Cart Zemina PCB", tag, owner, clock, "nes_zemina", __FILE__) { } @@ -110,4 +110,4 @@ WRITE8_MEMBER(nes_zemina_device::write_h) break; } } -} \ No newline at end of file +} diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp index d3fafdd15bf..ee2dc33db49 100644 --- a/src/devices/bus/nes_ctrl/4score.cpp +++ b/src/devices/bus/nes_ctrl/4score.cpp @@ -37,8 +37,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_4SCORE_P1P3 = &device_creator; -const device_type NES_4SCORE_P2P4 = &device_creator; +const device_type NES_4SCORE_P1P3 = device_creator; +const device_type NES_4SCORE_P2P4 = device_creator; static INPUT_PORTS_START( nes_4score_p1p3 ) diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp index 00baef8ff06..e4b24692fb1 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.cpp +++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp @@ -14,8 +14,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_ARKPADDLE = &device_creator; -const device_type NES_ARKPADDLE_FC = &device_creator; +const device_type NES_ARKPADDLE = device_creator; +const device_type NES_ARKPADDLE_FC = device_creator; static INPUT_PORTS_START( arkanoid_paddle ) diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp index 54a42b119c0..54cf48ce61f 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.cpp +++ b/src/devices/bus/nes_ctrl/bcbattle.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_BARCODE_BATTLER = &device_creator; +const device_type NES_BARCODE_BATTLER = device_creator; MACHINE_CONFIG_FRAGMENT( nes_battler ) diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp index d3ff0e32659..ec439f91dbd 100644 --- a/src/devices/bus/nes_ctrl/ctrl.cpp +++ b/src/devices/bus/nes_ctrl/ctrl.cpp @@ -64,7 +64,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type NES_CONTROL_PORT = &device_creator; +const device_type NES_CONTROL_PORT = device_creator; diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index c7a465050d6..27582ac1f76 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.cpp +++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_FCKEYBOARD = &device_creator; +const device_type NES_FCKEYBOARD = device_creator; static INPUT_PORTS_START( fc_keyboard ) diff --git a/src/devices/bus/nes_ctrl/ftrainer.cpp b/src/devices/bus/nes_ctrl/ftrainer.cpp index 3207102e4d5..bb9b5ad0f9f 100644 --- a/src/devices/bus/nes_ctrl/ftrainer.cpp +++ b/src/devices/bus/nes_ctrl/ftrainer.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_FTRAINER = &device_creator; +const device_type NES_FTRAINER = device_creator; static INPUT_PORTS_START( nes_joypad ) diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp index 5c2d5517173..32c088e8954 100644 --- a/src/devices/bus/nes_ctrl/hori.cpp +++ b/src/devices/bus/nes_ctrl/hori.cpp @@ -27,8 +27,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_HORITWIN = &device_creator; -const device_type NES_HORI4P = &device_creator; +const device_type NES_HORITWIN = device_creator; +const device_type NES_HORI4P = device_creator; static INPUT_PORTS_START( nes_hori4p ) diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp index d0ac74450d8..a67bd9bb98a 100644 --- a/src/devices/bus/nes_ctrl/joypad.cpp +++ b/src/devices/bus/nes_ctrl/joypad.cpp @@ -34,11 +34,11 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_JOYPAD = &device_creator; -const device_type NES_FCPAD_P2 = &device_creator; -const device_type NES_CCPAD_LEFT = &device_creator; -const device_type NES_CCPAD_RIGHT = &device_creator; -const device_type NES_ARCSTICK = &device_creator; +const device_type NES_JOYPAD = device_creator; +const device_type NES_FCPAD_P2 = device_creator; +const device_type NES_CCPAD_LEFT = device_creator; +const device_type NES_CCPAD_RIGHT = device_creator; +const device_type NES_ARCSTICK = device_creator; static INPUT_PORTS_START( nes_joypad ) diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp index 99be926197c..00b39b25b53 100644 --- a/src/devices/bus/nes_ctrl/konamihs.cpp +++ b/src/devices/bus/nes_ctrl/konamihs.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_KONAMIHS = &device_creator; +const device_type NES_KONAMIHS = device_creator; static INPUT_PORTS_START( nes_konamihs ) diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp index 2f0ee170aa9..c4dd099ede4 100644 --- a/src/devices/bus/nes_ctrl/miracle.cpp +++ b/src/devices/bus/nes_ctrl/miracle.cpp @@ -19,7 +19,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_MIRACLE = &device_creator; +const device_type NES_MIRACLE = device_creator; MACHINE_CONFIG_FRAGMENT( nes_miracle ) diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp index e807836fd0f..fded1549ca5 100644 --- a/src/devices/bus/nes_ctrl/mjpanel.cpp +++ b/src/devices/bus/nes_ctrl/mjpanel.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_MJPANEL = &device_creator; +const device_type NES_MJPANEL = device_creator; static INPUT_PORTS_START( nes_mjpanel ) diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp index 8d2d0450324..9a82d894b6f 100644 --- a/src/devices/bus/nes_ctrl/pachinko.cpp +++ b/src/devices/bus/nes_ctrl/pachinko.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_PACHINKO = &device_creator; +const device_type NES_PACHINKO = device_creator; static INPUT_PORTS_START( nes_pachinko ) diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp index b69ba813681..6a0b3c9880c 100644 --- a/src/devices/bus/nes_ctrl/partytap.cpp +++ b/src/devices/bus/nes_ctrl/partytap.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_PARTYTAP = &device_creator; +const device_type NES_PARTYTAP = device_creator; static INPUT_PORTS_START( nes_partytap ) diff --git a/src/devices/bus/nes_ctrl/powerpad.cpp b/src/devices/bus/nes_ctrl/powerpad.cpp index f6ce5dfb213..4db046c029c 100644 --- a/src/devices/bus/nes_ctrl/powerpad.cpp +++ b/src/devices/bus/nes_ctrl/powerpad.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_POWERPAD = &device_creator; +const device_type NES_POWERPAD = device_creator; static INPUT_PORTS_START( nes_powerpad ) diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp index 63c33d1f008..2f4c0969742 100644 --- a/src/devices/bus/nes_ctrl/suborkey.cpp +++ b/src/devices/bus/nes_ctrl/suborkey.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_SUBORKEYBOARD = &device_creator; +const device_type NES_SUBORKEYBOARD = device_creator; static INPUT_PORTS_START( fc_suborkey ) diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp index 3c5c4a4e7ce..a1c8efe32dc 100644 --- a/src/devices/bus/nes_ctrl/zapper.cpp +++ b/src/devices/bus/nes_ctrl/zapper.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NES_ZAPPER = &device_creator; +const device_type NES_ZAPPER = device_creator; static INPUT_PORTS_START( nes_zapper ) diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index eae75ed16e3..906b8d4d144 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEWBRAIN_EIM = &device_creator; +const device_type NEWBRAIN_EIM = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/newbrain/exp.cpp b/src/devices/bus/newbrain/exp.cpp index e83dd50266f..9e8c989e982 100644 --- a/src/devices/bus/newbrain/exp.cpp +++ b/src/devices/bus/newbrain/exp.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type NEWBRAIN_EXPANSION_SLOT = &device_creator; +const device_type NEWBRAIN_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index aa422f999d5..b63d7ddffa8 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -35,7 +35,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NEWBRAIN_FDC = &device_creator; +const device_type NEWBRAIN_FDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus.cpp b/src/devices/bus/nubus/nubus.cpp index bd13bdb838c..2f21a63cf00 100644 --- a/src/devices/bus/nubus/nubus.cpp +++ b/src/devices/bus/nubus/nubus.cpp @@ -16,7 +16,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_SLOT = &device_creator; +const device_type NUBUS_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -61,7 +61,7 @@ void nubus_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS = &device_creator; +const device_type NUBUS = device_creator; void nubus_device::static_set_cputag(device_t &device, const char *tag) { diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 0906d9dfeb6..6c17242ed3f 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "nubus_48gc.h" +#include "screen.h" #define VRAM_SIZE (0x200000) // 2 megs, maxed out @@ -40,8 +41,8 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_48GC = &device_creator; -const device_type NUBUS_824GC = &device_creator; +const device_type NUBUS_48GC = device_creator; +const device_type NUBUS_824GC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp index 09a872f6de4..08387b747e4 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.cpp +++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp @@ -40,8 +40,8 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_ASNTMC3NB = &device_creator; -const device_type NUBUS_APPLEENET = &device_creator; +const device_type NUBUS_ASNTMC3NB = device_creator; +const device_type NUBUS_APPLEENET = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp index b7a021a0bd9..65f0a49d80c 100644 --- a/src/devices/bus/nubus/nubus_cb264.cpp +++ b/src/devices/bus/nubus/nubus_cb264.cpp @@ -15,6 +15,7 @@ #include "emu.h" #include "nubus_cb264.h" +#include "screen.h" #define CB264_SCREEN_NAME "cb264_screen" #define CB264_ROM_REGION "cb264_rom" @@ -39,7 +40,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_CB264 = &device_creator; +const device_type NUBUS_CB264 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp index 7902bf69669..12a16404dd0 100644 --- a/src/devices/bus/nubus/nubus_image.cpp +++ b/src/devices/bus/nubus/nubus_image.cpp @@ -62,9 +62,7 @@ public: // device type definition -extern const device_type MESSIMG_DISK; - -const device_type MESSIMG_DISK = &device_creator; +const device_type MESSIMG_DISK = device_creator; messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock, "messimg_disk_image", __FILE__), @@ -141,7 +139,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_IMAGE = &device_creator; +const device_type NUBUS_IMAGE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index e169586d884..823a1d063e2 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "nubus_m2hires.h" +#include "screen.h" #define M2HIRES_SCREEN_NAME "m2hires_screen" #define M2HIRES_ROM_REGION "m2hires_rom" @@ -35,7 +36,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_M2HIRES = &device_creator; +const device_type NUBUS_M2HIRES = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index 04db8cffb1b..bfaafc7f932 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -13,6 +13,8 @@ #include "emu.h" #include "nubus_m2video.h" +#include "screen.h" + #define M2VIDEO_SCREEN_NAME "m2video_screen" #define M2VIDEO_ROM_REGION "m2video_rom" @@ -36,7 +38,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_M2VIDEO = &device_creator; +const device_type NUBUS_M2VIDEO = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp index e12275ab710..f3028bdc598 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.cpp +++ b/src/devices/bus/nubus/nubus_radiustpd.cpp @@ -12,6 +12,8 @@ #include "emu.h" #include "nubus_radiustpd.h" +#include "screen.h" + #define RADIUSTPD_SCREEN_NAME "tpd_screen" #define RADIUSTPD_ROM_REGION "tpd_rom" @@ -35,7 +37,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_RADIUSTPD = &device_creator; +const device_type NUBUS_RADIUSTPD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index db47b70cd83..b8d4310db99 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -14,6 +14,8 @@ #include "emu.h" #include "nubus_spec8.h" +#include "screen.h" + #define SPEC8S3_SCREEN_NAME "spec8s3_screen" #define SPEC8S3_ROM_REGION "spec8s3_rom" @@ -37,7 +39,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_SPEC8S3 = &device_creator; +const device_type NUBUS_SPEC8S3 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index 2926d1c2faa..de267c7400b 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -27,6 +27,8 @@ #include "emu.h" #include "nubus_specpdq.h" +#include "screen.h" + #define SPECPDQ_SCREEN_NAME "specpdq_screen" #define SPECPDQ_ROM_REGION "specpdq_rom" @@ -52,7 +54,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_SPECPDQ = &device_creator; +const device_type NUBUS_SPECPDQ = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp index 1c12cbba4fa..ed901d672c8 100644 --- a/src/devices/bus/nubus/nubus_vikbw.cpp +++ b/src/devices/bus/nubus/nubus_vikbw.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "nubus_vikbw.h" +#include "screen.h" #define VIKBW_SCREEN_NAME "vikbw_screen" #define VIKBW_ROM_REGION "vikbw_rom" @@ -35,7 +36,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_VIKBW = &device_creator; +const device_type NUBUS_VIKBW = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp index e274a2d812c..e231f7c44e0 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -15,6 +15,7 @@ #include "emu.h" #include "nubus_wsportrait.h" +#include "screen.h" #define WSPORTRAIT_SCREEN_NAME "wsport_screen" #define WSPORTRAIT_ROM_REGION "wsport_rom" @@ -38,7 +39,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type NUBUS_WSPORTRAIT = &device_creator; +const device_type NUBUS_WSPORTRAIT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp index 492ad3a87e7..228055037aa 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -15,6 +15,7 @@ #include "emu.h" #include "pds30_30hr.h" +#include "screen.h" #define XCEED30HR_SCREEN_NAME "x30hr_screen" #define XCEED30HR_ROM_REGION "x30hr_rom" @@ -38,7 +39,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type PDS030_XCEED30HR = &device_creator; +const device_type PDS030_XCEED30HR = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp index c6d5809cb64..7c192b7dff6 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "pds30_cb264.h" +#include "screen.h" #define CB264SE30_SCREEN_NAME "cb264_screen" #define CB264SE30_ROM_REGION "cb264_rom" @@ -31,7 +32,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type PDS030_CB264SE30 = &device_creator; +const device_type PDS030_CB264SE30 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp index 3aa038639ba..aaf61c68d3f 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "pds30_mc30.h" +#include "screen.h" #define XCEEDMC30_SCREEN_NAME "x30hr_screen" #define XCEEDMC30_ROM_REGION "x30hr_rom" @@ -34,7 +35,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type PDS030_XCEEDMC30 = &device_creator; +const device_type PDS030_XCEEDMC30 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp index 7aefbf0308a..fc7ef895227 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -14,6 +14,7 @@ #include "emu.h" #include "pds30_procolor816.h" +#include "screen.h" #define PROCOLOR816_SCREEN_NAME "cb264_screen" #define PROCOLOR816_ROM_REGION "cb264_rom" @@ -37,7 +38,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type PDS030_PROCOLOR816 = &device_creator; +const device_type PDS030_PROCOLOR816 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp index e9588a40568..58e04bd8c8a 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "pds30_sigmalview.h" +#include "screen.h" #define LVIEW_SCREEN_NAME "lview_screen" #define LVIEW_ROM_REGION "lview_rom" @@ -31,7 +32,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type PDS030_LVIEW = &device_creator; +const device_type PDS030_LVIEW = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp index 9ddd62b7f6a..c67856fbcaa 100644 --- a/src/devices/bus/odyssey2/chess.cpp +++ b/src/devices/bus/odyssey2/chess.cpp @@ -19,7 +19,7 @@ // o2_chess_device - constructor //------------------------------------------------- -const device_type O2_ROM_CHESS = &device_creator; +const device_type O2_ROM_CHESS = device_creator; o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp index dac96ec563a..7a073e7fb19 100644 --- a/src/devices/bus/odyssey2/rom.cpp +++ b/src/devices/bus/odyssey2/rom.cpp @@ -17,9 +17,9 @@ // o2_rom_device - constructor //------------------------------------------------- -const device_type O2_ROM_STD = &device_creator; -const device_type O2_ROM_12K = &device_creator; -const device_type O2_ROM_16K = &device_creator; +const device_type O2_ROM_STD = device_creator; +const device_type O2_ROM_12K = device_creator; +const device_type O2_ROM_16K = device_creator; o2_rom_device::o2_rom_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) diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp index be6f1441876..3b070f95959 100644 --- a/src/devices/bus/odyssey2/slot.cpp +++ b/src/devices/bus/odyssey2/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type O2_CART_SLOT = &device_creator; +const device_type O2_CART_SLOT = device_creator; //************************************************************************** // Odyssey 2 Cartridges Interface diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index b46d7010226..7303e0a1939 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -14,13 +14,14 @@ #include "emu.h" #include "voice.h" +#include "speaker.h" //------------------------------------------------- // o2_voice_device - constructor //------------------------------------------------- -const device_type O2_ROM_VOICE = &device_creator; +const device_type O2_ROM_VOICE = device_creator; o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index f254b676ef5..686ead3cc5d 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -4,7 +4,7 @@ #include "jasmin.h" #include "formats/oric_dsk.h" -const device_type JASMIN = &device_creator; +const device_type JASMIN = device_creator; ROM_START( jasmin ) ROM_REGION( 0x800, "jasmin", 0 ) diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index 8e087db0bce..c6607ba18fc 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -4,7 +4,7 @@ #include "microdisc.h" #include "formats/oric_dsk.h" -const device_type MICRODISC = &device_creator; +const device_type MICRODISC = device_creator; ROM_START( microdisc ) ROM_REGION( 0x2000, "microdisc", 0 ) diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp index 73e780bdf3a..981507572ef 100644 --- a/src/devices/bus/oricext/oricext.cpp +++ b/src/devices/bus/oricext/oricext.cpp @@ -5,7 +5,7 @@ #include "jasmin.h" #include "microdisc.h" -const device_type ORICEXT_CONNECTOR = &device_creator; +const device_type ORICEXT_CONNECTOR = device_creator; oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ORICEXT_CONNECTOR, "ORIC extension connector", tag, owner, clock, "oricext_connector", __FILE__), diff --git a/src/devices/bus/pc1512/mouse.cpp b/src/devices/bus/pc1512/mouse.cpp index 24bd5f3e451..3029110de6e 100644 --- a/src/devices/bus/pc1512/mouse.cpp +++ b/src/devices/bus/pc1512/mouse.cpp @@ -15,8 +15,8 @@ // DEVICE DEFINITION //************************************************************************** -const device_type PC1512_MOUSE_PORT = &device_creator; -const device_type PC1512_MOUSE = &device_creator; +const device_type PC1512_MOUSE_PORT = device_creator; +const device_type PC1512_MOUSE = device_creator; diff --git a/src/devices/bus/pc_joy/pc_joy.cpp b/src/devices/bus/pc_joy/pc_joy.cpp index 571aed854c9..925968d9a9e 100644 --- a/src/devices/bus/pc_joy/pc_joy.cpp +++ b/src/devices/bus/pc_joy/pc_joy.cpp @@ -12,7 +12,7 @@ #include "pc_joy.h" #include "pc_joy_sw.h" -const device_type PC_JOY = &device_creator; +const device_type PC_JOY = device_creator; pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PC_JOY, "PC joystick port", tag, owner, clock, "pc_joy", __FILE__), @@ -78,7 +78,7 @@ ioport_constructor pc_basic_joy_device::device_input_ports() const return INPUT_PORTS_NAME( pc_joystick ); } -const device_type PC_BASIC_JOY = &device_creator; +const device_type PC_BASIC_JOY = device_creator; pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PC_BASIC_JOY, "PC basic joystick", tag, owner, clock, "basic_joy", __FILE__), diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp index f2dd8448a18..817798ff383 100644 --- a/src/devices/bus/pc_joy/pc_joy_sw.cpp +++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "pc_joy_sw.h" -const device_type PC_MSSW_PAD = &device_creator; +const device_type PC_MSSW_PAD = device_creator; pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) : device_t(mconfig, PC_MSSW_PAD, "Microsoft Sidewinder Pad", tag, owner, clock, "mssw_pad", __FILE__), diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp index 007c8a15e85..3b86b1a56cf 100644 --- a/src/devices/bus/pc_kbd/ec1841.cpp +++ b/src/devices/bus/pc_kbd/ec1841.cpp @@ -39,7 +39,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PC_KBD_EC_1841 = &device_creator; +const device_type PC_KBD_EC_1841 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index 06a84b964eb..47701c0010a 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -34,7 +34,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PC_KBD_ISKR_1030 = &device_creator; +const device_type PC_KBD_ISKR_1030 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index 480e0a65b75..cd2b1ce79bd 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -336,8 +336,8 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type PC_KBD_KEYTRONIC_PC3270 = &device_creator; -const device_type PC_KBD_KEYTRONIC_PC3270_AT = &device_creator; +const device_type PC_KBD_KEYTRONIC_PC3270 = device_creator; +const device_type PC_KBD_KEYTRONIC_PC3270_AT = device_creator; /***************************************************************************** diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp index e7aaf50e968..734ae193b9e 100644 --- a/src/devices/bus/pc_kbd/msnat.cpp +++ b/src/devices/bus/pc_kbd/msnat.cpp @@ -194,7 +194,7 @@ INPUT_PORTS_END // GLOBAL VARIABLES //************************************************************************** -const device_type PC_KBD_MICROSOFT_NATURAL = &device_creator; +const device_type PC_KBD_MICROSOFT_NATURAL = device_creator; /***************************************************************************** ADDRESS MAPS diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp index f2f795763cb..7ff7ad4f4e0 100644 --- a/src/devices/bus/pc_kbd/pc83.cpp +++ b/src/devices/bus/pc_kbd/pc83.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PC_KBD_IBM_PC_83 = &device_creator; +const device_type PC_KBD_IBM_PC_83 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/pc_kbdc.cpp b/src/devices/bus/pc_kbd/pc_kbdc.cpp index d5768d633f4..fd87cca47fc 100644 --- a/src/devices/bus/pc_kbd/pc_kbdc.cpp +++ b/src/devices/bus/pc_kbd/pc_kbdc.cpp @@ -21,7 +21,7 @@ The following basic program can be useful for identifying scancodes: // GLOBAL VARIABLES //************************************************************************** -const device_type PC_KBDC_SLOT = &device_creator; +const device_type PC_KBDC_SLOT = device_creator; //************************************************************************** // LIVE DEVICE @@ -63,7 +63,7 @@ void pc_kbdc_slot_device::device_start() // GLOBAL VARIABLES //************************************************************************** -const device_type PC_KBDC = &device_creator; +const device_type PC_KBDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp index d99e787f781..a0ea6f2c1f6 100644 --- a/src/devices/bus/pc_kbd/pcat84.cpp +++ b/src/devices/bus/pc_kbd/pcat84.cpp @@ -41,8 +41,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PC_KBD_IBM_PC_AT_84 = &device_creator; -const device_type PC_KBD_IBM_3270PC_122 = &device_creator; +const device_type PC_KBD_IBM_PC_AT_84 = device_creator; +const device_type PC_KBD_IBM_3270PC_122 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp index 56f432fbabc..00ba9400b29 100644 --- a/src/devices/bus/pc_kbd/pcxt83.cpp +++ b/src/devices/bus/pc_kbd/pcxt83.cpp @@ -33,7 +33,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PC_KBD_IBM_PC_XT_83 = &device_creator; +const device_type PC_KBD_IBM_PC_XT_83 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index 553ac06fedf..1608b1cbb0e 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -17,10 +17,10 @@ // pce_rom_device - constructor //------------------------------------------------- -const device_type PCE_ROM_STD = &device_creator; -const device_type PCE_ROM_CDSYS3 = &device_creator; -const device_type PCE_ROM_POPULOUS = &device_creator; -const device_type PCE_ROM_SF2 = &device_creator; +const device_type PCE_ROM_STD = device_creator; +const device_type PCE_ROM_CDSYS3 = device_creator; +const device_type PCE_ROM_POPULOUS = device_creator; +const device_type PCE_ROM_SF2 = device_creator; pce_rom_device::pce_rom_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) diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index eb6fd88965a..26b4bdd6bf9 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -19,7 +19,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PCE_CART_SLOT = &device_creator; +const device_type PCE_CART_SLOT = device_creator; //************************************************************************** // PCE cartridges Interface diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp index f7ce25d7b3d..8c1bc4bfbda 100644 --- a/src/devices/bus/pet/2joysnd.cpp +++ b/src/devices/bus/pet/2joysnd.cpp @@ -48,14 +48,16 @@ Connections #include "emu.h" #include "2joysnd.h" + #include "sound/volt_reg.h" +#include "speaker.h" //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE = &device_creator; +const device_type PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE = device_creator; MACHINE_CONFIG_FRAGMENT( 2joysnd ) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp index ac51df8c377..1c1a79b1bf2 100644 --- a/src/devices/bus/pet/64k.cpp +++ b/src/devices/bus/pet/64k.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PET_64K = &device_creator; +const device_type PET_64K = device_creator; diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index c13223f965a..6276aab8fd4 100644 --- a/src/devices/bus/pet/c2n.cpp +++ b/src/devices/bus/pet/c2n.cpp @@ -15,9 +15,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C2N = &device_creator; -const device_type C1530 = &device_creator; -const device_type C1531 = &device_creator; +const device_type C2N = device_creator; +const device_type C1530 = device_creator; +const device_type C1531 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp index e06682f2c3e..fc9f5ded21c 100644 --- a/src/devices/bus/pet/cass.cpp +++ b/src/devices/bus/pet/cass.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PET_DATASSETTE_PORT = &device_creator; +const device_type PET_DATASSETTE_PORT = device_creator; diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp index 63b227adec7..5dc3bd1823f 100644 --- a/src/devices/bus/pet/cb2snd.cpp +++ b/src/devices/bus/pet/cb2snd.cpp @@ -10,13 +10,16 @@ #include "emu.h" #include "cb2snd.h" + #include "sound/volt_reg.h" +#include "speaker.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type PET_USERPORT_CB2_SOUND_DEVICE = &device_creator; +const device_type PET_USERPORT_CB2_SOUND_DEVICE = device_creator; MACHINE_CONFIG_FRAGMENT( cb2snd ) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/devices/bus/pet/diag.cpp b/src/devices/bus/pet/diag.cpp index eef41f4f526..27a318f2e3e 100644 --- a/src/devices/bus/pet/diag.cpp +++ b/src/devices/bus/pet/diag.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PET_USERPORT_DIAGNOSTIC_CONNECTOR = &device_creator; +const device_type PET_USERPORT_DIAGNOSTIC_CONNECTOR = device_creator; diff --git a/src/devices/bus/pet/diag264_lb_tape.cpp b/src/devices/bus/pet/diag264_lb_tape.cpp index 60183f51925..214fee34be3 100644 --- a/src/devices/bus/pet/diag264_lb_tape.cpp +++ b/src/devices/bus/pet/diag264_lb_tape.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type DIAG264_CASSETTE_LOOPBACK = &device_creator; +const device_type DIAG264_CASSETTE_LOOPBACK = device_creator; diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp index c716791e558..0097953e57a 100644 --- a/src/devices/bus/pet/exp.cpp +++ b/src/devices/bus/pet/exp.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PET_EXPANSION_SLOT = &device_creator; +const device_type PET_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index eb3ab8caf3f..cc1e8606b11 100644 --- a/src/devices/bus/pet/hsg.cpp +++ b/src/devices/bus/pet/hsg.cpp @@ -20,6 +20,8 @@ #include "emu.h" #include "hsg.h" +#include "screen.h" + //************************************************************************** @@ -36,8 +38,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CBM8000_HSG_A = &device_creator; -const device_type CBM8000_HSG_B = &device_creator; +const device_type CBM8000_HSG_A = device_creator; +const device_type CBM8000_HSG_B = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pet/petuja.cpp b/src/devices/bus/pet/petuja.cpp index 9bedbb7b051..a4e11d2aa3d 100644 --- a/src/devices/bus/pet/petuja.cpp +++ b/src/devices/bus/pet/petuja.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PET_USERPORT_JOYSTICK_ADAPTER = &device_creator; +const device_type PET_USERPORT_JOYSTICK_ADAPTER = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp index 3016b91739c..77a9f65cad0 100644 --- a/src/devices/bus/pet/superpet.cpp +++ b/src/devices/bus/pet/superpet.cpp @@ -28,7 +28,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SUPERPET = &device_creator; +const device_type SUPERPET = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp index f3e0f37b635..0fdda61ca9a 100644 --- a/src/devices/bus/pet/user.cpp +++ b/src/devices/bus/pet/user.cpp @@ -11,7 +11,7 @@ // class pet_user_port_device -const device_type PET_USER_PORT = &device_creator; +const device_type PET_USER_PORT = device_creator; pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PET_USER_PORT, "PET user port", tag, owner, clock, "pet_user_port", __FILE__), diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index e0d19426a47..208337fec4a 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -27,7 +27,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C1551 = &device_creator; +const device_type C1551 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/plus4/diag264_lb_user.cpp b/src/devices/bus/plus4/diag264_lb_user.cpp index 2dd645f6759..d3978801a88 100644 --- a/src/devices/bus/plus4/diag264_lb_user.cpp +++ b/src/devices/bus/plus4/diag264_lb_user.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type DIAG264_USER_PORT_LOOPBACK = &device_creator; +const device_type DIAG264_USER_PORT_LOOPBACK = device_creator; diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp index 2bdd35361fc..188ccb8eaf4 100644 --- a/src/devices/bus/plus4/exp.cpp +++ b/src/devices/bus/plus4/exp.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PLUS4_EXPANSION_SLOT = &device_creator; +const device_type PLUS4_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index 4616588327c..00a2ec25cbe 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -20,6 +20,8 @@ #include "emu.h" #include "sid.h" +#include "speaker.h" + //************************************************************************** @@ -35,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PLUS4_SID = &device_creator; +const device_type PLUS4_SID = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp index aa5c9efa4a0..781bb9f0d92 100644 --- a/src/devices/bus/plus4/std.cpp +++ b/src/devices/bus/plus4/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PLUS4_STD = &device_creator; +const device_type PLUS4_STD = device_creator; diff --git a/src/devices/bus/pofo/ccm.cpp b/src/devices/bus/pofo/ccm.cpp index edab9fa1f63..d5dc761db2b 100644 --- a/src/devices/bus/pofo/ccm.cpp +++ b/src/devices/bus/pofo/ccm.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PORTFOLIO_MEMORY_CARD_SLOT = &device_creator; +const device_type PORTFOLIO_MEMORY_CARD_SLOT = device_creator; diff --git a/src/devices/bus/pofo/exp.cpp b/src/devices/bus/pofo/exp.cpp index d9049daedbd..c8f5733fe2c 100644 --- a/src/devices/bus/pofo/exp.cpp +++ b/src/devices/bus/pofo/exp.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PORTFOLIO_EXPANSION_SLOT = &device_creator; +const device_type PORTFOLIO_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp index 40a36e95afe..8d106f00a37 100644 --- a/src/devices/bus/pofo/hpc101.cpp +++ b/src/devices/bus/pofo/hpc101.cpp @@ -26,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type HPC101 = &device_creator; +const device_type HPC101 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp index 3324bc4b9f0..72c886b32d3 100644 --- a/src/devices/bus/pofo/hpc102.cpp +++ b/src/devices/bus/pofo/hpc102.cpp @@ -26,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type HPC102 = &device_creator; +const device_type HPC102 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp index 579f2ca90ac..050fdc2bb6c 100644 --- a/src/devices/bus/pofo/hpc104.cpp +++ b/src/devices/bus/pofo/hpc104.cpp @@ -23,8 +23,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type HPC104 = &device_creator; -const device_type HPC104_2 = &device_creator; +const device_type HPC104 = device_creator; +const device_type HPC104_2 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/pofo/ram.cpp b/src/devices/bus/pofo/ram.cpp index a8dedd23ffa..79d2a87ad0e 100644 --- a/src/devices/bus/pofo/ram.cpp +++ b/src/devices/bus/pofo/ram.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PORTFOLIO_RAM_CARD = &device_creator; +const device_type PORTFOLIO_RAM_CARD = device_creator; //************************************************************************** diff --git a/src/devices/bus/pofo/rom.cpp b/src/devices/bus/pofo/rom.cpp index 43073479f09..b3862b15753 100644 --- a/src/devices/bus/pofo/rom.cpp +++ b/src/devices/bus/pofo/rom.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PORTFOLIO_ROM_CARD = &device_creator; +const device_type PORTFOLIO_ROM_CARD = device_creator; //************************************************************************** diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp index 012ebd87020..cea69c2f930 100644 --- a/src/devices/bus/psx/analogue.cpp +++ b/src/devices/bus/psx/analogue.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "analogue.h" -const device_type PSX_ANALOG_JOYSTICK = &device_creator; -const device_type PSX_DUALSHOCK = &device_creator; +const device_type PSX_ANALOG_JOYSTICK = device_creator; +const device_type PSX_DUALSHOCK = device_creator; psx_analog_controller_device::psx_analog_controller_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), diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index 9be4e6b4431..5ca35dc27ec 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -7,7 +7,7 @@ #include "analogue.h" #include "multitap.h" -const device_type PSX_CONTROLLER_PORT = &device_creator; +const device_type PSX_CONTROLLER_PORT = device_creator; psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__), @@ -40,7 +40,7 @@ void psx_controller_port_device::disable_card(bool state) m_card->disable(state); } -const device_type PSXCONTROLLERPORTS = &device_creator; +const device_type PSXCONTROLLERPORTS = device_creator; psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), m_port0(nullptr), m_port1(nullptr), @@ -172,7 +172,7 @@ void device_psx_controller_interface::sel_w(bool state) { m_sel = state; } -const device_type PSX_STANDARD_CONTROLLER = &device_creator; +const device_type PSX_STANDARD_CONTROLLER = device_creator; psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock, "psx_standard_controller", __FILE__), diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp index 50d36d19a9b..567cd615e65 100644 --- a/src/devices/bus/psx/memcard.cpp +++ b/src/devices/bus/psx/memcard.cpp @@ -24,7 +24,7 @@ static const int block_size = 128; static const int card_size = block_size * 1024; -const device_type PSXCARD = &device_creator; +const device_type PSXCARD = device_creator; enum transfer_states { diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp index c1c501043bd..2c70a6dc9e0 100644 --- a/src/devices/bus/psx/multitap.cpp +++ b/src/devices/bus/psx/multitap.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "multitap.h" -const device_type PSX_MULTITAP = &device_creator; +const device_type PSX_MULTITAP = device_creator; psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) : device_t(mconfig, PSX_MULTITAP, "Playstation Multitap", tag, owner, clock, "psx_multitap", __FILE__), diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp index 06112121975..30f3b15c8ac 100644 --- a/src/devices/bus/ql/cst_q_plus4.cpp +++ b/src/devices/bus/ql/cst_q_plus4.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CST_Q_PLUS4 = &device_creator; +const device_type CST_Q_PLUS4 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/cst_qdisc.cpp b/src/devices/bus/ql/cst_qdisc.cpp index 83297a3ff39..db18cd6241b 100644 --- a/src/devices/bus/ql/cst_qdisc.cpp +++ b/src/devices/bus/ql/cst_qdisc.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CST_QL_DISC_INTERFACE = &device_creator; +const device_type CST_QL_DISC_INTERFACE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/cumana_fdi.cpp b/src/devices/bus/ql/cumana_fdi.cpp index 400b969adec..f43844223da 100644 --- a/src/devices/bus/ql/cumana_fdi.cpp +++ b/src/devices/bus/ql/cumana_fdi.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CUMANA_FLOPPY_DISK_INTERFACE = &device_creator; +const device_type CUMANA_FLOPPY_DISK_INTERFACE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/exp.cpp b/src/devices/bus/ql/exp.cpp index d5d48e91099..2794b252b44 100644 --- a/src/devices/bus/ql/exp.cpp +++ b/src/devices/bus/ql/exp.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type QL_EXPANSION_SLOT = &device_creator; +const device_type QL_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/ql/kempston_di.cpp b/src/devices/bus/ql/kempston_di.cpp index 676121d7461..4430c07b3a2 100644 --- a/src/devices/bus/ql/kempston_di.cpp +++ b/src/devices/bus/ql/kempston_di.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type KEMPSTON_DISK_INTERFACE = &device_creator; +const device_type KEMPSTON_DISK_INTERFACE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/miracle_gold_card.cpp b/src/devices/bus/ql/miracle_gold_card.cpp index 2f2c4fd4542..167955ac4cf 100644 --- a/src/devices/bus/ql/miracle_gold_card.cpp +++ b/src/devices/bus/ql/miracle_gold_card.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MIRACLE_GOLD_CARD = &device_creator; +const device_type MIRACLE_GOLD_CARD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/miracle_hd.cpp b/src/devices/bus/ql/miracle_hd.cpp index 895aa7f768e..040c3c691cc 100644 --- a/src/devices/bus/ql/miracle_hd.cpp +++ b/src/devices/bus/ql/miracle_hd.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MIRACLE_HARD_DISK = &device_creator; +const device_type MIRACLE_HARD_DISK = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/mp_fdi.cpp b/src/devices/bus/ql/mp_fdi.cpp index 8b422c912e1..2aac9dd094c 100644 --- a/src/devices/bus/ql/mp_fdi.cpp +++ b/src/devices/bus/ql/mp_fdi.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MICRO_PERIPHERALS_FLOPPY_DISK_INTERFACE = &device_creator; +const device_type MICRO_PERIPHERALS_FLOPPY_DISK_INTERFACE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp index ebe8f820dc8..8cefd393ade 100644 --- a/src/devices/bus/ql/opd_basic_master.cpp +++ b/src/devices/bus/ql/opd_basic_master.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type OPD_BASIC_MASTER = &device_creator; +const device_type OPD_BASIC_MASTER = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/pcml_qdisk.cpp b/src/devices/bus/ql/pcml_qdisk.cpp index 85c6f776f58..1307f024047 100644 --- a/src/devices/bus/ql/pcml_qdisk.cpp +++ b/src/devices/bus/ql/pcml_qdisk.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PCML_Q_DISK_INTERFACE = &device_creator; +const device_type PCML_Q_DISK_INTERFACE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp index c69e8953ff7..30591d96aab 100644 --- a/src/devices/bus/ql/qubide.cpp +++ b/src/devices/bus/ql/qubide.cpp @@ -55,7 +55,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type QUBIDE = &device_creator; +const device_type QUBIDE = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp index c4f0ff2eb78..faee2e67085 100644 --- a/src/devices/bus/ql/rom.cpp +++ b/src/devices/bus/ql/rom.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type QL_ROM_CARTRIDGE_SLOT = &device_creator; +const device_type QL_ROM_CARTRIDGE_SLOT = device_creator; diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index 2e820e5b472..f04c1edaa8d 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SANDY_SUPER_DISK = &device_creator; +const device_type SANDY_SUPER_DISK = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index a79774cd7bb..c3eeb342e18 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -25,10 +25,10 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SANDY_SUPERQBOARD = &device_creator; -const device_type SANDY_SUPERQBOARD_512K = &device_creator; -const device_type SANDY_SUPERQMOUSE = &device_creator; -const device_type SANDY_SUPERQMOUSE_512K = &device_creator; +const device_type SANDY_SUPERQBOARD = device_creator; +const device_type SANDY_SUPERQBOARD_512K = device_creator; +const device_type SANDY_SUPERQMOUSE = device_creator; +const device_type SANDY_SUPERQMOUSE_512K = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp index d267059f3ac..8fc5424cf63 100644 --- a/src/devices/bus/ql/std.cpp +++ b/src/devices/bus/ql/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type QL_STANDARD_ROM_CARTRIDGE = &device_creator; +const device_type QL_STANDARD_ROM_CARTRIDGE = device_creator; diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp index 6af55227569..be3ae9baa76 100644 --- a/src/devices/bus/ql/trumpcard.cpp +++ b/src/devices/bus/ql/trumpcard.cpp @@ -23,10 +23,10 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type QL_TRUMP_CARD = &device_creator; -const device_type QL_TRUMP_CARD_256K = &device_creator; -const device_type QL_TRUMP_CARD_512K = &device_creator; -const device_type QL_TRUMP_CARD_768K = &device_creator; +const device_type QL_TRUMP_CARD = device_creator; +const device_type QL_TRUMP_CARD_256K = device_creator; +const device_type QL_TRUMP_CARD_512K = device_creator; +const device_type QL_TRUMP_CARD_768K = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp index 1f78880a9b2..4d234ef1576 100644 --- a/src/devices/bus/rs232/keyboard.cpp +++ b/src/devices/bus/rs232/keyboard.cpp @@ -100,4 +100,4 @@ void serial_keyboard_device::received_byte(uint8_t byte) { } -const device_type SERIAL_KEYBOARD = &device_creator; +const device_type SERIAL_KEYBOARD = device_creator; diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp index 01ef229be4b..cba8acf944c 100644 --- a/src/devices/bus/rs232/loopback.cpp +++ b/src/devices/bus/rs232/loopback.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "loopback.h" -const device_type RS232_LOOPBACK = &device_creator; +const device_type RS232_LOOPBACK = device_creator; rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RS232_LOOPBACK, "RS232 Loopback", tag, owner, clock, "rs232_loopback", __FILE__), diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index 30b5732a72d..9baa1ef7435 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -138,4 +138,4 @@ void null_modem_device::rcv_complete() m_stream->output(get_received_char()); } -const device_type NULL_MODEM = &device_creator; +const device_type NULL_MODEM = device_creator; diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp index 440cab877ec..ef4f8ef9c38 100644 --- a/src/devices/bus/rs232/printer.cpp +++ b/src/devices/bus/rs232/printer.cpp @@ -83,4 +83,4 @@ void serial_printer_device::rcv_complete() m_printer->output(get_received_char()); } -const device_type SERIAL_PRINTER = &device_creator; +const device_type SERIAL_PRINTER = device_creator; diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp index a7f343bec56..38d7c5f88e7 100644 --- a/src/devices/bus/rs232/pty.cpp +++ b/src/devices/bus/rs232/pty.cpp @@ -137,4 +137,4 @@ void pseudo_terminal_device::queue(void) } } -const device_type PSEUDO_TERMINAL = &device_creator; +const device_type PSEUDO_TERMINAL = device_creator; diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp index 44dfb5481bf..9ce787f0ab3 100644 --- a/src/devices/bus/rs232/rs232.cpp +++ b/src/devices/bus/rs232/rs232.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "rs232.h" -const device_type RS232_PORT = &device_creator; +const device_type RS232_PORT = device_creator; rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock, "rs232", __FILE__), diff --git a/src/devices/bus/rs232/ser_mouse.cpp b/src/devices/bus/rs232/ser_mouse.cpp index c7c316231a3..508e4072741 100644 --- a/src/devices/bus/rs232/ser_mouse.cpp +++ b/src/devices/bus/rs232/ser_mouse.cpp @@ -29,14 +29,14 @@ serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_t { } -const device_type MSFT_SERIAL_MOUSE = &device_creator; +const device_type MSFT_SERIAL_MOUSE = device_creator; microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock, "microsoft_mouse", __FILE__) { } -const device_type MSYSTEM_SERIAL_MOUSE = &device_creator; +const device_type MSYSTEM_SERIAL_MOUSE = device_creator; mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock, "mouse_systems_mouse", __FILE__) diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp index cb1ac3290e4..a5e851c8d15 100644 --- a/src/devices/bus/rs232/sun_kbd.cpp +++ b/src/devices/bus/rs232/sun_kbd.cpp @@ -2,7 +2,7 @@ #include "sun_kbd.h" -device_type const SUN_KBD_ADAPTOR = &device_creator; +device_type const SUN_KBD_ADAPTOR = device_creator; namespace { diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp index 47fae4f6d66..5835500b5fb 100644 --- a/src/devices/bus/rs232/terminal.cpp +++ b/src/devices/bus/rs232/terminal.cpp @@ -93,4 +93,4 @@ void serial_terminal_device::received_byte(uint8_t byte) term_write(byte); } -const device_type SERIAL_TERMINAL = &device_creator; +const device_type SERIAL_TERMINAL = device_creator; diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp index a2693808213..6b94b0e2cb6 100644 --- a/src/devices/bus/rs232/xvd701.cpp +++ b/src/devices/bus/rs232/xvd701.cpp @@ -150,4 +150,4 @@ void jvc_xvd701_device::rcv_complete() } } -const device_type JVC_XVD701 = &device_creator; +const device_type JVC_XVD701 = device_creator; diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp index 1522f2d2243..f83d7e3a420 100644 --- a/src/devices/bus/s100/dj2db.cpp +++ b/src/devices/bus/s100/dj2db.cpp @@ -33,7 +33,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type S100_DJ2DB = &device_creator; +const device_type S100_DJ2DB = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp index feaa034d161..ef6b93353a3 100644 --- a/src/devices/bus/s100/djdma.cpp +++ b/src/devices/bus/s100/djdma.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type S100_DJDMA = &device_creator; +const device_type S100_DJDMA = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/s100/mm65k16s.cpp b/src/devices/bus/s100/mm65k16s.cpp index 3a649c7bb5d..4026d17385e 100644 --- a/src/devices/bus/s100/mm65k16s.cpp +++ b/src/devices/bus/s100/mm65k16s.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type S100_MM65K16S = &device_creator; +const device_type S100_MM65K16S = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp index 2fb14315333..956dc3b081e 100644 --- a/src/devices/bus/s100/nsmdsa.cpp +++ b/src/devices/bus/s100/nsmdsa.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type S100_MDS_A = &device_creator; +const device_type S100_MDS_A = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp index 67a56ce37da..4cb2da40d0f 100644 --- a/src/devices/bus/s100/nsmdsad.cpp +++ b/src/devices/bus/s100/nsmdsad.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type S100_MDS_AD = &device_creator; +const device_type S100_MDS_AD = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/s100/s100.cpp b/src/devices/bus/s100/s100.cpp index 01a0cfbaffe..628daf29222 100644 --- a/src/devices/bus/s100/s100.cpp +++ b/src/devices/bus/s100/s100.cpp @@ -14,8 +14,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type S100_BUS = &device_creator; -const device_type S100_SLOT = &device_creator; +const device_type S100_BUS = device_creator; +const device_type S100_SLOT = device_creator; diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index d60dd01d727..09ee10d71e1 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -31,7 +31,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type S100_WUNDERBUS = &device_creator; +const device_type S100_WUNDERBUS = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/sat_ctrl/analog.cpp b/src/devices/bus/sat_ctrl/analog.cpp index 8f40c2133d3..1ac30a9bd3a 100644 --- a/src/devices/bus/sat_ctrl/analog.cpp +++ b/src/devices/bus/sat_ctrl/analog.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_ANALOG = &device_creator; +const device_type SATURN_ANALOG = device_creator; static INPUT_PORTS_START( saturn_analog ) diff --git a/src/devices/bus/sat_ctrl/ctrl.cpp b/src/devices/bus/sat_ctrl/ctrl.cpp index 69268030ec9..24239d0c67f 100644 --- a/src/devices/bus/sat_ctrl/ctrl.cpp +++ b/src/devices/bus/sat_ctrl/ctrl.cpp @@ -24,7 +24,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SATURN_CONTROL_PORT = &device_creator; +const device_type SATURN_CONTROL_PORT = device_creator; //************************************************************************** diff --git a/src/devices/bus/sat_ctrl/joy.cpp b/src/devices/bus/sat_ctrl/joy.cpp index 5e405842b29..cabc0438304 100644 --- a/src/devices/bus/sat_ctrl/joy.cpp +++ b/src/devices/bus/sat_ctrl/joy.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_JOY = &device_creator; +const device_type SATURN_JOY = device_creator; static INPUT_PORTS_START( saturn_joy ) diff --git a/src/devices/bus/sat_ctrl/joy_md.cpp b/src/devices/bus/sat_ctrl/joy_md.cpp index eafcb4e5d41..bb6f076b127 100644 --- a/src/devices/bus/sat_ctrl/joy_md.cpp +++ b/src/devices/bus/sat_ctrl/joy_md.cpp @@ -13,8 +13,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_JOYMD3B = &device_creator; -const device_type SATURN_JOYMD6B = &device_creator; +const device_type SATURN_JOYMD3B = device_creator; +const device_type SATURN_JOYMD6B = device_creator; static INPUT_PORTS_START( saturn_md3b ) PORT_START("JOY") diff --git a/src/devices/bus/sat_ctrl/keybd.cpp b/src/devices/bus/sat_ctrl/keybd.cpp index ddab85a5c91..6d11b798c9f 100644 --- a/src/devices/bus/sat_ctrl/keybd.cpp +++ b/src/devices/bus/sat_ctrl/keybd.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_KEYBD = &device_creator; +const device_type SATURN_KEYBD = device_creator; static INPUT_PORTS_START( saturn_joy ) diff --git a/src/devices/bus/sat_ctrl/mouse.cpp b/src/devices/bus/sat_ctrl/mouse.cpp index 2ae29cabb20..957a3ce2d81 100644 --- a/src/devices/bus/sat_ctrl/mouse.cpp +++ b/src/devices/bus/sat_ctrl/mouse.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_MOUSE = &device_creator; +const device_type SATURN_MOUSE = device_creator; static INPUT_PORTS_START( saturn_mouse ) diff --git a/src/devices/bus/sat_ctrl/multitap.cpp b/src/devices/bus/sat_ctrl/multitap.cpp index 85798aedfc1..8ab7f675e61 100644 --- a/src/devices/bus/sat_ctrl/multitap.cpp +++ b/src/devices/bus/sat_ctrl/multitap.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_MULTITAP = &device_creator; +const device_type SATURN_MULTITAP = device_creator; //************************************************************************** diff --git a/src/devices/bus/sat_ctrl/pointer.cpp b/src/devices/bus/sat_ctrl/pointer.cpp index 77116d44b4d..11c73615b45 100644 --- a/src/devices/bus/sat_ctrl/pointer.cpp +++ b/src/devices/bus/sat_ctrl/pointer.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_TRACK = &device_creator; +const device_type SATURN_TRACK = device_creator; static INPUT_PORTS_START( saturn_track ) diff --git a/src/devices/bus/sat_ctrl/racing.cpp b/src/devices/bus/sat_ctrl/racing.cpp index c01cf31cf02..fac3d6506f2 100644 --- a/src/devices/bus/sat_ctrl/racing.cpp +++ b/src/devices/bus/sat_ctrl/racing.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_WHEEL = &device_creator; +const device_type SATURN_WHEEL = device_creator; static INPUT_PORTS_START( saturn_racing ) diff --git a/src/devices/bus/sat_ctrl/segatap.cpp b/src/devices/bus/sat_ctrl/segatap.cpp index 42a4a32bd1d..480b9b91da5 100644 --- a/src/devices/bus/sat_ctrl/segatap.cpp +++ b/src/devices/bus/sat_ctrl/segatap.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SATURN_SEGATAP = &device_creator; +const device_type SATURN_SEGATAP = device_creator; //************************************************************************** diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp index 497580a9973..9178f1210ee 100644 --- a/src/devices/bus/saturn/bram.cpp +++ b/src/devices/bus/saturn/bram.cpp @@ -15,10 +15,10 @@ // constructor //------------------------------------------------- -const device_type SATURN_BRAM_4MB = &device_creator; -const device_type SATURN_BRAM_8MB = &device_creator; -const device_type SATURN_BRAM_16MB = &device_creator; -const device_type SATURN_BRAM_32MB = &device_creator; +const device_type SATURN_BRAM_4MB = device_creator; +const device_type SATURN_BRAM_8MB = device_creator; +const device_type SATURN_BRAM_16MB = device_creator; +const device_type SATURN_BRAM_32MB = device_creator; saturn_bram_device::saturn_bram_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) diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp index c7b96edff91..6255f97b6d6 100644 --- a/src/devices/bus/saturn/dram.cpp +++ b/src/devices/bus/saturn/dram.cpp @@ -15,8 +15,8 @@ // constructor //------------------------------------------------- -const device_type SATURN_DRAM_8MB = &device_creator; -const device_type SATURN_DRAM_32MB = &device_creator; +const device_type SATURN_DRAM_8MB = device_creator; +const device_type SATURN_DRAM_32MB = device_creator; saturn_dram_device::saturn_dram_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) diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp index 3fbb441b6c6..152eeb18f87 100644 --- a/src/devices/bus/saturn/rom.cpp +++ b/src/devices/bus/saturn/rom.cpp @@ -15,7 +15,7 @@ // saturn_rom_device - constructor //------------------------------------------------- -const device_type SATURN_ROM = &device_creator; +const device_type SATURN_ROM = device_creator; saturn_rom_device::saturn_rom_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) diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp index 456b9af3d0f..a536ef23653 100644 --- a/src/devices/bus/saturn/sat_slot.cpp +++ b/src/devices/bus/saturn/sat_slot.cpp @@ -29,7 +29,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SATURN_CART_SLOT = &device_creator; +const device_type SATURN_CART_SLOT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp index 68604afce99..ddaccb9422f 100644 --- a/src/devices/bus/scsi/acb4070.cpp +++ b/src/devices/bus/scsi/acb4070.cpp @@ -9,7 +9,7 @@ #include "acb4070.h" // device type definition -const device_type ACB4070 = &device_creator; +const device_type ACB4070 = device_creator; acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__) diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp index 74dd8b281ae..f0de47e0da3 100644 --- a/src/devices/bus/scsi/cdu76s.cpp +++ b/src/devices/bus/scsi/cdu76s.cpp @@ -40,7 +40,7 @@ void sony_cdu76s_device::ReadData( uint8_t *data, int dataLength ) } // device type definition -const device_type CDU76S = &device_creator; +const device_type CDU76S = device_creator; sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : scsicd_device(mconfig, CDU76S, "Sony CDU-76S", tag, owner, clock, "cdu76s", __FILE__) diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp index 3ee1dc91365..3f3b4a70ce1 100644 --- a/src/devices/bus/scsi/d9060hd.cpp +++ b/src/devices/bus/scsi/d9060hd.cpp @@ -9,7 +9,7 @@ #include "d9060hd.h" // device type definition -const device_type D9060HD = &device_creator; +const device_type D9060HD = device_creator; d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock, "d9060hd", __FILE__) diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp index 274c66a1d3e..3dfcc783341 100644 --- a/src/devices/bus/scsi/omti5100.cpp +++ b/src/devices/bus/scsi/omti5100.cpp @@ -10,7 +10,7 @@ #define OMTI_READ_DATA_BUFFER 0xec #define OMTI_ASSIGN_DISK_PARAM 0xc2 -const device_type OMTI5100 = &device_creator; +const device_type OMTI5100 = device_creator; #if 0 ROM_START( omti5100 ) diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp index 9558897ce83..29d30b48589 100644 --- a/src/devices/bus/scsi/pc9801_sasi.cpp +++ b/src/devices/bus/scsi/pc9801_sasi.cpp @@ -5,7 +5,7 @@ #define SASI_CMD_SPECIFY 0xc2 // according to x68k_hdc.c -const device_type PC9801_SASI = &device_creator; +const device_type PC9801_SASI = device_creator; pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : scsihd_device(mconfig, PC9801_SASI, "PC-9801 SASI Controller", tag, owner, clock, "pc9801_sasi", __FILE__) diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp index 8b80f4a0bfe..df49859b844 100644 --- a/src/devices/bus/scsi/s1410.cpp +++ b/src/devices/bus/scsi/s1410.cpp @@ -102,7 +102,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type S1410 = &device_creator; +const device_type S1410 = device_creator; //------------------------------------------------- // ROM( s1410 ) diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp index 011fd7761e0..76587f9f0ab 100644 --- a/src/devices/bus/scsi/sa1403d.cpp +++ b/src/devices/bus/scsi/sa1403d.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SA1403D = &device_creator; +const device_type SA1403D = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp index 3dda2983129..73118ee35ed 100644 --- a/src/devices/bus/scsi/scsi.cpp +++ b/src/devices/bus/scsi/scsi.cpp @@ -665,7 +665,7 @@ WRITE_LINE_MEMBER( SCSI_PORT_DEVICE::write_data7 ) } } -const device_type SCSI_PORT = &device_creator; +const device_type SCSI_PORT = device_creator; SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SCSI_PORT_SLOT, "SCSI Connector", tag, owner, clock, "scsi_slot", __FILE__), @@ -700,7 +700,7 @@ void SCSI_PORT_SLOT_device::device_start() { } -const device_type SCSI_PORT_SLOT = &device_creator; +const device_type SCSI_PORT_SLOT = device_creator; scsi_port_interface::scsi_port_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device) diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp index 1f1a197a0b2..2c995bc54a3 100644 --- a/src/devices/bus/scsi/scsicd.cpp +++ b/src/devices/bus/scsi/scsicd.cpp @@ -10,7 +10,7 @@ #include "scsicd.h" // device type definition -const device_type SCSICD = &device_creator; +const device_type SCSICD = device_creator; scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : scsihle_device(mconfig, SCSICD, "SCSI CD", tag, owner, clock, "scsicd", __FILE__) diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp index 12345bb87f8..b8aae0aa48e 100644 --- a/src/devices/bus/scsi/scsihd.cpp +++ b/src/devices/bus/scsi/scsihd.cpp @@ -10,7 +10,7 @@ #include "scsihd.h" // device type definition -const device_type SCSIHD = &device_creator; +const device_type SCSIHD = device_creator; scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : scsihle_device(mconfig, SCSIHD, "SCSI HD", tag, owner, clock, "scsihd", __FILE__) diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp index ccf05a85d94..a4e42cf46fb 100644 --- a/src/devices/bus/scv/rom.cpp +++ b/src/devices/bus/scv/rom.cpp @@ -17,13 +17,13 @@ // scv_rom_device - constructor //------------------------------------------------- -const device_type SCV_ROM8K = &device_creator; -const device_type SCV_ROM16K = &device_creator; -const device_type SCV_ROM32K = &device_creator; -const device_type SCV_ROM32K_RAM8K = &device_creator; -const device_type SCV_ROM64K = &device_creator; -const device_type SCV_ROM128K = &device_creator; -const device_type SCV_ROM128K_RAM4K = &device_creator; +const device_type SCV_ROM8K = device_creator; +const device_type SCV_ROM16K = device_creator; +const device_type SCV_ROM32K = device_creator; +const device_type SCV_ROM32K_RAM8K = device_creator; +const device_type SCV_ROM64K = device_creator; +const device_type SCV_ROM128K = device_creator; +const device_type SCV_ROM128K_RAM4K = device_creator; scv_rom8_device::scv_rom8_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) diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp index a0b4c3a5900..f2f9642e0a0 100644 --- a/src/devices/bus/scv/slot.cpp +++ b/src/devices/bus/scv/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SCV_CART_SLOT = &device_creator; +const device_type SCV_CART_SLOT = device_creator; //************************************************************************** // SCV cartridges Interface diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp index 7c3c198adba..b8a8ffd3263 100644 --- a/src/devices/bus/sega8/ccatch.cpp +++ b/src/devices/bus/sega8/ccatch.cpp @@ -19,7 +19,7 @@ // constructors //------------------------------------------------- -const device_type SEGA8_ROM_CARDCATCH = &device_creator; +const device_type SEGA8_ROM_CARDCATCH = device_creator; diff --git a/src/devices/bus/sega8/mgear.cpp b/src/devices/bus/sega8/mgear.cpp index bb40fa73bd7..4cf05b340ec 100644 --- a/src/devices/bus/sega8/mgear.cpp +++ b/src/devices/bus/sega8/mgear.cpp @@ -21,7 +21,7 @@ // constructors //------------------------------------------------- -const device_type SEGA8_ROM_MGEAR = &device_creator; +const device_type SEGA8_ROM_MGEAR = device_creator; sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : sega8_rom_device(mconfig, SEGA8_ROM_MGEAR, "Master Gear Converter", tag, owner, clock, "sega8_mgear", __FILE__), diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp index aaa4ad0a02b..7ef04ca9c79 100644 --- a/src/devices/bus/sega8/rom.cpp +++ b/src/devices/bus/sega8/rom.cpp @@ -19,28 +19,28 @@ // Base cart type shared across SG-1000, SG-1000 Mark II, SG-1000 Mark III, SMS, GG // even if in sg1000 rom banks are never changed and ram is never enabled -const device_type SEGA8_ROM_STD = &device_creator; +const device_type SEGA8_ROM_STD = device_creator; // Specific SG-1000 MkI - MkII cart types -const device_type SEGA8_ROM_OTHELLO = &device_creator; -const device_type SEGA8_ROM_CASTLE = &device_creator; -const device_type SEGA8_ROM_BASIC_L3 = &device_creator; -const device_type SEGA8_ROM_MUSIC_EDITOR = &device_creator; -const device_type SEGA8_ROM_TEREBI = &device_creator; -const device_type SEGA8_ROM_DAHJEE_TYPEA = &device_creator; -const device_type SEGA8_ROM_DAHJEE_TYPEB = &device_creator; +const device_type SEGA8_ROM_OTHELLO = device_creator; +const device_type SEGA8_ROM_CASTLE = device_creator; +const device_type SEGA8_ROM_BASIC_L3 = device_creator; +const device_type SEGA8_ROM_MUSIC_EDITOR = device_creator; +const device_type SEGA8_ROM_TEREBI = device_creator; +const device_type SEGA8_ROM_DAHJEE_TYPEA = device_creator; +const device_type SEGA8_ROM_DAHJEE_TYPEB = device_creator; // Specific SG-1000 MkIII - SMS - GG cart types -const device_type SEGA8_ROM_EEPROM = &device_creator; -const device_type SEGA8_ROM_CODEMASTERS = &device_creator; -const device_type SEGA8_ROM_4PAK = &device_creator; -const device_type SEGA8_ROM_ZEMINA = &device_creator; -const device_type SEGA8_ROM_NEMESIS = &device_creator; -const device_type SEGA8_ROM_JANGGUN = &device_creator; -const device_type SEGA8_ROM_HICOM = &device_creator; -const device_type SEGA8_ROM_KOREAN = &device_creator; -const device_type SEGA8_ROM_KOREAN_NB = &device_creator; -const device_type SEGA8_ROM_SEOJIN = &device_creator; +const device_type SEGA8_ROM_EEPROM = device_creator; +const device_type SEGA8_ROM_CODEMASTERS = device_creator; +const device_type SEGA8_ROM_4PAK = device_creator; +const device_type SEGA8_ROM_ZEMINA = device_creator; +const device_type SEGA8_ROM_NEMESIS = device_creator; +const device_type SEGA8_ROM_JANGGUN = device_creator; +const device_type SEGA8_ROM_HICOM = device_creator; +const device_type SEGA8_ROM_KOREAN = device_creator; +const device_type SEGA8_ROM_KOREAN_NB = device_creator; +const device_type SEGA8_ROM_SEOJIN = device_creator; diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp index 17216c1ec58..df5f882b3ed 100644 --- a/src/devices/bus/sega8/sega8_slot.cpp +++ b/src/devices/bus/sega8/sega8_slot.cpp @@ -37,8 +37,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SEGA8_CART_SLOT = &device_creator; -const device_type SEGA8_CARD_SLOT = &device_creator; +const device_type SEGA8_CART_SLOT = device_creator; +const device_type SEGA8_CARD_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp index ceca6077fe8..d4798944d58 100644 --- a/src/devices/bus/sg1000_exp/fm_unit.cpp +++ b/src/devices/bus/sg1000_exp/fm_unit.cpp @@ -47,7 +47,7 @@ SMS version is not playing PSG sound on his Mark III with the FM unit. // DEVICE DEFINITIONS //************************************************************************** -const device_type SEGA_FM_UNIT = &device_creator; +const device_type SEGA_FM_UNIT = device_creator; static MACHINE_CONFIG_FRAGMENT( fm_config ) diff --git a/src/devices/bus/sg1000_exp/sg1000exp.cpp b/src/devices/bus/sg1000_exp/sg1000exp.cpp index 7c1fa1eea32..d926a4b7a3a 100644 --- a/src/devices/bus/sg1000_exp/sg1000exp.cpp +++ b/src/devices/bus/sg1000_exp/sg1000exp.cpp @@ -18,7 +18,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SG1000_EXPANSION_SLOT = &device_creator; +const device_type SG1000_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp index b58757cbbc4..10df8f00ee1 100644 --- a/src/devices/bus/sg1000_exp/sk1100.cpp +++ b/src/devices/bus/sg1000_exp/sk1100.cpp @@ -27,7 +27,7 @@ TODO: // DEVICE DEFINITIONS //************************************************************************** -const device_type SEGA_SK1100 = &device_creator; +const device_type SEGA_SK1100 = device_creator; /*------------------------------------------------- diff --git a/src/devices/bus/sms_ctrl/graphic.cpp b/src/devices/bus/sms_ctrl/graphic.cpp index db302cea668..6aba4cdcbfb 100644 --- a/src/devices/bus/sms_ctrl/graphic.cpp +++ b/src/devices/bus/sms_ctrl/graphic.cpp @@ -41,7 +41,7 @@ THen 2 nibbles are read to form a byte containing the absolute Y coordiante. // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_GRAPHIC = &device_creator; +const device_type SMS_GRAPHIC = device_creator; static INPUT_PORTS_START( sms_graphic ) diff --git a/src/devices/bus/sms_ctrl/joypad.cpp b/src/devices/bus/sms_ctrl/joypad.cpp index e9dba928346..2de1d1b13df 100644 --- a/src/devices/bus/sms_ctrl/joypad.cpp +++ b/src/devices/bus/sms_ctrl/joypad.cpp @@ -30,7 +30,7 @@ Release data from the Sega Retro project: // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_JOYPAD = &device_creator; +const device_type SMS_JOYPAD = device_creator; static INPUT_PORTS_START( sms_joypad ) diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp index ce5abe36515..a6fec3a798f 100644 --- a/src/devices/bus/sms_ctrl/lphaser.cpp +++ b/src/devices/bus/sms_ctrl/lphaser.cpp @@ -21,13 +21,15 @@ Notes: #include "emu.h" #include "lphaser.h" +#include "screen.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_LIGHT_PHASER = &device_creator; +const device_type SMS_LIGHT_PHASER = device_creator; #define LGUN_RADIUS 6 diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp index 9ea060fc491..355b05ffb46 100644 --- a/src/devices/bus/sms_ctrl/multitap.cpp +++ b/src/devices/bus/sms_ctrl/multitap.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_MULTITAP = &device_creator; +const device_type SMS_MULTITAP = device_creator; //************************************************************************** diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp index a5707d7f4fb..dbda3fe9740 100644 --- a/src/devices/bus/sms_ctrl/paddle.cpp +++ b/src/devices/bus/sms_ctrl/paddle.cpp @@ -32,7 +32,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_PADDLE = &device_creator; +const device_type SMS_PADDLE = device_creator; // time interval not verified // Player 2 of Galactic Protector is the most sensible to this timming. diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp index fa356a5cac6..434995a6fa7 100644 --- a/src/devices/bus/sms_ctrl/rfu.cpp +++ b/src/devices/bus/sms_ctrl/rfu.cpp @@ -28,7 +28,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_RAPID_FIRE = &device_creator; +const device_type SMS_RAPID_FIRE = device_creator; // time interval not verified #define RAPID_FIRE_INTERVAL attotime::from_hz(10) diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp index c8551fd385f..0967ae723c3 100644 --- a/src/devices/bus/sms_ctrl/smsctrl.cpp +++ b/src/devices/bus/sms_ctrl/smsctrl.cpp @@ -24,7 +24,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SMS_CONTROL_PORT = &device_creator; +const device_type SMS_CONTROL_PORT = device_creator; diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp index d822d7be986..02e2f614bdc 100644 --- a/src/devices/bus/sms_ctrl/sports.cpp +++ b/src/devices/bus/sms_ctrl/sports.cpp @@ -47,7 +47,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_SPORTS_PAD = &device_creator; +const device_type SMS_SPORTS_PAD = device_creator; // time interval not verified #define SPORTS_PAD_INTERVAL attotime::from_hz(XTAL_10_738635MHz/3/512) diff --git a/src/devices/bus/sms_ctrl/sportsjp.cpp b/src/devices/bus/sms_ctrl/sportsjp.cpp index 3932e8645ff..9cf326009fa 100644 --- a/src/devices/bus/sms_ctrl/sportsjp.cpp +++ b/src/devices/bus/sms_ctrl/sportsjp.cpp @@ -50,7 +50,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_SPORTS_PAD_JP = &device_creator; +const device_type SMS_SPORTS_PAD_JP = device_creator; // time interval not verified #define SPORTS_PAD_JP_INTERVAL attotime::from_hz(20000) diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp index 27b0f5f9863..0b1356db592 100644 --- a/src/devices/bus/sms_exp/gender.cpp +++ b/src/devices/bus/sms_exp/gender.cpp @@ -22,7 +22,7 @@ real hardware, when run plugged-in to the SMS expansion slot. // DEVICE DEFINITIONS //************************************************************************** -const device_type SMS_GENDER_ADAPTER = &device_creator; +const device_type SMS_GENDER_ADAPTER = device_creator; diff --git a/src/devices/bus/sms_exp/smsexp.cpp b/src/devices/bus/sms_exp/smsexp.cpp index 2a1dd8673c8..12e4ebcc48d 100644 --- a/src/devices/bus/sms_exp/smsexp.cpp +++ b/src/devices/bus/sms_exp/smsexp.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SMS_EXPANSION_SLOT = &device_creator; +const device_type SMS_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp index 569f538b590..a81aeac02b6 100644 --- a/src/devices/bus/snes/bsx.cpp +++ b/src/devices/bus/snes/bsx.cpp @@ -18,10 +18,10 @@ // sns_rom_bsx_device - constructor //------------------------------------------------- -const device_type SNS_ROM_BSX = &device_creator; -const device_type SNS_LOROM_BSX = &device_creator; -const device_type SNS_HIROM_BSX = &device_creator; -const device_type SNS_BSMEMPAK = &device_creator; +const device_type SNS_ROM_BSX = device_creator; +const device_type SNS_LOROM_BSX = device_creator; +const device_type SNS_HIROM_BSX = device_creator; +const device_type SNS_BSMEMPAK = device_creator; sns_rom_bsx_device::sns_rom_bsx_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) diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp index adec0e45002..6b65443ab11 100644 --- a/src/devices/bus/snes/event.cpp +++ b/src/devices/bus/snes/event.cpp @@ -17,7 +17,7 @@ // sns_rom_device - constructor //------------------------------------------------- -const device_type SNS_PFEST94 = &device_creator; +const device_type SNS_PFEST94 = device_creator; sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/snes/rom.cpp b/src/devices/bus/snes/rom.cpp index 1eed877ce83..9cd44aa7d41 100644 --- a/src/devices/bus/snes/rom.cpp +++ b/src/devices/bus/snes/rom.cpp @@ -15,18 +15,18 @@ // sns_rom_device - constructor //------------------------------------------------- -const device_type SNS_LOROM = &device_creator; -const device_type SNS_LOROM_OBC1 = &device_creator; +const device_type SNS_LOROM = device_creator; +const device_type SNS_LOROM_OBC1 = device_creator; // LoROM pirate carts with protection -const device_type SNS_LOROM_POKEMON = &device_creator; -const device_type SNS_LOROM_TEKKEN2 = &device_creator; -const device_type SNS_LOROM_SOULBLAD = &device_creator; -const device_type SNS_LOROM_BANANA = &device_creator; -const device_type SNS_LOROM_BUGSLIFE = &device_creator; +const device_type SNS_LOROM_POKEMON = device_creator; +const device_type SNS_LOROM_TEKKEN2 = device_creator; +const device_type SNS_LOROM_SOULBLAD = device_creator; +const device_type SNS_LOROM_BANANA = device_creator; +const device_type SNS_LOROM_BUGSLIFE = device_creator; // LoROM pirate multicarts -const device_type SNS_LOROM_MCPIR1 = &device_creator; -const device_type SNS_LOROM_MCPIR2 = &device_creator; -const device_type SNS_LOROM_20COL = &device_creator; +const device_type SNS_LOROM_MCPIR1 = device_creator; +const device_type SNS_LOROM_MCPIR2 = device_creator; +const device_type SNS_LOROM_20COL = device_creator; sns_rom_device::sns_rom_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) diff --git a/src/devices/bus/snes/rom21.cpp b/src/devices/bus/snes/rom21.cpp index 78db94492d8..d4a555da852 100644 --- a/src/devices/bus/snes/rom21.cpp +++ b/src/devices/bus/snes/rom21.cpp @@ -15,8 +15,8 @@ // sns_rom_device - constructor //------------------------------------------------- -const device_type SNS_HIROM = &device_creator; -const device_type SNS_HIROM_SRTC = &device_creator; +const device_type SNS_HIROM = device_creator; +const device_type SNS_HIROM_SRTC = device_creator; sns_rom21_device::sns_rom21_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) diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp index 86363038992..f74ebe4409a 100644 --- a/src/devices/bus/snes/sa1.cpp +++ b/src/devices/bus/snes/sa1.cpp @@ -82,7 +82,7 @@ // constructor //------------------------------------------------- -const device_type SNS_LOROM_SA1 = &device_creator; +const device_type SNS_LOROM_SA1 = device_creator; sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp index e1f870d5ff4..cddff2082f4 100644 --- a/src/devices/bus/snes/sdd1.cpp +++ b/src/devices/bus/snes/sdd1.cpp @@ -408,7 +408,7 @@ void SDD1_emu::SDD1emu_decompress(uint8_t *ROM, uint32_t *mmc, uint32_t in_buf, // sns_rom_sdd1_device - constructor //------------------------------------------------- -const device_type SNS_LOROM_SDD1 = &device_creator; +const device_type SNS_LOROM_SDD1 = device_creator; sns_rom_sdd1_device::sns_rom_sdd1_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) diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp index e44042de962..090408c77f4 100644 --- a/src/devices/bus/snes/sfx.cpp +++ b/src/devices/bus/snes/sfx.cpp @@ -15,7 +15,7 @@ // sns_rom_superfx_device - constructor //------------------------------------------------- -const device_type SNS_LOROM_SUPERFX = &device_creator; +const device_type SNS_LOROM_SUPERFX = device_creator; sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp index d61281952b6..bbf3e804a2a 100644 --- a/src/devices/bus/snes/sgb.cpp +++ b/src/devices/bus/snes/sgb.cpp @@ -19,8 +19,8 @@ // sns_rom_sgb_device - constructor //------------------------------------------------- -const device_type SNS_LOROM_SUPERGB = &device_creator; -const device_type SNS_LOROM_SUPERGB2 = &device_creator; +const device_type SNS_LOROM_SUPERGB = device_creator; +const device_type SNS_LOROM_SUPERGB2 = device_creator; sns_rom_sgb_device::sns_rom_sgb_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) diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp index 10bf17645f6..e5865de5ab5 100644 --- a/src/devices/bus/snes/snes_slot.cpp +++ b/src/devices/bus/snes/snes_slot.cpp @@ -56,9 +56,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SNS_CART_SLOT = &device_creator; -const device_type SNS_SUFAMI_CART_SLOT = &device_creator; -const device_type SNS_BSX_CART_SLOT = &device_creator; +const device_type SNS_CART_SLOT = device_creator; +const device_type SNS_SUFAMI_CART_SLOT = device_creator; +const device_type SNS_BSX_CART_SLOT = device_creator; //************************************************************************** // SNES Cartridge Interface diff --git a/src/devices/bus/snes/spc7110.cpp b/src/devices/bus/snes/spc7110.cpp index 1a611146366..61cc7ed99c7 100644 --- a/src/devices/bus/snes/spc7110.cpp +++ b/src/devices/bus/snes/spc7110.cpp @@ -20,8 +20,8 @@ // constructor //------------------------------------------------- -const device_type SNS_HIROM_SPC7110 = &device_creator; -const device_type SNS_HIROM_SPC7110_RTC = &device_creator; +const device_type SNS_HIROM_SPC7110 = device_creator; +const device_type SNS_HIROM_SPC7110_RTC = device_creator; sns_rom_spc7110_device::sns_rom_spc7110_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) diff --git a/src/devices/bus/snes/sufami.cpp b/src/devices/bus/snes/sufami.cpp index c181c5cde95..782e8669f13 100644 --- a/src/devices/bus/snes/sufami.cpp +++ b/src/devices/bus/snes/sufami.cpp @@ -20,8 +20,8 @@ // sns_rom_sufami_device - constructor //------------------------------------------------- -const device_type SNS_LOROM_SUFAMI = &device_creator; -const device_type SNS_STROM = &device_creator; +const device_type SNS_LOROM_SUFAMI = device_creator; +const device_type SNS_STROM = device_creator; sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp index 25cd416e8b1..315d6a0775c 100644 --- a/src/devices/bus/snes/upd.cpp +++ b/src/devices/bus/snes/upd.cpp @@ -26,10 +26,10 @@ inline uint16_t get_data(uint8_t *CPU, uint32_t addr) // constructor //------------------------------------------------- -const device_type SNS_LOROM_NECDSP = &device_creator; -const device_type SNS_HIROM_NECDSP = &device_creator; -const device_type SNS_LOROM_SETA10 = &device_creator; -const device_type SNS_LOROM_SETA11 = &device_creator; +const device_type SNS_LOROM_NECDSP = device_creator; +const device_type SNS_HIROM_NECDSP = device_creator; +const device_type SNS_LOROM_SETA10 = device_creator; +const device_type SNS_LOROM_SETA11 = device_creator; sns_rom20_necdsp_device::sns_rom20_necdsp_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) @@ -398,14 +398,14 @@ void sns_rom_setadsp_device::speedup_addon_bios_access() // Legacy versions including DSP dump roms, in order to support faulty dumps missing DSP data... -const device_type SNS_LOROM_NECDSP1_LEG = &device_creator; -const device_type SNS_LOROM_NECDSP1B_LEG = &device_creator; -const device_type SNS_LOROM_NECDSP2_LEG = &device_creator; -const device_type SNS_LOROM_NECDSP3_LEG = &device_creator; -const device_type SNS_LOROM_NECDSP4_LEG = &device_creator; -const device_type SNS_HIROM_NECDSP1_LEG = &device_creator; -const device_type SNS_LOROM_SETA10_LEG = &device_creator; -const device_type SNS_LOROM_SETA11_LEG = &device_creator; +const device_type SNS_LOROM_NECDSP1_LEG = device_creator; +const device_type SNS_LOROM_NECDSP1B_LEG = device_creator; +const device_type SNS_LOROM_NECDSP2_LEG = device_creator; +const device_type SNS_LOROM_NECDSP3_LEG = device_creator; +const device_type SNS_LOROM_NECDSP4_LEG = device_creator; +const device_type SNS_HIROM_NECDSP1_LEG = device_creator; +const device_type SNS_LOROM_SETA10_LEG = device_creator; +const device_type SNS_LOROM_SETA11_LEG = device_creator; sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp index faf63e91515..0195bf0fe6b 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.cpp +++ b/src/devices/bus/snes_ctrl/bcbattle.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_BARCODE_BATTLER = &device_creator; +const device_type SNES_BARCODE_BATTLER = device_creator; MACHINE_CONFIG_FRAGMENT( snes_battler ) diff --git a/src/devices/bus/snes_ctrl/ctrl.cpp b/src/devices/bus/snes_ctrl/ctrl.cpp index b098a7237ff..53383c13ce7 100644 --- a/src/devices/bus/snes_ctrl/ctrl.cpp +++ b/src/devices/bus/snes_ctrl/ctrl.cpp @@ -23,7 +23,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SNES_CONTROL_PORT = &device_creator; +const device_type SNES_CONTROL_PORT = device_creator; //************************************************************************** diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp index 11b965bed77..b31e8e1d36d 100644 --- a/src/devices/bus/snes_ctrl/joypad.cpp +++ b/src/devices/bus/snes_ctrl/joypad.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_JOYPAD = &device_creator; +const device_type SNES_JOYPAD = device_creator; static INPUT_PORTS_START( snes_joypad ) diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp index 36d6af3362b..94e4e567e91 100644 --- a/src/devices/bus/snes_ctrl/miracle.cpp +++ b/src/devices/bus/snes_ctrl/miracle.cpp @@ -20,7 +20,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_MIRACLE = &device_creator; +const device_type SNES_MIRACLE = device_creator; MACHINE_CONFIG_FRAGMENT( snes_miracle ) diff --git a/src/devices/bus/snes_ctrl/mouse.cpp b/src/devices/bus/snes_ctrl/mouse.cpp index 47806ea0845..acd8892518f 100644 --- a/src/devices/bus/snes_ctrl/mouse.cpp +++ b/src/devices/bus/snes_ctrl/mouse.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_MOUSE = &device_creator; +const device_type SNES_MOUSE = device_creator; static INPUT_PORTS_START( snes_mouse ) diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp index 062486bbcf5..0639e24c8db 100644 --- a/src/devices/bus/snes_ctrl/multitap.cpp +++ b/src/devices/bus/snes_ctrl/multitap.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_MULTITAP = &device_creator; +const device_type SNES_MULTITAP = device_creator; static INPUT_PORTS_START( snes_multitap ) diff --git a/src/devices/bus/snes_ctrl/pachinko.cpp b/src/devices/bus/snes_ctrl/pachinko.cpp index 551176959aa..d80b862fb33 100644 --- a/src/devices/bus/snes_ctrl/pachinko.cpp +++ b/src/devices/bus/snes_ctrl/pachinko.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_PACHINKO = &device_creator; +const device_type SNES_PACHINKO = device_creator; static INPUT_PORTS_START( snes_pachinko ) diff --git a/src/devices/bus/snes_ctrl/sscope.cpp b/src/devices/bus/snes_ctrl/sscope.cpp index fbdbb5a93c4..9b7ee0c053f 100644 --- a/src/devices/bus/snes_ctrl/sscope.cpp +++ b/src/devices/bus/snes_ctrl/sscope.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_SUPERSCOPE = &device_creator; +const device_type SNES_SUPERSCOPE = device_creator; static INPUT_PORTS_START( snes_sscope ) diff --git a/src/devices/bus/snes_ctrl/twintap.cpp b/src/devices/bus/snes_ctrl/twintap.cpp index 81a9937e819..ef4bdc8e260 100644 --- a/src/devices/bus/snes_ctrl/twintap.cpp +++ b/src/devices/bus/snes_ctrl/twintap.cpp @@ -20,7 +20,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_TWINTAP = &device_creator; +const device_type SNES_TWINTAP = device_creator; static INPUT_PORTS_START( snes_twintap ) diff --git a/src/devices/bus/spc1000/exp.cpp b/src/devices/bus/spc1000/exp.cpp index b90c59ecc93..c0f8d6555fb 100644 --- a/src/devices/bus/spc1000/exp.cpp +++ b/src/devices/bus/spc1000/exp.cpp @@ -14,7 +14,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type SPC1000_EXP_SLOT = &device_creator; +const device_type SPC1000_EXP_SLOT = device_creator; device_spc1000_card_interface::device_spc1000_card_interface(const machine_config &mconfig, device_t &device) diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp index 13a32cfb808..b724538c9da 100644 --- a/src/devices/bus/spc1000/fdd.cpp +++ b/src/devices/bus/spc1000/fdd.cpp @@ -124,7 +124,7 @@ const tiny_rom_entry *spc1000_fdd_exp_device::device_rom_region() const // GLOBAL VARIABLES //************************************************************************** -const device_type SPC1000_FDD_EXP = &device_creator; +const device_type SPC1000_FDD_EXP = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp index 0f055ef6382..70a2c497e3d 100644 --- a/src/devices/bus/spc1000/vdp.cpp +++ b/src/devices/bus/spc1000/vdp.cpp @@ -42,7 +42,7 @@ machine_config_constructor spc1000_vdp_exp_device::device_mconfig_additions() co // GLOBAL VARIABLES //************************************************************************** -const device_type SPC1000_VDP_EXP = &device_creator; +const device_type SPC1000_VDP_EXP = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp index fe5f519d0b2..9a289375fd9 100644 --- a/src/devices/bus/sunkbd/hlekbd.cpp +++ b/src/devices/bus/sunkbd/hlekbd.cpp @@ -4,6 +4,7 @@ #include "hlekbd.h" #include "machine/keyboard.ipp" +#include "speaker.h" /* @@ -135,12 +136,12 @@ DEVICE TYPE GLOBALS ***************************************************************************/ -device_type const SUN_TYPE3_HLE_KEYBOARD = &device_creator; -device_type const SUN_TYPE4_HLE_KEYBOARD = &device_creator; -device_type const SUN_TYPE5_HLE_KEYBOARD = &device_creator; -device_type const SUN_TYPE5_GB_HLE_KEYBOARD = &device_creator; -device_type const SUN_TYPE5_SE_HLE_KEYBOARD = &device_creator; -device_type const SUN_TYPE5_JP_HLE_KEYBOARD = &device_creator; +device_type const SUN_TYPE3_HLE_KEYBOARD = device_creator; +device_type const SUN_TYPE4_HLE_KEYBOARD = device_creator; +device_type const SUN_TYPE5_HLE_KEYBOARD = device_creator; +device_type const SUN_TYPE5_GB_HLE_KEYBOARD = device_creator; +device_type const SUN_TYPE5_SE_HLE_KEYBOARD = device_creator; +device_type const SUN_TYPE5_JP_HLE_KEYBOARD = device_creator; diff --git a/src/devices/bus/sunkbd/sunkbd.cpp b/src/devices/bus/sunkbd/sunkbd.cpp index 62d5680c397..2809bef5b16 100644 --- a/src/devices/bus/sunkbd/sunkbd.cpp +++ b/src/devices/bus/sunkbd/sunkbd.cpp @@ -5,7 +5,7 @@ #include "sunkbd.h" -device_type const SUNKBD_PORT = &device_creator; +device_type const SUNKBD_PORT = device_creator; int const device_sun_keyboard_port_interface::START_BIT_COUNT; diff --git a/src/devices/bus/svi3x8/expander/expander.cpp b/src/devices/bus/svi3x8/expander/expander.cpp index 6ddb23e8bb9..6b54b620f6f 100644 --- a/src/devices/bus/svi3x8/expander/expander.cpp +++ b/src/devices/bus/svi3x8/expander/expander.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SVI_EXPANDER = &device_creator; +const device_type SVI_EXPANDER = device_creator; //************************************************************************** diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp index d97b114f1f5..e7fe68b608b 100644 --- a/src/devices/bus/svi3x8/expander/sv601.cpp +++ b/src/devices/bus/svi3x8/expander/sv601.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SV601 = &device_creator; +const device_type SV601 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp index 1c5f4b6b93c..119ec066544 100644 --- a/src/devices/bus/svi3x8/expander/sv602.cpp +++ b/src/devices/bus/svi3x8/expander/sv602.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SV602 = &device_creator; +const device_type SV602 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp index af7bae0ee25..c0e4e16fdd2 100644 --- a/src/devices/bus/svi3x8/expander/sv603.cpp +++ b/src/devices/bus/svi3x8/expander/sv603.cpp @@ -8,14 +8,16 @@ #include "emu.h" #include "sv603.h" + #include "softlist.h" +#include "speaker.h" //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type SV603 = &device_creator; +const device_type SV603 = device_creator; //------------------------------------------------- // rom_region - device-specific ROM region diff --git a/src/devices/bus/svi3x8/slot/slot.cpp b/src/devices/bus/svi3x8/slot/slot.cpp index 7dc9bb8be95..8294369bb55 100644 --- a/src/devices/bus/svi3x8/slot/slot.cpp +++ b/src/devices/bus/svi3x8/slot/slot.cpp @@ -14,7 +14,7 @@ // SLOT BUS DEVICE //************************************************************************** -const device_type SVI_SLOT_BUS = &device_creator; +const device_type SVI_SLOT_BUS = device_creator; //------------------------------------------------- // svi_slot_bus_device - constructor @@ -198,7 +198,7 @@ WRITE_LINE_MEMBER( svi_slot_bus_device::bk32_w ) // SVI SLOT DEVICE //************************************************************************** -const device_type SVI_SLOT = &device_creator; +const device_type SVI_SLOT = device_creator; //------------------------------------------------- // svi_slot_device - constructor diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp index 396d99ed56b..32234dc2a61 100644 --- a/src/devices/bus/svi3x8/slot/sv801.cpp +++ b/src/devices/bus/svi3x8/slot/sv801.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SV801 = &device_creator; +const device_type SV801 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp index d0fe46f946e..11e7dd6bbe3 100644 --- a/src/devices/bus/svi3x8/slot/sv802.cpp +++ b/src/devices/bus/svi3x8/slot/sv802.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SV802 = &device_creator; +const device_type SV802 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/svi3x8/slot/sv803.cpp b/src/devices/bus/svi3x8/slot/sv803.cpp index 088e2ae5064..b67764ddd24 100644 --- a/src/devices/bus/svi3x8/slot/sv803.cpp +++ b/src/devices/bus/svi3x8/slot/sv803.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SV803 = &device_creator; +const device_type SV803 = device_creator; //************************************************************************** diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp index 3ef1081c58c..b681d8d1cc6 100644 --- a/src/devices/bus/svi3x8/slot/sv805.cpp +++ b/src/devices/bus/svi3x8/slot/sv805.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SV805 = &device_creator; +const device_type SV805 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp index e1047e143a9..c4ff1cc6c62 100644 --- a/src/devices/bus/svi3x8/slot/sv806.cpp +++ b/src/devices/bus/svi3x8/slot/sv806.cpp @@ -9,12 +9,14 @@ #include "emu.h" #include "sv806.h" +#include "screen.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type SV806 = &device_creator; +const device_type SV806 = device_creator; //------------------------------------------------- // rom_region - device-specific ROM region diff --git a/src/devices/bus/svi3x8/slot/sv807.cpp b/src/devices/bus/svi3x8/slot/sv807.cpp index 99675199b93..faaea4c5a7e 100644 --- a/src/devices/bus/svi3x8/slot/sv807.cpp +++ b/src/devices/bus/svi3x8/slot/sv807.cpp @@ -28,7 +28,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SV807 = &device_creator; +const device_type SV807 = device_creator; //------------------------------------------------- // input_ports - device-specific input ports diff --git a/src/devices/bus/ti99_peb/bwg.cpp b/src/devices/bus/ti99_peb/bwg.cpp index d2a04e0c6d0..24351813a93 100644 --- a/src/devices/bus/ti99_peb/bwg.cpp +++ b/src/devices/bus/ti99_peb/bwg.cpp @@ -728,4 +728,4 @@ const tiny_rom_entry *snug_bwg_device::device_rom_region() const return ROM_NAME( bwg_fdc ); } -const device_type TI99_BWG = &device_creator; +const device_type TI99_BWG = device_creator; diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp index d8b3bc79934..fe049d02036 100644 --- a/src/devices/bus/ti99_peb/evpc.cpp +++ b/src/devices/bus/ti99_peb/evpc.cpp @@ -38,6 +38,9 @@ #include "emu.h" #include "evpc.h" +#include "speaker.h" + + #define EVPC_CRU_BASE 0x1400 #define TRACE_ADDRESS 0 @@ -477,4 +480,4 @@ machine_config_constructor snug_enhanced_video_device::device_mconfig_additions( return MACHINE_CONFIG_NAME( ti99_evpc ); } -const device_type TI99_EVPC = &device_creator; +const device_type TI99_EVPC = device_creator; diff --git a/src/devices/bus/ti99_peb/hfdc.cpp b/src/devices/bus/ti99_peb/hfdc.cpp index f3ea9740a16..7599c15b0bf 100644 --- a/src/devices/bus/ti99_peb/hfdc.cpp +++ b/src/devices/bus/ti99_peb/hfdc.cpp @@ -1113,4 +1113,4 @@ ioport_constructor myarc_hfdc_device::device_input_ports() const return INPUT_PORTS_NAME( ti99_hfdc ); } -const device_type TI99_HFDC = &device_creator; +const device_type TI99_HFDC = device_creator; diff --git a/src/devices/bus/ti99_peb/horizon.cpp b/src/devices/bus/ti99_peb/horizon.cpp index 0c3d92256dd..434fcdf2c6a 100644 --- a/src/devices/bus/ti99_peb/horizon.cpp +++ b/src/devices/bus/ti99_peb/horizon.cpp @@ -491,4 +491,4 @@ ioport_constructor horizon_ramdisk_device::device_input_ports() const return INPUT_PORTS_NAME(horizon); } -const device_type TI99_HORIZON = &device_creator; +const device_type TI99_HORIZON = device_creator; diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp index 2ab258132c2..f53190ebbbf 100644 --- a/src/devices/bus/ti99_peb/hsgpl.cpp +++ b/src/devices/bus/ti99_peb/hsgpl.cpp @@ -714,4 +714,4 @@ ioport_constructor snug_high_speed_gpl_device::device_input_ports() const return INPUT_PORTS_NAME(ti99_hsgpl); } -const device_type TI99_HSGPL = &device_creator; +const device_type TI99_HSGPL = device_creator; diff --git a/src/devices/bus/ti99_peb/memex.cpp b/src/devices/bus/ti99_peb/memex.cpp index 1d1f4642189..f0a3dffbee7 100644 --- a/src/devices/bus/ti99_peb/memex.cpp +++ b/src/devices/bus/ti99_peb/memex.cpp @@ -158,4 +158,4 @@ ioport_constructor geneve_memex_device::device_input_ports() const return INPUT_PORTS_NAME( memex ); } -const device_type TI99_MEMEX = &device_creator; +const device_type TI99_MEMEX = device_creator; diff --git a/src/devices/bus/ti99_peb/myarcmem.cpp b/src/devices/bus/ti99_peb/myarcmem.cpp index 7eda7188727..5c1496279f8 100644 --- a/src/devices/bus/ti99_peb/myarcmem.cpp +++ b/src/devices/bus/ti99_peb/myarcmem.cpp @@ -211,4 +211,4 @@ ioport_constructor myarc_memory_expansion_device::device_input_ports() const return INPUT_PORTS_NAME(myarc_exp); } -const device_type TI99_MYARCMEM = &device_creator; +const device_type TI99_MYARCMEM = device_creator; diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp index 7165d7fb788..d86f46e3b5f 100644 --- a/src/devices/bus/ti99_peb/pcode.cpp +++ b/src/devices/bus/ti99_peb/pcode.cpp @@ -373,4 +373,4 @@ ioport_constructor ti_pcode_card_device::device_input_ports() const return INPUT_PORTS_NAME( ti99_pcode ); } -const device_type TI99_P_CODE = &device_creator; +const device_type TI99_P_CODE = device_creator; diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp index 34190757fb4..de124051046 100644 --- a/src/devices/bus/ti99_peb/peribox.cpp +++ b/src/devices/bus/ti99_peb/peribox.cpp @@ -757,10 +757,10 @@ WRITE_LINE_MEMBER( peribox_slot_device::set_ready ) } /***************************************************************************/ -const device_type PERIBOX = &device_creator; -const device_type PERIBOX_SLOT = &device_creator; +const device_type PERIBOX = device_creator; +const device_type PERIBOX_SLOT = device_creator; -const device_type PERIBOX_EV = &device_creator; -const device_type PERIBOX_SG = &device_creator; -const device_type PERIBOX_GEN = &device_creator; -const device_type PERIBOX_998 = &device_creator; +const device_type PERIBOX_EV = device_creator; +const device_type PERIBOX_SG = device_creator; +const device_type PERIBOX_GEN = device_creator; +const device_type PERIBOX_998 = device_creator; diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp index 902db88675a..b0b51f90280 100644 --- a/src/devices/bus/ti99_peb/samsmem.cpp +++ b/src/devices/bus/ti99_peb/samsmem.cpp @@ -133,4 +133,4 @@ void sams_memory_expansion_device::device_reset() for (auto & elem : m_mapper) elem = 0; } -const device_type TI99_SAMSMEM = &device_creator; +const device_type TI99_SAMSMEM = device_creator; diff --git a/src/devices/bus/ti99_peb/spchsyn.cpp b/src/devices/bus/ti99_peb/spchsyn.cpp index 99168e0eeb2..1a0ce1483e9 100644 --- a/src/devices/bus/ti99_peb/spchsyn.cpp +++ b/src/devices/bus/ti99_peb/spchsyn.cpp @@ -23,8 +23,11 @@ #include "emu.h" #include "spchsyn.h" -#include "sound/wave.h" + #include "machine/spchrom.h" +#include "sound/wave.h" +#include "speaker.h" + #define TRACE_MEM 0 #define TRACE_ADDR 0 @@ -171,4 +174,4 @@ const tiny_rom_entry *ti_speech_synthesizer_device::device_rom_region() const { return ROM_NAME( ti99_speech ); } -const device_type TI99_SPEECH = &device_creator; +const device_type TI99_SPEECH = device_creator; diff --git a/src/devices/bus/ti99_peb/ti_32kmem.cpp b/src/devices/bus/ti99_peb/ti_32kmem.cpp index 082c85c0e61..b86b35e2ca6 100644 --- a/src/devices/bus/ti99_peb/ti_32kmem.cpp +++ b/src/devices/bus/ti99_peb/ti_32kmem.cpp @@ -107,4 +107,4 @@ machine_config_constructor ti_32k_expcard_device::device_mconfig_additions() con return MACHINE_CONFIG_NAME( mem32k ); } -const device_type TI_32KMEM = &device_creator; +const device_type TI_32KMEM = device_creator; diff --git a/src/devices/bus/ti99_peb/ti_fdc.cpp b/src/devices/bus/ti99_peb/ti_fdc.cpp index c8d71dbd9a4..c4bf5e2c19c 100644 --- a/src/devices/bus/ti99_peb/ti_fdc.cpp +++ b/src/devices/bus/ti99_peb/ti_fdc.cpp @@ -478,4 +478,4 @@ const tiny_rom_entry *ti_fdc_device::device_rom_region() const return ROM_NAME( ti_fdc ); } -const device_type TI99_FDC = &device_creator; +const device_type TI99_FDC = device_creator; diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp index 97eaef541ad..2a786440502 100644 --- a/src/devices/bus/ti99_peb/ti_rs232.cpp +++ b/src/devices/bus/ti99_peb/ti_rs232.cpp @@ -1155,6 +1155,6 @@ ioport_constructor ti_rs232_pio_device::device_input_ports() const return INPUT_PORTS_NAME(ti_rs232); } -const device_type TI99_RS232 = &device_creator; -const device_type TI99_RS232_DEV = &device_creator; -const device_type TI99_PIO_DEV = &device_creator; +const device_type TI99_RS232 = device_creator; +const device_type TI99_RS232_DEV = device_creator; +const device_type TI99_PIO_DEV = device_creator; diff --git a/src/devices/bus/ti99_peb/tn_ide.cpp b/src/devices/bus/ti99_peb/tn_ide.cpp index dfe277ea6df..be9ba36aad2 100644 --- a/src/devices/bus/ti99_peb/tn_ide.cpp +++ b/src/devices/bus/ti99_peb/tn_ide.cpp @@ -384,4 +384,4 @@ ioport_constructor nouspikel_ide_interface_device::device_input_ports() const return INPUT_PORTS_NAME(tn_ide); } -const device_type TI99_IDE = &device_creator; +const device_type TI99_IDE = device_creator; diff --git a/src/devices/bus/ti99_peb/tn_usbsm.cpp b/src/devices/bus/ti99_peb/tn_usbsm.cpp index 185acaeb0c3..b16126b9eec 100644 --- a/src/devices/bus/ti99_peb/tn_usbsm.cpp +++ b/src/devices/bus/ti99_peb/tn_usbsm.cpp @@ -376,4 +376,4 @@ ioport_constructor nouspikel_usb_smartmedia_device::device_input_ports() const return INPUT_PORTS_NAME(tn_usbsm); } -const device_type TI99_USBSM = &device_creator; +const device_type TI99_USBSM = device_creator; diff --git a/src/devices/bus/ti99x/990_dk.cpp b/src/devices/bus/ti99x/990_dk.cpp index a68253adff5..a6a16ba46fb 100644 --- a/src/devices/bus/ti99x/990_dk.cpp +++ b/src/devices/bus/ti99x/990_dk.cpp @@ -40,7 +40,7 @@ enum status_unit_shift = 13 }; -const device_type FD800 = &device_creator; +const device_type FD800 = device_creator; fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, FD800, "TI FD800 Diablo floppy disk controller", tag, owner, clock, "fd800", __FILE__), diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp index 7882a8f37e3..46695114294 100644 --- a/src/devices/bus/ti99x/990_hd.cpp +++ b/src/devices/bus/ti99x/990_hd.cpp @@ -974,7 +974,7 @@ static MACHINE_CONFIG_FRAGMENT( ti990_hdc ) MCFG_HARDDISK_UNLOAD(ti990_hdc_device, ti990_hd) MACHINE_CONFIG_END -const device_type TI990_HDC = &device_creator; +const device_type TI990_HDC = device_creator; ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TI990_HDC, "Generic TI-990 Hard Disk Controller", tag, owner, clock, "hdc_990", __FILE__), diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp index 7ab14725f19..1613c92b830 100644 --- a/src/devices/bus/ti99x/990_tap.cpp +++ b/src/devices/bus/ti99x/990_tap.cpp @@ -914,7 +914,7 @@ private: int tape_get_id(); }; -const device_type TI990_TAPE = &device_creator; +const device_type TI990_TAPE = device_creator; ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TI990_TAPE, "TI-990 Magnetic Tape", tag, owner, clock, "ti990_tape_image", __FILE__), @@ -974,7 +974,7 @@ static MACHINE_CONFIG_FRAGMENT( tap_990 ) MCFG_TI990_TAPE_ADD("tape3") MACHINE_CONFIG_END -const device_type TI990_TAPE_CTRL = &device_creator; +const device_type TI990_TAPE_CTRL = device_creator; tap_990_device::tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TI990_TAPE_CTRL, "Generic TI-990 Tape Controller", tag, owner, clock, "tap_990", __FILE__), diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp index 681bacda9d8..9342c3d8ae2 100644 --- a/src/devices/bus/ti99x/998board.cpp +++ b/src/devices/bus/ti99x/998board.cpp @@ -839,7 +839,7 @@ machine_config_constructor mainboard8_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( ti998_mainboard ); } -const device_type MAINBOARD8 = &device_creator; +const device_type MAINBOARD8 = device_creator; /*************************************************************************** @@ -1335,7 +1335,7 @@ void video_waitstate_generator::clock_in(line_state clkout) } } -const device_type VAQUERRO = &device_creator; +const device_type VAQUERRO = device_creator; /*************************************************************************** ===== MOFETTA: Physical Address Space decoder ===== @@ -1583,7 +1583,7 @@ void mofetta_device::device_reset() } -const device_type MOFETTA = &device_creator; +const device_type MOFETTA = device_creator; /*************************************************************************** @@ -1939,7 +1939,7 @@ void amigo_device::device_reset() m_logical_space = true; } -const device_type AMIGO = &device_creator; +const device_type AMIGO = device_creator; /*************************************************************************** @@ -2078,4 +2078,4 @@ void oso_device::device_start() save_item(NAME(m_xmit)); } -const device_type OSO = &device_creator; +const device_type OSO = device_creator; diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp index 34f25a89c91..98a0791250c 100644 --- a/src/devices/bus/ti99x/datamux.cpp +++ b/src/devices/bus/ti99x/datamux.cpp @@ -634,4 +634,4 @@ ioport_constructor ti99_datamux_device::device_input_ports() const return INPUT_PORTS_NAME(datamux); } -const device_type DATAMUX = &device_creator; +const device_type DATAMUX = device_creator; diff --git a/src/devices/bus/ti99x/genboard.cpp b/src/devices/bus/ti99x/genboard.cpp index adf60667134..d7dfb2bbd1c 100644 --- a/src/devices/bus/ti99x/genboard.cpp +++ b/src/devices/bus/ti99x/genboard.cpp @@ -1508,7 +1508,7 @@ void geneve_mapper_device::device_reset() } } -const device_type GENEVE_MAPPER = &device_creator; +const device_type GENEVE_MAPPER = device_creator; /**************************************************************************** Keyboard support @@ -2009,7 +2009,7 @@ ioport_constructor geneve_keyboard_device::device_input_ports() const return INPUT_PORTS_NAME( genkeys ); } -const device_type GENEVE_KEYBOARD = &device_creator; +const device_type GENEVE_KEYBOARD = device_creator; /**************************************************************************** Mouse support @@ -2089,4 +2089,4 @@ ioport_constructor geneve_mouse_device::device_input_ports() const return INPUT_PORTS_NAME( genmouse ); } -const device_type GENEVE_MOUSE = &device_creator; +const device_type GENEVE_MOUSE = device_creator; diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index 1a9f95b1d85..fdf86ea60e0 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -278,7 +278,7 @@ ioport_constructor gromport_device::device_input_ports() const return INPUT_PORTS_NAME(gromport); } -const device_type GROMPORT = &device_creator; +const device_type GROMPORT = device_creator; /*************************************************************************** Different versions of cartridge connections @@ -291,9 +291,9 @@ const device_type GROMPORT = &device_creator; ***************************************************************************/ -const device_type GROMPORT_SINGLE = &device_creator; -const device_type GROMPORT_MULTI = &device_creator; -const device_type GROMPORT_GK = &device_creator; +const device_type GROMPORT_SINGLE = device_creator; +const device_type GROMPORT_MULTI = device_creator; +const device_type GROMPORT_GK = device_creator; ti99_cartridge_connector_device::ti99_cartridge_connector_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) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), @@ -1565,7 +1565,7 @@ const tiny_rom_entry *ti99_cartridge_device::device_rom_region() const return ROM_NAME( cartridge_memory ); } -const device_type TI99CART = &device_creator; +const device_type TI99CART = device_creator; /*************************************************************************** Cartridge types diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp index 38e9b8261a6..8f9dd9aeb01 100644 --- a/src/devices/bus/ti99x/handset.cpp +++ b/src/devices/bus/ti99x/handset.cpp @@ -469,7 +469,7 @@ ioport_constructor ti99_handset_device::device_input_ports() const return INPUT_PORTS_NAME( handset ); } -const device_type HANDSET = &device_creator; +const device_type HANDSET = device_creator; /****************************************************************************** Twin Joystick @@ -535,4 +535,4 @@ ioport_constructor ti99_twin_joystick::device_input_ports() const return INPUT_PORTS_NAME( joysticks ); } -const device_type TI99_JOYSTICK = &device_creator; +const device_type TI99_JOYSTICK = device_creator; diff --git a/src/devices/bus/ti99x/joyport.cpp b/src/devices/bus/ti99x/joyport.cpp index a098012ea21..ea7d3e18100 100644 --- a/src/devices/bus/ti99x/joyport.cpp +++ b/src/devices/bus/ti99x/joyport.cpp @@ -113,4 +113,4 @@ SLOT_INTERFACE_START( joystick_port_994 ) SLOT_INTERFACE("handset", HANDSET) SLOT_INTERFACE_END -const device_type JOYPORT = &device_creator; +const device_type JOYPORT = device_creator; diff --git a/src/devices/bus/ti99x/mecmouse.cpp b/src/devices/bus/ti99x/mecmouse.cpp index 207d89ef68b..b3c2c3d2c5d 100644 --- a/src/devices/bus/ti99x/mecmouse.cpp +++ b/src/devices/bus/ti99x/mecmouse.cpp @@ -216,4 +216,4 @@ ioport_constructor mecmouse_device::device_input_ports() const return INPUT_PORTS_NAME( mecmouse ); } -const device_type MECMOUSE = &device_creator; +const device_type MECMOUSE = device_creator; diff --git a/src/devices/bus/ti99x/ti99defs.cpp b/src/devices/bus/ti99x/ti99defs.cpp new file mode 100644 index 00000000000..f65a95b8304 --- /dev/null +++ b/src/devices/bus/ti99x/ti99defs.cpp @@ -0,0 +1,17 @@ +// license:LGPL-2.1+ +// copyright-holders:Michael Zapf +#include "emu.h" +#include "ti99defs.h" + +const device_type EVPC_CONN = device_creator; + +evpc_clock_connector::evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, EVPC_CONN, "EVPC clock connector", tag, owner, clock, "ti99_evpc_clock", __FILE__) + , m_vdpint(*this) +{ +} + +void evpc_clock_connector::device_start() +{ + m_vdpint.resolve(); +} diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h index 134b7cf0331..4957a50908f 100644 --- a/src/devices/bus/ti99x/ti99defs.h +++ b/src/devices/bus/ti99x/ti99defs.h @@ -153,16 +153,12 @@ public: ****************************************************************************/ class ti99_4x_state; -class evpc_clock_connector; - -const device_type EVPC_CONN = &device_creator; +extern const device_type EVPC_CONN; class evpc_clock_connector : public device_t { public: - evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, EVPC_CONN, "EVPC clock connector", tag, owner, clock, "ti99_evpc_clock", __FILE__), - m_vdpint(*this) { }; + evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); template static devcb_base &static_set_vdpint_callback(device_t &device, _Object object) { @@ -170,7 +166,7 @@ public: } WRITE_LINE_MEMBER( vclock_line ) { m_vdpint(state); } - void device_start() override { m_vdpint.resolve(); } + void device_start() override; private: // VDPINT line to the CPU diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp index 0a41728fbaf..45a0c116433 100644 --- a/src/devices/bus/tiki100/8088.cpp +++ b/src/devices/bus/tiki100/8088.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TIKI100_8088 = &device_creator; +const device_type TIKI100_8088 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp index 88d9b4d7f3b..95063b2d4cf 100644 --- a/src/devices/bus/tiki100/exp.cpp +++ b/src/devices/bus/tiki100/exp.cpp @@ -14,8 +14,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TIKI100_BUS = &device_creator; -const device_type TIKI100_BUS_SLOT = &device_creator; +const device_type TIKI100_BUS = device_creator; +const device_type TIKI100_BUS_SLOT = device_creator; diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp index 32e43d621ba..a94856da571 100644 --- a/src/devices/bus/tiki100/hdc.cpp +++ b/src/devices/bus/tiki100/hdc.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TIKI100_HDC = &device_creator; +const device_type TIKI100_HDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index 017d67af1d6..1c19dd066ad 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -48,7 +48,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type TVC_HBF = &device_creator; +const device_type TVC_HBF = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/tvc/tvc.cpp b/src/devices/bus/tvc/tvc.cpp index 84f90f96af1..e726cffd99e 100644 --- a/src/devices/bus/tvc/tvc.cpp +++ b/src/devices/bus/tvc/tvc.cpp @@ -18,7 +18,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type TVCEXP_SLOT = &device_creator; +const device_type TVCEXP_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/vboy/rom.cpp b/src/devices/bus/vboy/rom.cpp index 7ae6a408233..91d7e785ae7 100644 --- a/src/devices/bus/vboy/rom.cpp +++ b/src/devices/bus/vboy/rom.cpp @@ -17,8 +17,8 @@ // vboy_rom_device - constructor //------------------------------------------------- -const device_type VBOY_ROM_STD = &device_creator; -const device_type VBOY_ROM_EEPROM = &device_creator; +const device_type VBOY_ROM_STD = device_creator; +const device_type VBOY_ROM_EEPROM = device_creator; vboy_rom_device::vboy_rom_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) diff --git a/src/devices/bus/vboy/slot.cpp b/src/devices/bus/vboy/slot.cpp index 11be9933ebc..8eca2104261 100644 --- a/src/devices/bus/vboy/slot.cpp +++ b/src/devices/bus/vboy/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VBOY_CART_SLOT = &device_creator; +const device_type VBOY_CART_SLOT = device_creator; //************************************************************************** // vboy cartridges Interface diff --git a/src/devices/bus/vc4000/rom.cpp b/src/devices/bus/vc4000/rom.cpp index ef5289abe0f..0f6f0865099 100644 --- a/src/devices/bus/vc4000/rom.cpp +++ b/src/devices/bus/vc4000/rom.cpp @@ -192,10 +192,10 @@ // vc4000_rom_device - constructor //------------------------------------------------- -const device_type VC4000_ROM_STD = &device_creator; -const device_type VC4000_ROM_ROM4K = &device_creator; -const device_type VC4000_ROM_RAM1K = &device_creator; -const device_type VC4000_ROM_CHESS2 = &device_creator; +const device_type VC4000_ROM_STD = device_creator; +const device_type VC4000_ROM_ROM4K = device_creator; +const device_type VC4000_ROM_RAM1K = device_creator; +const device_type VC4000_ROM_CHESS2 = device_creator; vc4000_rom_device::vc4000_rom_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) diff --git a/src/devices/bus/vc4000/slot.cpp b/src/devices/bus/vc4000/slot.cpp index 572645eff81..15d061772f0 100644 --- a/src/devices/bus/vc4000/slot.cpp +++ b/src/devices/bus/vc4000/slot.cpp @@ -15,8 +15,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VC4000_CART_SLOT = &device_creator; -const device_type H21_CART_SLOT = &device_creator; +const device_type VC4000_CART_SLOT = device_creator; +const device_type H21_CART_SLOT = device_creator; //************************************************************************** // VC4000 Cartridges Interface diff --git a/src/devices/bus/vcs/compumat.cpp b/src/devices/bus/vcs/compumat.cpp index b5e90744688..304dbbf3403 100644 --- a/src/devices/bus/vcs/compumat.cpp +++ b/src/devices/bus/vcs/compumat.cpp @@ -13,7 +13,7 @@ #include "emu.h" #include "compumat.h" -const device_type A26_ROM_COMPUMATE = &device_creator; +const device_type A26_ROM_COMPUMATE = device_creator; a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp index 476f102456c..fe7da83d288 100644 --- a/src/devices/bus/vcs/dpc.cpp +++ b/src/devices/bus/vcs/dpc.cpp @@ -14,7 +14,7 @@ // DPC device -const device_type ATARI_DPC = &device_creator; +const device_type ATARI_DPC = device_creator; dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) : @@ -237,7 +237,7 @@ WRITE8_MEMBER(dpc_device::write) // cart device -const device_type A26_ROM_DPC = &device_creator; +const device_type A26_ROM_DPC = device_creator; a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp index 0822db3d175..6721cb6eff9 100644 --- a/src/devices/bus/vcs/harmony_melody.cpp +++ b/src/devices/bus/vcs/harmony_melody.cpp @@ -63,7 +63,7 @@ map: // cart device -const device_type A26_ROM_HARMONY = &device_creator; +const device_type A26_ROM_HARMONY = device_creator; a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp index 65ff0715fa8..be9be8ff7b7 100755 --- a/src/devices/bus/vcs/rom.cpp +++ b/src/devices/bus/vcs/rom.cpp @@ -21,27 +21,27 @@ // a26_rom_*k_device - constructor //------------------------------------------------- -const device_type A26_ROM_2K = &device_creator; -const device_type A26_ROM_4K = &device_creator; -const device_type A26_ROM_F4 = &device_creator; -const device_type A26_ROM_F6 = &device_creator; -const device_type A26_ROM_F8 = &device_creator; -const device_type A26_ROM_F8_SW = &device_creator; -const device_type A26_ROM_FA = &device_creator; -const device_type A26_ROM_FE = &device_creator; -const device_type A26_ROM_3E = &device_creator; -const device_type A26_ROM_3F = &device_creator; -const device_type A26_ROM_E0 = &device_creator; -const device_type A26_ROM_E7 = &device_creator; -const device_type A26_ROM_UA = &device_creator; -const device_type A26_ROM_CV = &device_creator; -const device_type A26_ROM_DC = &device_creator; -const device_type A26_ROM_FV = &device_creator; -const device_type A26_ROM_JVP = &device_creator; -const device_type A26_ROM_4IN1 = &device_creator; -const device_type A26_ROM_8IN1 = &device_creator; -const device_type A26_ROM_32IN1 = &device_creator; -const device_type A26_ROM_X07 = &device_creator; +const device_type A26_ROM_2K = device_creator; +const device_type A26_ROM_4K = device_creator; +const device_type A26_ROM_F4 = device_creator; +const device_type A26_ROM_F6 = device_creator; +const device_type A26_ROM_F8 = device_creator; +const device_type A26_ROM_F8_SW = device_creator; +const device_type A26_ROM_FA = device_creator; +const device_type A26_ROM_FE = device_creator; +const device_type A26_ROM_3E = device_creator; +const device_type A26_ROM_3F = device_creator; +const device_type A26_ROM_E0 = device_creator; +const device_type A26_ROM_E7 = device_creator; +const device_type A26_ROM_UA = device_creator; +const device_type A26_ROM_CV = device_creator; +const device_type A26_ROM_DC = device_creator; +const device_type A26_ROM_FV = device_creator; +const device_type A26_ROM_JVP = device_creator; +const device_type A26_ROM_4IN1 = device_creator; +const device_type A26_ROM_8IN1 = device_creator; +const device_type A26_ROM_32IN1 = device_creator; +const device_type A26_ROM_X07 = device_creator; a26_rom_2k_device::a26_rom_2k_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) diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp index 49c27b2f311..44f03eb51fe 100644 --- a/src/devices/bus/vcs/scharger.cpp +++ b/src/devices/bus/vcs/scharger.cpp @@ -37,7 +37,7 @@ #include "sound/wave.h" #include "formats/a26_cas.h" -const device_type A26_ROM_SUPERCHARGER = &device_creator; +const device_type A26_ROM_SUPERCHARGER = device_creator; a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp index 17efc8d8069..6099f9ee647 100644 --- a/src/devices/bus/vcs/vcs_slot.cpp +++ b/src/devices/bus/vcs/vcs_slot.cpp @@ -22,7 +22,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VCS_CART_SLOT = &device_creator; +const device_type VCS_CART_SLOT = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vcs_ctrl/ctrl.cpp b/src/devices/bus/vcs_ctrl/ctrl.cpp index 8e0c349ad23..f68088de7bf 100644 --- a/src/devices/bus/vcs_ctrl/ctrl.cpp +++ b/src/devices/bus/vcs_ctrl/ctrl.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITION //************************************************************************** -const device_type VCS_CONTROL_PORT = &device_creator; +const device_type VCS_CONTROL_PORT = device_creator; diff --git a/src/devices/bus/vcs_ctrl/joybooster.cpp b/src/devices/bus/vcs_ctrl/joybooster.cpp index 5a19874902a..8a731cc0ef1 100644 --- a/src/devices/bus/vcs_ctrl/joybooster.cpp +++ b/src/devices/bus/vcs_ctrl/joybooster.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VCS_JOYSTICK_BOOSTER = &device_creator; +const device_type VCS_JOYSTICK_BOOSTER = device_creator; static INPUT_PORTS_START( vcs_joystick_booster ) diff --git a/src/devices/bus/vcs_ctrl/joystick.cpp b/src/devices/bus/vcs_ctrl/joystick.cpp index 333e632f98f..87ae2f72aa6 100644 --- a/src/devices/bus/vcs_ctrl/joystick.cpp +++ b/src/devices/bus/vcs_ctrl/joystick.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VCS_JOYSTICK = &device_creator; +const device_type VCS_JOYSTICK = device_creator; static INPUT_PORTS_START( vcs_joystick ) diff --git a/src/devices/bus/vcs_ctrl/keypad.cpp b/src/devices/bus/vcs_ctrl/keypad.cpp index 8054f40b4b8..7c8b0f0104a 100644 --- a/src/devices/bus/vcs_ctrl/keypad.cpp +++ b/src/devices/bus/vcs_ctrl/keypad.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VCS_KEYPAD = &device_creator; +const device_type VCS_KEYPAD = device_creator; static INPUT_PORTS_START( vcs_keypad ) diff --git a/src/devices/bus/vcs_ctrl/lightpen.cpp b/src/devices/bus/vcs_ctrl/lightpen.cpp index ab131678948..fe129a9fe5c 100644 --- a/src/devices/bus/vcs_ctrl/lightpen.cpp +++ b/src/devices/bus/vcs_ctrl/lightpen.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VCS_LIGHTPEN = &device_creator; +const device_type VCS_LIGHTPEN = device_creator; INPUT_CHANGED_MEMBER( vcs_lightpen_device::trigger ) diff --git a/src/devices/bus/vcs_ctrl/paddles.cpp b/src/devices/bus/vcs_ctrl/paddles.cpp index d9eb99495ad..17ee8c854eb 100644 --- a/src/devices/bus/vcs_ctrl/paddles.cpp +++ b/src/devices/bus/vcs_ctrl/paddles.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VCS_PADDLES = &device_creator; +const device_type VCS_PADDLES = device_creator; static INPUT_PORTS_START( vcs_paddles ) diff --git a/src/devices/bus/vcs_ctrl/wheel.cpp b/src/devices/bus/vcs_ctrl/wheel.cpp index 2b0041123bc..2bff2cb5698 100644 --- a/src/devices/bus/vcs_ctrl/wheel.cpp +++ b/src/devices/bus/vcs_ctrl/wheel.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VCS_WHEEL = &device_creator; +const device_type VCS_WHEEL = device_creator; static INPUT_PORTS_START( vcs_wheel ) diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp index 44c4cd23c40..e4f53eb8e1d 100644 --- a/src/devices/bus/vectrex/rom.cpp +++ b/src/devices/bus/vectrex/rom.cpp @@ -20,9 +20,9 @@ // vectrex_rom_device - constructor //------------------------------------------------- -const device_type VECTREX_ROM_STD = &device_creator; -const device_type VECTREX_ROM_64K = &device_creator; -const device_type VECTREX_ROM_SRAM = &device_creator; +const device_type VECTREX_ROM_STD = device_creator; +const device_type VECTREX_ROM_64K = device_creator; +const device_type VECTREX_ROM_SRAM = device_creator; vectrex_rom_device::vectrex_rom_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) diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp index 99ad846fd4c..a992b59c505 100644 --- a/src/devices/bus/vectrex/slot.cpp +++ b/src/devices/bus/vectrex/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VECTREX_CART_SLOT = &device_creator; +const device_type VECTREX_CART_SLOT = device_creator; //************************************************************************** // Vectrex Cartridges Interface diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp index cf8388d18e2..76f33da4721 100644 --- a/src/devices/bus/vic10/exp.cpp +++ b/src/devices/bus/vic10/exp.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC10_EXPANSION_SLOT = &device_creator; +const device_type VIC10_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/vic10/std.cpp b/src/devices/bus/vic10/std.cpp index 22b7eddd59e..28d9530494f 100644 --- a/src/devices/bus/vic10/std.cpp +++ b/src/devices/bus/vic10/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC10_STD = &device_creator; +const device_type VIC10_STD = device_creator; diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp index 2e7ebe550e9..ede850ed5be 100644 --- a/src/devices/bus/vic20/4cga.cpp +++ b/src/devices/bus/vic20/4cga.cpp @@ -18,7 +18,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64_4CGA = &device_creator; +const device_type C64_4CGA = device_creator; static INPUT_PORTS_START( c64_4player ) diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp index feacc8546c4..3757c2e0c92 100644 --- a/src/devices/bus/vic20/exp.cpp +++ b/src/devices/bus/vic20/exp.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC20_EXPANSION_SLOT = &device_creator; +const device_type VIC20_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp index 3c67cd15643..dbe03de0183 100644 --- a/src/devices/bus/vic20/fe3.cpp +++ b/src/devices/bus/vic20/fe3.cpp @@ -56,7 +56,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC20_FE3 = &device_creator; +const device_type VIC20_FE3 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp index ce7edf6e3b7..7186e6b405c 100644 --- a/src/devices/bus/vic20/megacart.cpp +++ b/src/devices/bus/vic20/megacart.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC20_MEGACART = &device_creator; +const device_type VIC20_MEGACART = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp index de443783f7d..102c18bae8f 100644 --- a/src/devices/bus/vic20/speakeasy.cpp +++ b/src/devices/bus/vic20/speakeasy.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "speakeasy.h" +#include "speaker.h" + //************************************************************************** @@ -24,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC20_SPEAKEASY = &device_creator; +const device_type VIC20_SPEAKEASY = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp index 0eb21db38a1..26de8b6ef70 100644 --- a/src/devices/bus/vic20/std.cpp +++ b/src/devices/bus/vic20/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC20_STD = &device_creator; +const device_type VIC20_STD = device_creator; diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp index 1ef4711dab2..f2b2ec91219 100644 --- a/src/devices/bus/vic20/vic1010.cpp +++ b/src/devices/bus/vic20/vic1010.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1010 = &device_creator; +const device_type VIC1010 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp index b0792a09a48..5187fcdbf3a 100644 --- a/src/devices/bus/vic20/vic1011.cpp +++ b/src/devices/bus/vic20/vic1011.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1011 = &device_creator; +const device_type VIC1011 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp index cd384bbd143..0d9ec595347 100644 --- a/src/devices/bus/vic20/vic1110.cpp +++ b/src/devices/bus/vic20/vic1110.cpp @@ -28,7 +28,7 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1110 = &device_creator; +const device_type VIC1110 = device_creator; diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp index bf26f2fe479..8d6b0268429 100644 --- a/src/devices/bus/vic20/vic1111.cpp +++ b/src/devices/bus/vic20/vic1111.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1111 = &device_creator; +const device_type VIC1111 = device_creator; diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp index 6006ecc0e21..070da86db75 100644 --- a/src/devices/bus/vic20/vic1112.cpp +++ b/src/devices/bus/vic20/vic1112.cpp @@ -24,7 +24,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1112 = &device_creator; +const device_type VIC1112 = device_creator; WRITE_LINE_MEMBER( vic1112_device::via0_irq_w ) diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp index 039c5b25699..b28cb42aa78 100644 --- a/src/devices/bus/vic20/vic1210.cpp +++ b/src/devices/bus/vic20/vic1210.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC1210 = &device_creator; +const device_type VIC1210 = device_creator; diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp index a11b9ba931c..c117263152e 100644 --- a/src/devices/bus/vic20/videopak.cpp +++ b/src/devices/bus/vic20/videopak.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "videopak.h" +#include "screen.h" + //************************************************************************** @@ -28,7 +30,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIC20_VIDEO_PAK = &device_creator; +const device_type VIC20_VIDEO_PAK = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp index a91c6a6a88e..87d9e536ba3 100644 --- a/src/devices/bus/vidbrain/exp.cpp +++ b/src/devices/bus/vidbrain/exp.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIDEOBRAIN_EXPANSION_SLOT = &device_creator; +const device_type VIDEOBRAIN_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/vidbrain/money_minder.cpp b/src/devices/bus/vidbrain/money_minder.cpp index 6a78467a5b9..eb7e7b2d6c4 100644 --- a/src/devices/bus/vidbrain/money_minder.cpp +++ b/src/devices/bus/vidbrain/money_minder.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VB_MONEY_MINDER = &device_creator; +const device_type VB_MONEY_MINDER = device_creator; diff --git a/src/devices/bus/vidbrain/std.cpp b/src/devices/bus/vidbrain/std.cpp index de08b2c1d90..c8bbf1fbaae 100644 --- a/src/devices/bus/vidbrain/std.cpp +++ b/src/devices/bus/vidbrain/std.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VB_STD = &device_creator; +const device_type VB_STD = device_creator; diff --git a/src/devices/bus/vidbrain/timeshare.cpp b/src/devices/bus/vidbrain/timeshare.cpp index 243e8618573..00b47a194a1 100644 --- a/src/devices/bus/vidbrain/timeshare.cpp +++ b/src/devices/bus/vidbrain/timeshare.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VB_TIMESHARE = &device_creator; +const device_type VB_TIMESHARE = device_creator; diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp index 387fcf96c0d..9e2cb2c7ef1 100644 --- a/src/devices/bus/vip/byteio.cpp +++ b/src/devices/bus/vip/byteio.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VIP_BYTEIO_PORT = &device_creator; +const device_type VIP_BYTEIO_PORT = device_creator; diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp index ca0ac0dca3f..f5dc4bdd070 100644 --- a/src/devices/bus/vip/exp.cpp +++ b/src/devices/bus/vip/exp.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VIP_EXPANSION_SLOT = &device_creator; +const device_type VIP_EXPANSION_SLOT = device_creator; diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index a0bd16b97d8..23e49972909 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -17,6 +17,8 @@ #include "emu.h" #include "vp550.h" +#include "speaker.h" + //************************************************************************** @@ -41,7 +43,7 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type VP550 = &device_creator; +const device_type VP550 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp index 10f944f69ff..0aaa2b7f256 100644 --- a/src/devices/bus/vip/vp570.cpp +++ b/src/devices/bus/vip/vp570.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VP570 = &device_creator; +const device_type VP570 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp index 8e28192f128..3c498a7ae83 100644 --- a/src/devices/bus/vip/vp575.cpp +++ b/src/devices/bus/vip/vp575.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VP575 = &device_creator; +const device_type VP575 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp index 234ff8f0ea9..84f89fba5ef 100644 --- a/src/devices/bus/vip/vp585.cpp +++ b/src/devices/bus/vip/vp585.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VP585 = &device_creator; +const device_type VP585 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp index b139a1456b2..3434c11fee7 100644 --- a/src/devices/bus/vip/vp590.cpp +++ b/src/devices/bus/vip/vp590.cpp @@ -26,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VP590 = &device_creator; +const device_type VP590 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp index 535c533b1d5..2c99188c79f 100644 --- a/src/devices/bus/vip/vp595.cpp +++ b/src/devices/bus/vip/vp595.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "vp595.h" +#include "speaker.h" + //************************************************************************** @@ -24,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VP595 = &device_creator; +const device_type VP595 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp index 2eee62c326f..b90adb56425 100644 --- a/src/devices/bus/vip/vp620.cpp +++ b/src/devices/bus/vip/vp620.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VP620 = &device_creator; +const device_type VP620 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp index 7c6080a6a7c..80e4085b458 100644 --- a/src/devices/bus/vip/vp700.cpp +++ b/src/devices/bus/vip/vp700.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type VP700 = &device_creator; +const device_type VP700 = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/vme/vme.cpp b/src/devices/bus/vme/vme.cpp index 96748316508..c4245ebc0a5 100644 --- a/src/devices/bus/vme/vme.cpp +++ b/src/devices/bus/vme/vme.cpp @@ -98,7 +98,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VME_SLOT = &device_creator; +const device_type VME_SLOT = device_creator; //------------------------------------------------- // vme_slot_device - constructor @@ -210,7 +210,7 @@ SLOT_INTERFACE_END // VME device P1 // -const device_type VME = &device_creator; +const device_type VME = device_creator; // static_set_cputag - used to be able to lookup the CPU owning this VME bus void vme_device::static_set_cputag(device_t &device, const char *tag) diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index aabd7184918..67eb8b033f6 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -213,13 +213,13 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VME_FCCPU20 = &device_creator; -const device_type VME_FCCPU21S = &device_creator; -const device_type VME_FCCPU21 = &device_creator; -const device_type VME_FCCPU21A = &device_creator; -const device_type VME_FCCPU21YA = &device_creator; -const device_type VME_FCCPU21B = &device_creator; -const device_type VME_FCCPU21YB = &device_creator; +const device_type VME_FCCPU20 = device_creator; +const device_type VME_FCCPU21S = device_creator; +const device_type VME_FCCPU21 = device_creator; +const device_type VME_FCCPU21A = device_creator; +const device_type VME_FCCPU21YA = device_creator; +const device_type VME_FCCPU21B = device_creator; +const device_type VME_FCCPU21YB = device_creator; #define CLOCK50 XTAL_50MHz /* HCJ */ #define CLOCK40 XTAL_40MHz /* HCJ */ diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp index 75d325f2c81..d6423822a25 100644 --- a/src/devices/bus/vme/vme_fcisio.cpp +++ b/src/devices/bus/vme/vme_fcisio.cpp @@ -161,7 +161,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VME_FCISIO1 = &device_creator; +const device_type VME_FCISIO1 = device_creator; #define CPU_CLOCK XTAL_20MHz /* HCJ */ #define DUSCC_CLOCK XTAL_14_7456MHz /* HCJ */ diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp index 96e8548a86f..3d1be933dff 100644 --- a/src/devices/bus/vme/vme_fcscsi.cpp +++ b/src/devices/bus/vme/vme_fcscsi.cpp @@ -179,7 +179,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VME_FCSCSI1 = &device_creator; +const device_type VME_FCSCSI1 = device_creator; #define CPU_CRYSTAL XTAL_20MHz /* Jauch */ #define PIT_CRYSTAL XTAL_16MHz /* Jauch */ diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp index b4caeb65ab9..d2fc6d07836 100644 --- a/src/devices/bus/vme/vme_mvme350.cpp +++ b/src/devices/bus/vme/vme_mvme350.cpp @@ -158,7 +158,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VME_MVME350 = &device_creator; +const device_type VME_MVME350 = device_creator; #define MVME350_CPU_TAG "mvme350_cpu" #define MVME350_ROM "mvme350_rom" diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp index 9b3813ee488..24eac1dfc9d 100644 --- a/src/devices/bus/vme/vme_mzr8105.cpp +++ b/src/devices/bus/vme/vme_mzr8105.cpp @@ -30,7 +30,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VME_MZR8105 = &device_creator; +const device_type VME_MZR8105 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp index 924b1844556..a9d85736661 100644 --- a/src/devices/bus/vme/vme_mzr8300.cpp +++ b/src/devices/bus/vme/vme_mzr8300.cpp @@ -113,7 +113,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type VME_MZR8300 = &device_creator; +const device_type VME_MZR8300 = device_creator; /* These values are borrowed just to get the terminal going and should be replaced * once a proper serial board hardware (ie MZ 8300) is found and emulated. */ diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp index 17796071922..178b35137ab 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.cpp +++ b/src/devices/bus/vtech/ioexp/ioexp.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type IOEXP_SLOT = &device_creator; +const device_type IOEXP_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp index c2de69f455f..f73bf722be7 100644 --- a/src/devices/bus/vtech/ioexp/joystick.cpp +++ b/src/devices/bus/vtech/ioexp/joystick.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type JOYSTICK_INTERFACE = &device_creator; +const device_type JOYSTICK_INTERFACE = device_creator; //------------------------------------------------- // input_ports - device-specific input ports diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index dfc971bb914..974d8c3818c 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PRINTER_INTERFACE = &device_creator; +const device_type PRINTER_INTERFACE = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp index 0aca11479a0..355194df583 100644 --- a/src/devices/bus/vtech/memexp/floppy.cpp +++ b/src/devices/bus/vtech/memexp/floppy.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type FLOPPY_CONTROLLER = &device_creator; +const device_type FLOPPY_CONTROLLER = device_creator; DEVICE_ADDRESS_MAP_START(map, 8, floppy_controller_device) AM_RANGE(0, 0) AM_WRITE(latch_w) diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp index e568c3e5a02..369403aa1c4 100644 --- a/src/devices/bus/vtech/memexp/memexp.cpp +++ b/src/devices/bus/vtech/memexp/memexp.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MEMEXP_SLOT = &device_creator; +const device_type MEMEXP_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp index db5e07a3348..96fc47bc52c 100644 --- a/src/devices/bus/vtech/memexp/memory.cpp +++ b/src/devices/bus/vtech/memexp/memory.cpp @@ -14,10 +14,10 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type LASER110_16K = &device_creator; -const device_type LASER210_16K = &device_creator; -const device_type LASER310_16K = &device_creator; -const device_type LASER_64K = &device_creator; +const device_type LASER110_16K = device_creator; +const device_type LASER210_16K = device_creator; +const device_type LASER310_16K = device_creator; +const device_type LASER_64K = device_creator; //************************************************************************** diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp index 7dc5c5a5362..550eb8f54b7 100644 --- a/src/devices/bus/vtech/memexp/rs232.cpp +++ b/src/devices/bus/vtech/memexp/rs232.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type RS232_INTERFACE = &device_creator; +const device_type RS232_INTERFACE = device_creator; //------------------------------------------------- // rom_region - device-specific ROM region diff --git a/src/devices/bus/vtech/memexp/rtty.cpp b/src/devices/bus/vtech/memexp/rtty.cpp index f96fc3e5ff3..d6a1278d577 100644 --- a/src/devices/bus/vtech/memexp/rtty.cpp +++ b/src/devices/bus/vtech/memexp/rtty.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type RTTY_INTERFACE = &device_creator; +const device_type RTTY_INTERFACE = device_creator; //------------------------------------------------- // rom_region - device-specific ROM region diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp index d3a1de653c2..03df6982a61 100644 --- a/src/devices/bus/vtech/memexp/wordpro.cpp +++ b/src/devices/bus/vtech/memexp/wordpro.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WORDPRO = &device_creator; +const device_type WORDPRO = device_creator; //------------------------------------------------- // rom_region - device-specific ROM region diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp index 0e71cd2e3db..06cb5372f9f 100644 --- a/src/devices/bus/wangpc/emb.cpp +++ b/src/devices/bus/wangpc/emb.cpp @@ -32,7 +32,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_EMB = &device_creator; +const device_type WANGPC_EMB = device_creator; diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp index 72610644ffd..3bd7397001d 100644 --- a/src/devices/bus/wangpc/lic.cpp +++ b/src/devices/bus/wangpc/lic.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_LIC = &device_creator; +const device_type WANGPC_LIC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index 0700e7ebc70..45c3ecf1834 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -19,6 +19,8 @@ #include "emu.h" #include "lvc.h" +#include "screen.h" + //************************************************************************** @@ -45,7 +47,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_LVC = &device_creator; +const device_type WANGPC_LVC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp index 816c2921431..93fe1f530a3 100644 --- a/src/devices/bus/wangpc/mcc.cpp +++ b/src/devices/bus/wangpc/mcc.cpp @@ -48,7 +48,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_MCC = &device_creator; +const device_type WANGPC_MCC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp index a76af5b62d4..af95b0695ac 100644 --- a/src/devices/bus/wangpc/mvc.cpp +++ b/src/devices/bus/wangpc/mvc.cpp @@ -18,6 +18,8 @@ #include "emu.h" #include "mvc.h" +#include "screen.h" + //************************************************************************** @@ -60,7 +62,7 @@ static const rgb_t PALETTE_MVC[] = // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_MVC = &device_creator; +const device_type WANGPC_MVC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp index 925c15d67d7..1e59c870b68 100644 --- a/src/devices/bus/wangpc/rtc.cpp +++ b/src/devices/bus/wangpc/rtc.cpp @@ -29,7 +29,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_RTC = &device_creator; +const device_type WANGPC_RTC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index a672a1b8f84..31dea52508c 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -17,6 +17,8 @@ #include "emu.h" #include "tig.h" +#include "screen.h" + //************************************************************************** @@ -53,7 +55,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_TIG = &device_creator; +const device_type WANGPC_TIG = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp index 87801b57823..7d387ecec15 100644 --- a/src/devices/bus/wangpc/wangpc.cpp +++ b/src/devices/bus/wangpc/wangpc.cpp @@ -14,8 +14,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_BUS = &device_creator; -const device_type WANGPC_BUS_SLOT = &device_creator; +const device_type WANGPC_BUS = device_creator; +const device_type WANGPC_BUS_SLOT = device_creator; diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index 43d70269fea..4c6326c85d3 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -31,7 +31,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_WDC = &device_creator; +const device_type WANGPC_WDC = device_creator; //------------------------------------------------- diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index e95585dd08f..b9594f84ac1 100644 --- a/src/devices/bus/wswan/rom.cpp +++ b/src/devices/bus/wswan/rom.cpp @@ -21,9 +21,9 @@ enum // ws_rom_device - constructor //------------------------------------------------- -const device_type WS_ROM_STD = &device_creator; -const device_type WS_ROM_SRAM = &device_creator; -const device_type WS_ROM_EEPROM = &device_creator; +const device_type WS_ROM_STD = device_creator; +const device_type WS_ROM_SRAM = device_creator; +const device_type WS_ROM_EEPROM = device_creator; ws_rom_device::ws_rom_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) : diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp index 0472cfa2ad5..b5d35b92e9f 100644 --- a/src/devices/bus/wswan/slot.cpp +++ b/src/devices/bus/wswan/slot.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type WS_CART_SLOT = &device_creator; +const device_type WS_CART_SLOT = device_creator; //************************************************************************** // Wonderswan Cartridges Interface diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp index e8e2c8b8199..eb58464d92f 100644 --- a/src/devices/bus/x68k/x68k_neptunex.cpp +++ b/src/devices/bus/x68k/x68k_neptunex.cpp @@ -13,7 +13,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type X68K_NEPTUNEX = &device_creator; +const device_type X68K_NEPTUNEX = device_creator; // device machine config static MACHINE_CONFIG_FRAGMENT( x68k_neptunex ) diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp index 2036fb414e4..049a990ff1f 100644 --- a/src/devices/bus/x68k/x68k_scsiext.cpp +++ b/src/devices/bus/x68k/x68k_scsiext.cpp @@ -18,7 +18,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type X68K_SCSIEXT = &device_creator; +const device_type X68K_SCSIEXT = device_creator; //------------------------------------------------- // rom_region - device-specific ROM region diff --git a/src/devices/bus/x68k/x68kexp.cpp b/src/devices/bus/x68k/x68kexp.cpp index 94484ac3ea1..c187ad0a26d 100644 --- a/src/devices/bus/x68k/x68kexp.cpp +++ b/src/devices/bus/x68k/x68kexp.cpp @@ -11,7 +11,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type X68K_EXPANSION_SLOT = &device_creator; +const device_type X68K_EXPANSION_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp index ea6337a9c2f..752ec937eb9 100644 --- a/src/devices/bus/z88/flash.cpp +++ b/src/devices/bus/z88/flash.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type Z88_1024K_FLASH = &device_creator; +const device_type Z88_1024K_FLASH = device_creator; //------------------------------------------------- // MACHINE_CONFIG_FRAGMENT( z88_flash ) diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp index 08f70d46b16..22852bf62b3 100644 --- a/src/devices/bus/z88/ram.cpp +++ b/src/devices/bus/z88/ram.cpp @@ -19,10 +19,10 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type Z88_32K_RAM = &device_creator; -const device_type Z88_128K_RAM = &device_creator; -const device_type Z88_512K_RAM = &device_creator; -const device_type Z88_1024K_RAM = &device_creator; +const device_type Z88_32K_RAM = device_creator; +const device_type Z88_128K_RAM = device_creator; +const device_type Z88_512K_RAM = device_creator; +const device_type Z88_1024K_RAM = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp index 6ec8fb0b773..4ac53bba045 100644 --- a/src/devices/bus/z88/rom.cpp +++ b/src/devices/bus/z88/rom.cpp @@ -19,9 +19,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type Z88_32K_ROM = &device_creator; -const device_type Z88_128K_ROM = &device_creator; -const device_type Z88_256K_ROM = &device_creator; +const device_type Z88_32K_ROM = device_creator; +const device_type Z88_128K_ROM = device_creator; +const device_type Z88_256K_ROM = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp index c9965987a92..8148772ad51 100644 --- a/src/devices/bus/z88/z88.cpp +++ b/src/devices/bus/z88/z88.cpp @@ -22,7 +22,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type Z88CART_SLOT = &device_creator; +const device_type Z88CART_SLOT = device_creator; //************************************************************************** diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp index 8d17550efa0..a405d4dda69 100644 --- a/src/devices/cpu/8x300/8x300.cpp +++ b/src/devices/cpu/8x300/8x300.cpp @@ -37,7 +37,7 @@ #define DST_LATCH do { if(DST_IS_RIGHT_BANK) m_right_IV = READPORT(m_IVR+0x100); else m_left_IV = READPORT(m_IVL); } while (0) #define SET_OVF do { if(result & 0xff00) m_OVF = 1; else m_OVF = 0; } while (0) -const device_type N8X300 = &device_creator; +const device_type N8X300 = device_creator; n8x300_cpu_device::n8x300_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp index edd7cbd9cd3..88670a0bf5e 100644 --- a/src/devices/cpu/adsp2100/adsp2100.cpp +++ b/src/devices/cpu/adsp2100/adsp2100.cpp @@ -103,12 +103,12 @@ // device type definitions -const device_type ADSP2100 = &device_creator; -const device_type ADSP2101 = &device_creator; -const device_type ADSP2104 = &device_creator; -const device_type ADSP2105 = &device_creator; -const device_type ADSP2115 = &device_creator; -const device_type ADSP2181 = &device_creator; +const device_type ADSP2100 = device_creator; +const device_type ADSP2101 = device_creator; +const device_type ADSP2104 = device_creator; +const device_type ADSP2105 = device_creator; +const device_type ADSP2115 = device_creator; +const device_type ADSP2181 = device_creator; //************************************************************************** diff --git a/src/devices/cpu/alph8201/alph8201.cpp b/src/devices/cpu/alph8201/alph8201.cpp index e06b05f39a2..81ac62696b7 100644 --- a/src/devices/cpu/alph8201/alph8201.cpp +++ b/src/devices/cpu/alph8201/alph8201.cpp @@ -165,8 +165,8 @@ Timming #include "alph8201.h" -const device_type ALPHA8201L = &device_creator; -const device_type ALPHA8301L = &device_creator; +const device_type ALPHA8201L = device_creator; +const device_type ALPHA8301L = device_creator; /* instruction cycle count */ diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp index ad88171abd2..56b2e89ebb3 100644 --- a/src/devices/cpu/alto2/alto2cpu.cpp +++ b/src/devices/cpu/alto2/alto2cpu.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ALTO2 = &device_creator; +const device_type ALTO2 = device_creator; //************************************************************************** // LOGGING AND DEBUGGING diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h index 56133711001..58dbefd0984 100644 --- a/src/devices/cpu/alto2/alto2cpu.h +++ b/src/devices/cpu/alto2/alto2cpu.h @@ -5,14 +5,15 @@ * Xerox AltoII CPU core interface * *****************************************************************************/ -#ifndef _CPU_ALTO2_H_ -#define _CPU_ALTO2_H_ +#ifndef MAME_DEVICES_CPU_ALTO2_H +#define MAME_DEVICES_CPU_ALTO2_H -#define ALTO2_TAG "alto2" +#include "machine/diablo_hd.h" +#include "sound/spkrdev.h" #include "debugger.h" -#include "sound/speaker.h" -#include "machine/diablo_hd.h" + +#define ALTO2_TAG "alto2" /** * \brief AltoII register names @@ -938,5 +939,4 @@ private: extern const device_type ALTO2; - -#endif /* _CPU_ALTO2_H_ */ +#endif // MAME_DEVICES_CPU_ALTO2_H diff --git a/src/devices/cpu/am29000/am29000.cpp b/src/devices/cpu/am29000/am29000.cpp index fbc5a231ac3..8960629ea9e 100644 --- a/src/devices/cpu/am29000/am29000.cpp +++ b/src/devices/cpu/am29000/am29000.cpp @@ -19,7 +19,7 @@ #include "am29000.h" -const device_type AM29000 = &device_creator; +const device_type AM29000 = device_creator; /*************************************************************************** diff --git a/src/devices/cpu/amis2000/amis2000.cpp b/src/devices/cpu/amis2000/amis2000.cpp index 0dde5fed2ee..5d1436d2fe6 100644 --- a/src/devices/cpu/amis2000/amis2000.cpp +++ b/src/devices/cpu/amis2000/amis2000.cpp @@ -26,11 +26,11 @@ // S2000 is the most basic one, 64 nibbles internal RAM and 1KB internal ROM // S2150 increased RAM to 80 nibbles and ROM to 1.5KB // high-voltage output versions of these chips (S2000A and S2150A) are identical overall -const device_type AMI_S2000 = &device_creator; -const device_type AMI_S2150 = &device_creator; +const device_type AMI_S2000 = device_creator; +const device_type AMI_S2150 = device_creator; // S2152 is an extension to S2150, removing the K pins and adding a better timer -const device_type AMI_S2152 = &device_creator; +const device_type AMI_S2152 = device_creator; // internal memory maps diff --git a/src/devices/cpu/apexc/apexc.cpp b/src/devices/cpu/apexc/apexc.cpp index c15f1210002..46ead8310c1 100644 --- a/src/devices/cpu/apexc/apexc.cpp +++ b/src/devices/cpu/apexc/apexc.cpp @@ -330,7 +330,7 @@ field: X address D Function Y address D (part 2) #include "apexc.h" -const device_type APEXC = &device_creator; +const device_type APEXC = device_creator; /* decrement ICount by n */ diff --git a/src/devices/cpu/arc/arc.cpp b/src/devices/cpu/arc/arc.cpp index 71c55b674a2..c1ebd6f2eff 100644 --- a/src/devices/cpu/arc/arc.cpp +++ b/src/devices/cpu/arc/arc.cpp @@ -14,7 +14,7 @@ #include "arc.h" -const device_type ARC = &device_creator; +const device_type ARC = device_creator; arc_device::arc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/arcompact/arcompact.cpp b/src/devices/cpu/arcompact/arcompact.cpp index cd44d6b5681..d4fdf778088 100644 --- a/src/devices/cpu/arcompact/arcompact.cpp +++ b/src/devices/cpu/arcompact/arcompact.cpp @@ -24,7 +24,7 @@ #include "arcompact_common.h" -const device_type ARCA5 = &device_creator; +const device_type ARCA5 = device_creator; READ32_MEMBER( arcompact_device::arcompact_auxreg002_LPSTART_r) { return m_LP_START&0xfffffffe; } diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp index 884b22896cd..84dde513827 100644 --- a/src/devices/cpu/arm/arm.cpp +++ b/src/devices/cpu/arm/arm.cpp @@ -224,8 +224,8 @@ enum /***************************************************************************/ -const device_type ARM = &device_creator; -const device_type ARM_BE = &device_creator; +const device_type ARM = device_creator; +const device_type ARM_BE = device_creator; arm_cpu_device::arm_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp index 52e148a92ac..4933ea18b52 100644 --- a/src/devices/cpu/arm7/arm7.cpp +++ b/src/devices/cpu/arm7/arm7.cpp @@ -45,13 +45,13 @@ void (*arm7_coproc_dt_r_callback)(arm_state *arm, uint32_t insn, uint32_t *prn, void (*arm7_coproc_dt_w_callback)(arm_state *arm, uint32_t insn, uint32_t *prn, void (*write32)(arm_state *arm, uint32_t addr, uint32_t data)); -const device_type ARM7 = &device_creator; -const device_type ARM7_BE = &device_creator; -const device_type ARM7500 = &device_creator; -const device_type ARM9 = &device_creator; -const device_type ARM920T = &device_creator; -const device_type PXA255 = &device_creator; -const device_type SA1110 = &device_creator; +const device_type ARM7 = device_creator; +const device_type ARM7_BE = device_creator; +const device_type ARM7500 = device_creator; +const device_type ARM9 = device_creator; +const device_type ARM920T = device_creator; +const device_type PXA255 = device_creator; +const device_type SA1110 = device_creator; arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp index 57b917ab235..d9b21e9d5c1 100644 --- a/src/devices/cpu/arm7/lpc210x.cpp +++ b/src/devices/cpu/arm7/lpc210x.cpp @@ -15,7 +15,7 @@ #include "emu.h" #include "lpc210x.h" -const device_type LPC2103 = &device_creator; +const device_type LPC2103 = device_creator; static ADDRESS_MAP_START( lpc2103_map, AS_PROGRAM, 32, lpc210x_device ) AM_RANGE(0x00000000, 0x00007fff) AM_READWRITE(flash_r, flash_w) // 32kb internal FLASH rom diff --git a/src/devices/cpu/asap/asap.cpp b/src/devices/cpu/asap/asap.cpp index 6e539784ab1..ccf461162d1 100644 --- a/src/devices/cpu/asap/asap.cpp +++ b/src/devices/cpu/asap/asap.cpp @@ -130,7 +130,7 @@ const asap_device::ophandler asap_device::s_conditiontable[16] = //************************************************************************** // device type definition -const device_type ASAP = &device_creator; +const device_type ASAP = device_creator; //------------------------------------------------- // asap_device - constructor diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp index 7ae680fd3b5..a79ae1d06a7 100644 --- a/src/devices/cpu/avr8/avr8.cpp +++ b/src/devices/cpu/avr8/avr8.cpp @@ -567,10 +567,10 @@ enum // DEVICE INTERFACE //************************************************************************** -const device_type ATMEGA88 = &device_creator; -const device_type ATMEGA644 = &device_creator; -const device_type ATMEGA1280 = &device_creator; -const device_type ATMEGA2560 = &device_creator; +const device_type ATMEGA88 = device_creator; +const device_type ATMEGA644 = device_creator; +const device_type ATMEGA1280 = device_creator; +const device_type ATMEGA2560 = device_creator; //************************************************************************** // INTERNAL ADDRESS MAP diff --git a/src/devices/cpu/ccpu/ccpu.cpp b/src/devices/cpu/ccpu/ccpu.cpp index ad9fbedca86..a7742e9b270 100644 --- a/src/devices/cpu/ccpu/ccpu.cpp +++ b/src/devices/cpu/ccpu/ccpu.cpp @@ -15,7 +15,7 @@ #include "ccpu.h" -const device_type CCPU = &device_creator; +const device_type CCPU = device_creator; /*************************************************************************** diff --git a/src/devices/cpu/clipper/clipper.cpp b/src/devices/cpu/clipper/clipper.cpp index e60cad16d71..86093bb4e88 100644 --- a/src/devices/cpu/clipper/clipper.cpp +++ b/src/devices/cpu/clipper/clipper.cpp @@ -28,9 +28,9 @@ #define LOG_INTERRUPT(...) #endif -const device_type CLIPPER_C100 = &device_creator; -const device_type CLIPPER_C300 = &device_creator; -const device_type CLIPPER_C400 = &device_creator; +const device_type CLIPPER_C100 = device_creator; +const device_type CLIPPER_C300 = device_creator; +const device_type CLIPPER_C400 = device_creator; clipper_c100_device::clipper_c100_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : clipper_device(mconfig, CLIPPER_C100, "C100 CLIPPER", tag, owner, clock, "C100", __FILE__) { } diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index 28394aa88f8..757cf0cf21f 100644 --- a/src/devices/cpu/cop400/cop400.cpp +++ b/src/devices/cpu/cop400/cop400.cpp @@ -58,23 +58,23 @@ #include "cop400.h" -const device_type COP401 = &device_creator; -const device_type COP410 = &device_creator; -const device_type COP411 = &device_creator; -const device_type COP402 = &device_creator; -const device_type COP420 = &device_creator; -const device_type COP421 = &device_creator; -const device_type COP422 = &device_creator; -const device_type COP404L = &device_creator; -const device_type COP444L = &device_creator; -const device_type COP445L = &device_creator; -const device_type COP404C = &device_creator; -const device_type COP424C = &device_creator; -const device_type COP425C = &device_creator; -const device_type COP426C = &device_creator; -const device_type COP444C = &device_creator; -const device_type COP445C = &device_creator; -const device_type COP446C = &device_creator; +const device_type COP401 = device_creator; +const device_type COP410 = device_creator; +const device_type COP411 = device_creator; +const device_type COP402 = device_creator; +const device_type COP420 = device_creator; +const device_type COP421 = device_creator; +const device_type COP422 = device_creator; +const device_type COP404L = device_creator; +const device_type COP444L = device_creator; +const device_type COP445L = device_creator; +const device_type COP404C = device_creator; +const device_type COP424C = device_creator; +const device_type COP425C = device_creator; +const device_type COP426C = device_creator; +const device_type COP444C = device_creator; +const device_type COP445C = device_creator; +const device_type COP446C = device_creator; diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp index 0e8c3de3f3c..913b71cbd31 100644 --- a/src/devices/cpu/cosmac/cosmac.cpp +++ b/src/devices/cpu/cosmac/cosmac.cpp @@ -260,8 +260,8 @@ cosmac_device::ophandler cdp1802_device::get_ophandler(uint8_t opcode) //************************************************************************** // device type definition -const device_type CDP1801 = &device_creator; -const device_type CDP1802 = &device_creator; +const device_type CDP1801 = device_creator; +const device_type CDP1802 = device_creator; //------------------------------------------------- diff --git a/src/devices/cpu/cp1610/cp1610.cpp b/src/devices/cpu/cp1610/cp1610.cpp index b2b923fbc8f..60ba26c1e36 100644 --- a/src/devices/cpu/cp1610/cp1610.cpp +++ b/src/devices/cpu/cp1610/cp1610.cpp @@ -18,7 +18,7 @@ #include "cp1610.h" -const device_type CP1610 = &device_creator; +const device_type CP1610 = device_creator; #define S 0x80 diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp index a2216a1025a..0ddb88e974d 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp @@ -70,9 +70,9 @@ enum alu_dst ***************************************************************************/ -const device_type CQUESTSND = &device_creator; -const device_type CQUESTROT = &device_creator; -const device_type CQUESTLIN = &device_creator; +const device_type CQUESTSND = device_creator; +const device_type CQUESTROT = device_creator; +const device_type CQUESTLIN = device_creator; cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp index 6baaa215e73..e9b6444b162 100644 --- a/src/devices/cpu/dsp16/dsp16.cpp +++ b/src/devices/cpu/dsp16/dsp16.cpp @@ -27,7 +27,7 @@ //************************************************************************** // device type definition -const device_type DSP16 = &device_creator; +const device_type DSP16 = device_creator; //------------------------------------------------- diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp index ca4a757ee41..18a50dc0b26 100644 --- a/src/devices/cpu/dsp32/dsp32.cpp +++ b/src/devices/cpu/dsp32/dsp32.cpp @@ -136,7 +136,7 @@ // DEVICE INTERFACE //************************************************************************** -const device_type DSP32C = &device_creator; +const device_type DSP32C = device_creator; //------------------------------------------------- // dsp32c_device - constructor diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp index 47d090c6ec0..f75d720c2f7 100644 --- a/src/devices/cpu/dsp56k/dsp56k.cpp +++ b/src/devices/cpu/dsp56k/dsp56k.cpp @@ -102,7 +102,7 @@ enum }; -const device_type DSP56156 = &device_creator; +const device_type DSP56156 = device_creator; /**************************************************************************** diff --git a/src/devices/cpu/e0c6200/e0c6s46.cpp b/src/devices/cpu/e0c6200/e0c6s46.cpp index bc82ebd5c25..36e3ded51fa 100644 --- a/src/devices/cpu/e0c6200/e0c6s46.cpp +++ b/src/devices/cpu/e0c6200/e0c6s46.cpp @@ -28,7 +28,7 @@ enum IRQREG_INPUT1 }; -const device_type E0C6S46 = &device_creator; +const device_type E0C6S46 = device_creator; // internal memory maps diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp index 7e3c0b54665..f59b522a365 100644 --- a/src/devices/cpu/e132xs/e132xs.cpp +++ b/src/devices/cpu/e132xs/e132xs.cpp @@ -4964,17 +4964,17 @@ void hyperstone_device::execute_run() } while( m_icount > 0 ); } -const device_type E116T = &device_creator; -const device_type E116XT = &device_creator; -const device_type E116XS = &device_creator; -const device_type E116XSR = &device_creator; -const device_type E132N = &device_creator; -const device_type E132T = &device_creator; -const device_type E132XN = &device_creator; -const device_type E132XT = &device_creator; -const device_type E132XS = &device_creator; -const device_type E132XSR = &device_creator; -const device_type GMS30C2116 = &device_creator; -const device_type GMS30C2132 = &device_creator; -const device_type GMS30C2216 = &device_creator; -const device_type GMS30C2232 = &device_creator; +const device_type E116T = device_creator; +const device_type E116XT = device_creator; +const device_type E116XS = device_creator; +const device_type E116XSR = device_creator; +const device_type E132N = device_creator; +const device_type E132T = device_creator; +const device_type E132XN = device_creator; +const device_type E132XT = device_creator; +const device_type E132XS = device_creator; +const device_type E132XSR = device_creator; +const device_type GMS30C2116 = device_creator; +const device_type GMS30C2132 = device_creator; +const device_type GMS30C2216 = device_creator; +const device_type GMS30C2232 = device_creator; diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp index 8113c5c3bd9..43cf3ecb702 100644 --- a/src/devices/cpu/es5510/es5510.cpp +++ b/src/devices/cpu/es5510/es5510.cpp @@ -54,7 +54,7 @@ static int exec_cc = 0; #define LOG_EXEC(x) #endif -const device_type ES5510 = &device_creator; +const device_type ES5510 = device_creator; #define FLAG_N (1 << 7) #define FLAG_C (1 << 6) diff --git a/src/devices/cpu/esrip/esrip.cpp b/src/devices/cpu/esrip/esrip.cpp index f59f4d46bdf..2780a3a50e3 100644 --- a/src/devices/cpu/esrip/esrip.cpp +++ b/src/devices/cpu/esrip/esrip.cpp @@ -10,9 +10,11 @@ ***************************************************************************/ #include "emu.h" -#include "debugger.h" #include "esrip.h" +#include "debugger.h" +#include "screen.h" + /*************************************************************************** CONSTANTS @@ -1685,7 +1687,7 @@ void esrip_device::nop(uint16_t inst) // DEVICE INTERFACE //************************************************************************** -const device_type ESRIP = &device_creator; +const device_type ESRIP = device_creator; //------------------------------------------------- // esrip_device - constructor diff --git a/src/devices/cpu/f8/f8.cpp b/src/devices/cpu/f8/f8.cpp index 2c49b8969b8..8df6d500366 100644 --- a/src/devices/cpu/f8/f8.cpp +++ b/src/devices/cpu/f8/f8.cpp @@ -56,7 +56,7 @@ } -const device_type F8 = &device_creator; +const device_type F8 = device_creator; f8_cpu_device::f8_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/g65816/g65816.cpp b/src/devices/cpu/g65816/g65816.cpp index 9f2689b93f9..7e0548e7c0d 100644 --- a/src/devices/cpu/g65816/g65816.cpp +++ b/src/devices/cpu/g65816/g65816.cpp @@ -93,8 +93,8 @@ TODO general: #include "g65816.h" -const device_type G65816 = &device_creator; -const device_type _5A22 = &device_creator<_5a22_device>; +const device_type G65816 = device_creator; +const device_type _5A22 = device_creator<_5a22_device>; g65816_device::g65816_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp index 8a4c7aa7bca..87a3f2c8dd1 100644 --- a/src/devices/cpu/h6280/h6280.cpp +++ b/src/devices/cpu/h6280/h6280.cpp @@ -153,7 +153,7 @@ enum // DEVICE INTERFACE //************************************************************************** -const device_type H6280 = &device_creator; +const device_type H6280 = device_creator; //------------------------------------------------- // h6280_device - constructor diff --git a/src/devices/cpu/h8/h83002.cpp b/src/devices/cpu/h8/h83002.cpp index da976c31052..cc2ca77860e 100644 --- a/src/devices/cpu/h8/h83002.cpp +++ b/src/devices/cpu/h8/h83002.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "h83002.h" -const device_type H83002 = &device_creator; +const device_type H83002 = device_creator; h83002_device::h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : h8h_device(mconfig, H83002, "H8/3002", tag, owner, clock, "h83002", __FILE__, address_map_delegate(FUNC(h83002_device::map), this)), diff --git a/src/devices/cpu/h8/h83006.cpp b/src/devices/cpu/h8/h83006.cpp index fd0ed7cc9dc..1c12b4b8a89 100644 --- a/src/devices/cpu/h8/h83006.cpp +++ b/src/devices/cpu/h8/h83006.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "h83006.h" -const device_type H83006 = &device_creator; -const device_type H83007 = &device_creator; +const device_type H83006 = device_creator; +const device_type H83007 = device_creator; h83006_device::h83006_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) : diff --git a/src/devices/cpu/h8/h83008.cpp b/src/devices/cpu/h8/h83008.cpp index c6462944420..05fd4df2482 100644 --- a/src/devices/cpu/h8/h83008.cpp +++ b/src/devices/cpu/h8/h83008.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "h83008.h" -const device_type H83008 = &device_creator; +const device_type H83008 = device_creator; h83008_device::h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : h8h_device(mconfig, H83008, "H8/3008", tag, owner, clock, "h83008", __FILE__, address_map_delegate(FUNC(h83008_device::map), this)), diff --git a/src/devices/cpu/h8/h83048.cpp b/src/devices/cpu/h8/h83048.cpp index 0689072e9aa..f68b52b382c 100644 --- a/src/devices/cpu/h8/h83048.cpp +++ b/src/devices/cpu/h8/h83048.cpp @@ -3,10 +3,10 @@ #include "emu.h" #include "h83048.h" -const device_type H83044 = &device_creator; -const device_type H83045 = &device_creator; -const device_type H83047 = &device_creator; -const device_type H83048 = &device_creator; +const device_type H83044 = device_creator; +const device_type H83045 = device_creator; +const device_type H83047 = device_creator; +const device_type H83048 = device_creator; h83048_device::h83048_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) : h8h_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h83048_device::map), this)), diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp index 8f1eeb57451..eb107c504dc 100644 --- a/src/devices/cpu/h8/h83337.cpp +++ b/src/devices/cpu/h8/h83337.cpp @@ -3,9 +3,9 @@ #include "emu.h" #include "h83337.h" -const device_type H83334 = &device_creator; -const device_type H83336 = &device_creator; -const device_type H83337 = &device_creator; +const device_type H83334 = device_creator; +const device_type H83336 = device_creator; +const device_type H83337 = device_creator; h83337_device::h83337_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) : diff --git a/src/devices/cpu/h8/h8_adc.cpp b/src/devices/cpu/h8/h8_adc.cpp index 7a153253e10..fbeaa5e9199 100644 --- a/src/devices/cpu/h8/h8_adc.cpp +++ b/src/devices/cpu/h8/h8_adc.cpp @@ -8,12 +8,12 @@ // 1 = everything const int V = 0; -const device_type H8_ADC_3337 = &device_creator; -const device_type H8_ADC_3006 = &device_creator; -const device_type H8_ADC_2245 = &device_creator; -const device_type H8_ADC_2320 = &device_creator; -const device_type H8_ADC_2357 = &device_creator; -const device_type H8_ADC_2655 = &device_creator; +const device_type H8_ADC_3337 = device_creator; +const device_type H8_ADC_3006 = device_creator; +const device_type H8_ADC_2245 = device_creator; +const device_type H8_ADC_2320 = device_creator; +const device_type H8_ADC_2357 = device_creator; +const device_type H8_ADC_2655 = device_creator; h8_adc_device::h8_adc_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), diff --git a/src/devices/cpu/h8/h8_dma.cpp b/src/devices/cpu/h8/h8_dma.cpp index e3ce2ccc939..af27444c64c 100644 --- a/src/devices/cpu/h8/h8_dma.cpp +++ b/src/devices/cpu/h8/h8_dma.cpp @@ -1,8 +1,8 @@ #include "emu.h" #include "h8_dma.h" -const device_type H8_DMA = &device_creator; -const device_type H8_DMA_CHANNEL = &device_creator; +const device_type H8_DMA = device_creator; +const device_type H8_DMA_CHANNEL = device_creator; h8_dma_device::h8_dma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, H8_DMA, "H8 DMA controller", tag, owner, clock, "h8_dma", __FILE__), diff --git a/src/devices/cpu/h8/h8_dtc.cpp b/src/devices/cpu/h8/h8_dtc.cpp index 117740cdd4b..9ea8037ff37 100644 --- a/src/devices/cpu/h8/h8_dtc.cpp +++ b/src/devices/cpu/h8/h8_dtc.cpp @@ -7,7 +7,7 @@ // 2 = everything const int V = 0; -const device_type H8_DTC = &device_creator; +const device_type H8_DTC = device_creator; const int h8_dtc_device::vector_to_enable[92] = { -1, -1, -1, -1, -1, -1, -1, -1, // NMI at 7 diff --git a/src/devices/cpu/h8/h8_intc.cpp b/src/devices/cpu/h8/h8_intc.cpp index d81d53ccfe7..98f0b8de61e 100644 --- a/src/devices/cpu/h8/h8_intc.cpp +++ b/src/devices/cpu/h8/h8_intc.cpp @@ -3,9 +3,9 @@ #include "emu.h" #include "h8_intc.h" -const device_type H8_INTC = &device_creator; -const device_type H8H_INTC = &device_creator; -const device_type H8S_INTC = &device_creator; +const device_type H8_INTC = device_creator; +const device_type H8H_INTC = device_creator; +const device_type H8S_INTC = device_creator; h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, H8_INTC, "H8 INTC", tag, owner, clock, "h8_intc", __FILE__), diff --git a/src/devices/cpu/h8/h8_port.cpp b/src/devices/cpu/h8/h8_port.cpp index e319748d01a..ec61a0fd196 100644 --- a/src/devices/cpu/h8/h8_port.cpp +++ b/src/devices/cpu/h8/h8_port.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "h8_port.h" -const device_type H8_PORT = &device_creator; +const device_type H8_PORT = device_creator; h8_port_device::h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, H8_PORT, "H8 digital port", tag, owner, clock, "h8_digital_port", __FILE__), diff --git a/src/devices/cpu/h8/h8_sci.cpp b/src/devices/cpu/h8/h8_sci.cpp index 7a426ad65ec..8d6ea7163a1 100644 --- a/src/devices/cpu/h8/h8_sci.cpp +++ b/src/devices/cpu/h8/h8_sci.cpp @@ -11,7 +11,7 @@ const int V = 1; -const device_type H8_SCI = &device_creator; +const device_type H8_SCI = device_creator; const char *const h8_sci_device::state_names[] = { "idle", "start", "bit", "parity", "stop", "last-tick" }; diff --git a/src/devices/cpu/h8/h8_timer16.cpp b/src/devices/cpu/h8/h8_timer16.cpp index 2beb6d86c61..a35690b78bf 100644 --- a/src/devices/cpu/h8/h8_timer16.cpp +++ b/src/devices/cpu/h8/h8_timer16.cpp @@ -8,10 +8,10 @@ // 1 = everything const int V = 0; -const device_type H8_TIMER16 = &device_creator; -const device_type H8_TIMER16_CHANNEL = &device_creator; -const device_type H8H_TIMER16_CHANNEL = &device_creator; -const device_type H8S_TIMER16_CHANNEL = &device_creator; +const device_type H8_TIMER16 = device_creator; +const device_type H8_TIMER16_CHANNEL = device_creator; +const device_type H8H_TIMER16_CHANNEL = device_creator; +const device_type H8S_TIMER16_CHANNEL = device_creator; h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, H8_TIMER16_CHANNEL, "H8 16-bits timer channel", tag, owner, clock, "h8_16bits_timer_channel", __FILE__), diff --git a/src/devices/cpu/h8/h8_timer8.cpp b/src/devices/cpu/h8/h8_timer8.cpp index 93538817313..4bac2b89f0d 100644 --- a/src/devices/cpu/h8/h8_timer8.cpp +++ b/src/devices/cpu/h8/h8_timer8.cpp @@ -9,8 +9,8 @@ // 2 = everything const int V = 1; -const device_type H8_TIMER8_CHANNEL = &device_creator; -const device_type H8H_TIMER8_CHANNEL = &device_creator; +const device_type H8_TIMER8_CHANNEL = device_creator; +const device_type H8H_TIMER8_CHANNEL = device_creator; h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, H8_TIMER8_CHANNEL, "H8 8-bits timer channel", tag, owner, clock, "h8_8bits_timer_channel", __FILE__), diff --git a/src/devices/cpu/h8/h8_watchdog.cpp b/src/devices/cpu/h8/h8_watchdog.cpp index 286be74c208..5ace536ac7a 100644 --- a/src/devices/cpu/h8/h8_watchdog.cpp +++ b/src/devices/cpu/h8/h8_watchdog.cpp @@ -1,7 +1,7 @@ #include "emu.h" #include "h8_watchdog.h" -const device_type H8_WATCHDOG = &device_creator; +const device_type H8_WATCHDOG = device_creator; const int h8_watchdog_device::div_bh[8] = { 1, 6, 7, 9, 11, 13, 15, 17 }; const int h8_watchdog_device::div_s [8] = { 1, 5, 6, 7, 8, 9, 11, 12 }; diff --git a/src/devices/cpu/h8/h8s2245.cpp b/src/devices/cpu/h8/h8s2245.cpp index 20cc8bbc237..cbb3a5e91d1 100644 --- a/src/devices/cpu/h8/h8s2245.cpp +++ b/src/devices/cpu/h8/h8s2245.cpp @@ -3,10 +3,10 @@ #include "emu.h" #include "h8s2245.h" -const device_type H8S2241 = &device_creator; -const device_type H8S2242 = &device_creator; -const device_type H8S2245 = &device_creator; -const device_type H8S2246 = &device_creator; +const device_type H8S2241 = device_creator; +const device_type H8S2242 = device_creator; +const device_type H8S2245 = device_creator; +const device_type H8S2246 = device_creator; h8s2245_device::h8s2245_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) : diff --git a/src/devices/cpu/h8/h8s2320.cpp b/src/devices/cpu/h8/h8s2320.cpp index 073725dcd3e..e2951a0d2a1 100644 --- a/src/devices/cpu/h8/h8s2320.cpp +++ b/src/devices/cpu/h8/h8s2320.cpp @@ -3,15 +3,15 @@ #include "emu.h" #include "h8s2320.h" -const device_type H8S2320 = &device_creator; -const device_type H8S2321 = &device_creator; -const device_type H8S2322 = &device_creator; -const device_type H8S2323 = &device_creator; -const device_type H8S2324 = &device_creator; -const device_type H8S2326 = &device_creator; -const device_type H8S2327 = &device_creator; -const device_type H8S2328 = &device_creator; -const device_type H8S2329 = &device_creator; +const device_type H8S2320 = device_creator; +const device_type H8S2321 = device_creator; +const device_type H8S2322 = device_creator; +const device_type H8S2323 = device_creator; +const device_type H8S2324 = device_creator; +const device_type H8S2326 = device_creator; +const device_type H8S2327 = device_creator; +const device_type H8S2328 = device_creator; +const device_type H8S2329 = device_creator; h8s2320_device::h8s2320_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) : diff --git a/src/devices/cpu/h8/h8s2357.cpp b/src/devices/cpu/h8/h8s2357.cpp index c600904ba83..b143a566933 100644 --- a/src/devices/cpu/h8/h8s2357.cpp +++ b/src/devices/cpu/h8/h8s2357.cpp @@ -3,12 +3,12 @@ #include "emu.h" #include "h8s2357.h" -const device_type H8S2357 = &device_creator; -const device_type H8S2352 = &device_creator; -const device_type H8S2398 = &device_creator; -const device_type H8S2394 = &device_creator; -const device_type H8S2392 = &device_creator; -const device_type H8S2390 = &device_creator; +const device_type H8S2357 = device_creator; +const device_type H8S2352 = device_creator; +const device_type H8S2398 = device_creator; +const device_type H8S2394 = device_creator; +const device_type H8S2392 = device_creator; +const device_type H8S2390 = device_creator; h8s2357_device::h8s2357_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) : h8s2000_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2357_device::map), this)), diff --git a/src/devices/cpu/h8/h8s2655.cpp b/src/devices/cpu/h8/h8s2655.cpp index 14610e9161d..b95fb91ad68 100644 --- a/src/devices/cpu/h8/h8s2655.cpp +++ b/src/devices/cpu/h8/h8s2655.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "h8s2655.h" -const device_type H8S2655 = &device_creator; -const device_type H8S2653 = &device_creator; +const device_type H8S2655 = device_creator; +const device_type H8S2653 = device_creator; h8s2655_device::h8s2655_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) : h8s2600_device(mconfig, type, name, tag, owner, clock, shortname, source, address_map_delegate(FUNC(h8s2655_device::map), this)), diff --git a/src/devices/cpu/hcd62121/hcd62121.cpp b/src/devices/cpu/hcd62121/hcd62121.cpp index 59930adceec..0a0e5a29ea0 100644 --- a/src/devices/cpu/hcd62121/hcd62121.cpp +++ b/src/devices/cpu/hcd62121/hcd62121.cpp @@ -30,7 +30,7 @@ constexpr u8 FLAG_CL = 0x01; constexpr u8 FLAG_ZH = 0x10; -const device_type HCD62121 = &device_creator; +const device_type HCD62121 = device_creator; hcd62121_cpu_device::hcd62121_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/hd61700/hd61700.cpp b/src/devices/cpu/hd61700/hd61700.cpp index c7c646a7a4b..92201470a6c 100644 --- a/src/devices/cpu/hd61700/hd61700.cpp +++ b/src/devices/cpu/hd61700/hd61700.cpp @@ -95,7 +95,7 @@ static const uint16_t irq_vector[] = {0x0032, 0x0042, 0x0052, 0x0062, 0x0072}; // HD61700 DEVICE //************************************************************************** -const device_type HD61700 = &device_creator; +const device_type HD61700 = device_creator; //------------------------------------------------- // hd61700_cpu_device - constructor diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp index 0023956f8d4..71b038bcd1b 100644 --- a/src/devices/cpu/hmcs40/hmcs40.cpp +++ b/src/devices/cpu/hmcs40/hmcs40.cpp @@ -22,36 +22,36 @@ // MCU types // HMCS42/C/CL -//const device_type HD38702 = &device_creator; // PMOS, 28 pins, 22 I/O lines, (512+32)x10 ROM, 32x4 RAM, no B or SPY register -//const device_type HD44700 = &device_creator; // CMOS version -//const device_type HD44708 = &device_creator; // CMOS version, low-power +//const device_type HD38702 = device_creator; // PMOS, 28 pins, 22 I/O lines, (512+32)x10 ROM, 32x4 RAM, no B or SPY register +//const device_type HD44700 = device_creator; // CMOS version +//const device_type HD44708 = device_creator; // CMOS version, low-power // HMCS43/C/CL -const device_type HD38750 = &device_creator; // PMOS, 42 pins, 32 I/O lines, (1024+64)x10 ROM, 80x4 RAM -const device_type HD38755 = &device_creator; // ceramic filter oscillator type -const device_type HD44750 = &device_creator; // CMOS version -const device_type HD44758 = &device_creator; // CMOS version, low-power +const device_type HD38750 = device_creator; // PMOS, 42 pins, 32 I/O lines, (1024+64)x10 ROM, 80x4 RAM +const device_type HD38755 = device_creator; // ceramic filter oscillator type +const device_type HD44750 = device_creator; // CMOS version +const device_type HD44758 = device_creator; // CMOS version, low-power // HMCS44A/C/CL -const device_type HD38800 = &device_creator; // PMOS, 42 pins, 32 I/O lines, (2048+128)x10 ROM, 160x4 RAM -const device_type HD38805 = &device_creator; // ceramic filter oscillator type -const device_type HD44801 = &device_creator; // CMOS version -const device_type HD44808 = &device_creator; // CMOS version, low-power +const device_type HD38800 = device_creator; // PMOS, 42 pins, 32 I/O lines, (2048+128)x10 ROM, 160x4 RAM +const device_type HD38805 = device_creator; // ceramic filter oscillator type +const device_type HD44801 = device_creator; // CMOS version +const device_type HD44808 = device_creator; // CMOS version, low-power // HMCS45A/C/CL -const device_type HD38820 = &device_creator; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, (2048+128)x10 ROM, 160x4 RAM -const device_type HD38825 = &device_creator; // ceramic filter oscillator type -const device_type HD44820 = &device_creator; // CMOS version -const device_type HD44828 = &device_creator; // CMOS version, low-power +const device_type HD38820 = device_creator; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, (2048+128)x10 ROM, 160x4 RAM +const device_type HD38825 = device_creator; // ceramic filter oscillator type +const device_type HD44820 = device_creator; // CMOS version +const device_type HD44828 = device_creator; // CMOS version, low-power // HMCS46C/CL (no PMOS version exists) -//const device_type HD44840 = &device_creator; // CMOS, 42 pins, 32 I/O lines, 4096x10 ROM, 256x4 RAM -//const device_type HD44848 = &device_creator; // CMOS, low-power +//const device_type HD44840 = device_creator; // CMOS, 42 pins, 32 I/O lines, 4096x10 ROM, 256x4 RAM +//const device_type HD44848 = device_creator; // CMOS, low-power // HMCS47A/C/CL -//const device_type HD38870 = &device_creator; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, 4096x10 ROM, 256x4 RAM -//const device_type HD44860 = &device_creator; // CMOS version -//const device_type HD44868 = &device_creator; // CMOS version, low-power +//const device_type HD38870 = device_creator; // PMOS, 54 pins(QFP) or 64 pins(DIP), 44 I/O lines, 4096x10 ROM, 256x4 RAM +//const device_type HD44860 = device_creator; // CMOS version +//const device_type HD44868 = device_creator; // CMOS version, low-power // internal memory maps diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp index d2930111c2e..47477503f05 100644 --- a/src/devices/cpu/hphybrid/hphybrid.cpp +++ b/src/devices/cpu/hphybrid/hphybrid.cpp @@ -101,8 +101,8 @@ enum { // Part of r32-r37 that is actually output as address extension (6 bits of "BSC": block select code) #define BSC_REG_MASK 0x3f -const device_type HP_5061_3001 = &device_creator; -const device_type HP_5061_3011 = &device_creator; +const device_type HP_5061_3001 = device_creator; +const device_type HP_5061_3011 = device_creator; WRITE_LINE_MEMBER(hp_hybrid_cpu_device::dmar_w) { diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp index 00321d2e364..4a90418770a 100644 --- a/src/devices/cpu/i386/i386.cpp +++ b/src/devices/cpu/i386/i386.cpp @@ -27,16 +27,16 @@ /* seems to be defined on mingw-gcc */ #undef i386 -const device_type I386 = &device_creator; -const device_type I386SX = &device_creator; -const device_type I486 = &device_creator; -const device_type PENTIUM = &device_creator; -const device_type MEDIAGX = &device_creator; -const device_type PENTIUM_PRO = &device_creator; -const device_type PENTIUM_MMX = &device_creator; -const device_type PENTIUM2 = &device_creator; -const device_type PENTIUM3 = &device_creator; -const device_type PENTIUM4 = &device_creator; +const device_type I386 = device_creator; +const device_type I386SX = device_creator; +const device_type I486 = device_creator; +const device_type PENTIUM = device_creator; +const device_type MEDIAGX = device_creator; +const device_type PENTIUM_PRO = device_creator; +const device_type PENTIUM_MMX = device_creator; +const device_type PENTIUM2 = device_creator; +const device_type PENTIUM3 = device_creator; +const device_type PENTIUM4 = device_creator; i386_device::i386_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/i4004/i4004.cpp b/src/devices/cpu/i4004/i4004.cpp index eaaae3b8148..58fce33bdc4 100644 --- a/src/devices/cpu/i4004/i4004.cpp +++ b/src/devices/cpu/i4004/i4004.cpp @@ -21,7 +21,7 @@ static const uint8_t kbp_table[] = { 0x00,0x01,0x02,0x0f,0x03,0x0f,0x0f,0x0f,0x0 #define GET_PC (m_ADDR[m_pc_pos]) -const device_type I4004 = &device_creator; +const device_type I4004 = device_creator; i4004_cpu_device::i4004_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/i8008/i8008.cpp b/src/devices/cpu/i8008/i8008.cpp index f55dac14b88..18bf62d4f46 100644 --- a/src/devices/cpu/i8008/i8008.cpp +++ b/src/devices/cpu/i8008/i8008.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -const device_type I8008 = &device_creator; +const device_type I8008 = device_creator; //************************************************************************** // DEVICE INTERFACE diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp index f60e594bad9..febb71e1a46 100644 --- a/src/devices/cpu/i8085/i8085.cpp +++ b/src/devices/cpu/i8085/i8085.cpp @@ -177,9 +177,9 @@ M_CALL 8085 11 +7(18) -2(9) */ -const device_type I8080 = &device_creator; -const device_type I8080A = &device_creator; -const device_type I8085A = &device_creator; +const device_type I8080 = device_creator; +const device_type I8080A = device_creator; +const device_type I8085A = device_creator; i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp index a18d62b7f4a..9b1ada7b1f6 100644 --- a/src/devices/cpu/i8089/i8089.cpp +++ b/src/devices/cpu/i8089/i8089.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type I8089 = &device_creator; +const device_type I8089 = device_creator; //************************************************************************** diff --git a/src/devices/cpu/i8089/i8089_channel.cpp b/src/devices/cpu/i8089/i8089_channel.cpp index cbfd60b2280..8cfcdc6cca7 100644 --- a/src/devices/cpu/i8089/i8089_channel.cpp +++ b/src/devices/cpu/i8089/i8089_channel.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type I8089_CHANNEL = &device_creator; +const device_type I8089_CHANNEL = device_creator; //************************************************************************** diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index 4ed045460d1..e8c3f280937 100644 --- a/src/devices/cpu/i86/i186.cpp +++ b/src/devices/cpu/i86/i186.cpp @@ -118,8 +118,8 @@ const uint8_t i80186_cpu_device::m_i80186_timing[] = 33, /* (80186) BOUND */ }; -const device_type I80186 = &device_creator; -const device_type I80188 = &device_creator; +const device_type I80186 = device_creator; +const device_type I80188 = device_creator; i80188_cpu_device::i80188_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : i80186_cpu_device(mconfig, I80188, "I80188", tag, owner, clock, "i80188", __FILE__, 8) diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp index 1cb06fd0298..44232141fa9 100644 --- a/src/devices/cpu/i86/i286.cpp +++ b/src/devices/cpu/i86/i286.cpp @@ -165,7 +165,7 @@ const uint8_t i80286_cpu_device::m_i80286_timing[] = 13, /* (80186) BOUND */ }; -const device_type I80286 = &device_creator; +const device_type I80286 = device_creator; i80286_cpu_device::i80286_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : i8086_common_cpu_device(mconfig, I80286, "I80286", tag, owner, clock, "i80286", __FILE__) diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp index ad3efd8a46c..5ba581d4656 100644 --- a/src/devices/cpu/i86/i86.cpp +++ b/src/devices/cpu/i86/i86.cpp @@ -87,8 +87,8 @@ const uint8_t i8086_cpu_device::m_i8086_timing[] = /***************************************************************************/ -const device_type I8086 = &device_creator; -const device_type I8088 = &device_creator; +const device_type I8086 = device_creator; +const device_type I8088 = device_creator; i8088_cpu_device::i8088_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : i8086_cpu_device(mconfig, I8088, "I8088", tag, owner, clock, "i8088", __FILE__, 8) diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp index 199a410b2db..b894ebc8c3f 100644 --- a/src/devices/cpu/i860/i860.cpp +++ b/src/devices/cpu/i860/i860.cpp @@ -31,7 +31,7 @@ enum { }; -const device_type I860 = &device_creator; +const device_type I860 = device_creator; i860_cpu_device::i860_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp index 9bc4386d182..1aec8b3b115 100644 --- a/src/devices/cpu/i960/i960.cpp +++ b/src/devices/cpu/i960/i960.cpp @@ -13,7 +13,7 @@ CPU_DISASSEMBLE( i960 ); #endif -const device_type I960 = &device_creator; +const device_type I960 = device_creator; i960_cpu_device::i960_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/ie15/ie15.cpp b/src/devices/cpu/ie15/ie15.cpp index eeebbe2cd4c..9da2a0f03eb 100644 --- a/src/devices/cpu/ie15/ie15.cpp +++ b/src/devices/cpu/ie15/ie15.cpp @@ -1,9 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Sergey Svishchev #include "emu.h" -#include "debugger.h" #include "ie15.h" +#include "debugger.h" + + //************************************************************************** // MACROS //************************************************************************** @@ -19,7 +21,7 @@ //************************************************************************** // device type definition -const device_type IE15 = &device_creator; +const device_type IE15 = device_creator; //************************************************************************** // DEVICE INTERFACE diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp index 1a3d7d9f41e..51ac4db16ff 100644 --- a/src/devices/cpu/jaguar/jaguar.cpp +++ b/src/devices/cpu/jaguar/jaguar.cpp @@ -136,8 +136,8 @@ const jaguar_cpu_device::op_func jaguar_cpu_device::dsp_op_table[64] = #define ROPCODE(pc) (m_direct->read_word(pc, WORD_XOR_BE(0))) -const device_type JAGUARGPU = &device_creator; -const device_type JAGUARDSP = &device_creator; +const device_type JAGUARGPU = device_creator; +const device_type JAGUARDSP = device_creator; jaguar_cpu_device::jaguar_cpu_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, bool isdsp) diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp index 71e674c9221..7e16ecb8824 100644 --- a/src/devices/cpu/lc8670/lc8670.cpp +++ b/src/devices/cpu/lc8670/lc8670.cpp @@ -31,7 +31,7 @@ // CONSTANTS //************************************************************************** -const device_type LC8670 = &device_creator; +const device_type LC8670 = device_creator; //************************************************************************** diff --git a/src/devices/cpu/lh5801/lh5801.cpp b/src/devices/cpu/lh5801/lh5801.cpp index 80c218d9e47..b7467695a68 100644 --- a/src/devices/cpu/lh5801/lh5801.cpp +++ b/src/devices/cpu/lh5801/lh5801.cpp @@ -62,7 +62,7 @@ enum #define H 0x10 -const device_type LH5801 = &device_creator; +const device_type LH5801 = device_creator; lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp index 137337be5be..5602a19d721 100644 --- a/src/devices/cpu/lr35902/lr35902.cpp +++ b/src/devices/cpu/lr35902/lr35902.cpp @@ -60,7 +60,7 @@ enum lr35902_flag // LR35902 DEVICE //************************************************************************** -const device_type LR35902 = &device_creator; +const device_type LR35902 = device_creator; lr35902_cpu_device::lr35902_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp index 8da01b9b843..44af6a383cc 100644 --- a/src/devices/cpu/m37710/m37710.cpp +++ b/src/devices/cpu/m37710/m37710.cpp @@ -62,9 +62,9 @@ #define M37710_DEBUG (0) // enables verbose logging for peripherals, etc. -const device_type M37702M2 = &device_creator; -const device_type M37702S1 = &device_creator; -const device_type M37710S4 = &device_creator; +const device_type M37702M2 = device_creator; +const device_type M37702S1 = device_creator; +const device_type M37710S4 = device_creator; // On-board RAM, ROM, and peripherals diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp index d6ad1c7077a..b32db04191b 100644 --- a/src/devices/cpu/m6502/deco16.cpp +++ b/src/devices/cpu/m6502/deco16.cpp @@ -13,7 +13,7 @@ #define DECO16_VERBOSE 1 -const device_type DECO16 = &device_creator; +const device_type DECO16 = device_creator; deco16_device::deco16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, DECO16, "DECO16", tag, owner, clock, "deco16", __FILE__), diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp index 22de70eec42..bbb46b9eb49 100644 --- a/src/devices/cpu/m6502/m3745x.cpp +++ b/src/devices/cpu/m6502/m3745x.cpp @@ -28,7 +28,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type M37450 = &device_creator; +const device_type M37450 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp index 61a4f9d8c8f..45f2c369b3e 100644 --- a/src/devices/cpu/m6502/m4510.cpp +++ b/src/devices/cpu/m6502/m4510.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m4510.h" -const device_type M4510 = &device_creator; +const device_type M4510 = device_creator; m4510_device::m4510_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m65ce02_device(mconfig, M4510, "M4510", tag, owner, clock, "m4510", __FILE__), diff --git a/src/devices/cpu/m6502/m5074x.cpp b/src/devices/cpu/m6502/m5074x.cpp index a486691c678..9ea21e760cb 100644 --- a/src/devices/cpu/m6502/m5074x.cpp +++ b/src/devices/cpu/m6502/m5074x.cpp @@ -29,8 +29,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type M50740 = &device_creator; -const device_type M50741 = &device_creator; +const device_type M50740 = device_creator; +const device_type M50741 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp index af1110957cb..b6a93b00769 100644 --- a/src/devices/cpu/m6502/m6502.cpp +++ b/src/devices/cpu/m6502/m6502.cpp @@ -12,7 +12,7 @@ #include "debugger.h" #include "m6502.h" -const device_type M6502 = &device_creator; +const device_type M6502 = device_creator; m6502_device::m6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig, M6502, "M6502", tag, owner, clock, "m6502", __FILE__), diff --git a/src/devices/cpu/m6502/m6504.cpp b/src/devices/cpu/m6502/m6504.cpp index a2a2f006d1b..4ec4c9ecb31 100644 --- a/src/devices/cpu/m6502/m6504.cpp +++ b/src/devices/cpu/m6502/m6504.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m6504.h" -const device_type M6504 = &device_creator; +const device_type M6504 = device_creator; m6504_device::m6504_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M6504, "M6504", tag, owner, clock, "m6504", __FILE__) diff --git a/src/devices/cpu/m6502/m6507.cpp b/src/devices/cpu/m6502/m6507.cpp index 85855f75aab..21bb42dbd3e 100644 --- a/src/devices/cpu/m6502/m6507.cpp +++ b/src/devices/cpu/m6502/m6507.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m6507.h" -const device_type M6507 = &device_creator; +const device_type M6507 = device_creator; m6507_device::m6507_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M6507, "M6507", tag, owner, clock, "m6507", __FILE__) diff --git a/src/devices/cpu/m6502/m6509.cpp b/src/devices/cpu/m6502/m6509.cpp index e0fcedd75cf..5241c36d88a 100644 --- a/src/devices/cpu/m6502/m6509.cpp +++ b/src/devices/cpu/m6502/m6509.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m6509.h" -const device_type M6509 = &device_creator; +const device_type M6509 = device_creator; m6509_device::m6509_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M6509, "M6509", tag, owner, clock, "m6509", __FILE__), XPC(0), bank_i(0), bank_y(0) diff --git a/src/devices/cpu/m6502/m6510.cpp b/src/devices/cpu/m6502/m6510.cpp index c2f59403780..e1aa0937f76 100644 --- a/src/devices/cpu/m6502/m6510.cpp +++ b/src/devices/cpu/m6502/m6510.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m6510.h" -const device_type M6510 = &device_creator; +const device_type M6510 = device_creator; m6510_device::m6510_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M6510, "M6510", tag, owner, clock, "m6510", __FILE__), diff --git a/src/devices/cpu/m6502/m6510t.cpp b/src/devices/cpu/m6502/m6510t.cpp index 6b9bb1f16ad..c2d9e750f5a 100644 --- a/src/devices/cpu/m6502/m6510t.cpp +++ b/src/devices/cpu/m6502/m6510t.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m6510t.h" -const device_type M6510T = &device_creator; +const device_type M6510T = device_creator; m6510t_device::m6510t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6510_device(mconfig, M6510T, "M6510T", tag, owner, clock, "m6510t", __FILE__) diff --git a/src/devices/cpu/m6502/m65c02.cpp b/src/devices/cpu/m6502/m65c02.cpp index 1d9d158bf29..9f0a1d4cc9e 100644 --- a/src/devices/cpu/m6502/m65c02.cpp +++ b/src/devices/cpu/m6502/m65c02.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "m65c02.h" -const device_type M65C02 = &device_creator; +const device_type M65C02 = device_creator; m65c02_device::m65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M65C02, "M65C02", tag, owner, clock, "mc65c02", __FILE__) diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp index f45d3edcf47..0a167f75704 100644 --- a/src/devices/cpu/m6502/m65ce02.cpp +++ b/src/devices/cpu/m6502/m65ce02.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m65ce02.h" -const device_type M65CE02 = &device_creator; +const device_type M65CE02 = device_creator; m65ce02_device::m65ce02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m65c02_device(mconfig, M65CE02, "M65CE02", tag, owner, clock, "m65ce02", __FILE__), TMP3(0), Z(0), B(0) diff --git a/src/devices/cpu/m6502/m65sc02.cpp b/src/devices/cpu/m6502/m65sc02.cpp index e340fc0ca44..ae87d1ea78d 100644 --- a/src/devices/cpu/m6502/m65sc02.cpp +++ b/src/devices/cpu/m6502/m65sc02.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m65sc02.h" -const device_type M65SC02 = &device_creator; +const device_type M65SC02 = device_creator; m65sc02_device::m65sc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : r65c02_device(mconfig, M65SC02, "M65SC02", tag, owner, clock, "m65sc02", __FILE__) diff --git a/src/devices/cpu/m6502/m740.cpp b/src/devices/cpu/m6502/m740.cpp index 1f4c1cd45a4..9c4a45cce16 100644 --- a/src/devices/cpu/m6502/m740.cpp +++ b/src/devices/cpu/m6502/m740.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m740.h" -const device_type M740 = &device_creator; +const device_type M740 = device_creator; m740_device::m740_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M740, "M740", tag, owner, clock, "m740", __FILE__), m_irq_multiplex(0), m_irq_vector(0) diff --git a/src/devices/cpu/m6502/m7501.cpp b/src/devices/cpu/m6502/m7501.cpp index 54e7bdb7456..826ae10ad15 100644 --- a/src/devices/cpu/m6502/m7501.cpp +++ b/src/devices/cpu/m6502/m7501.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m7501.h" -const device_type M7501 = &device_creator; +const device_type M7501 = device_creator; m7501_device::m7501_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6510_device(mconfig, M7501, "M7501", tag, owner, clock, "m7501", __FILE__) diff --git a/src/devices/cpu/m6502/m8502.cpp b/src/devices/cpu/m6502/m8502.cpp index 97d66d4431c..897bd3e00e2 100644 --- a/src/devices/cpu/m6502/m8502.cpp +++ b/src/devices/cpu/m6502/m8502.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "m8502.h" -const device_type M8502 = &device_creator; +const device_type M8502 = device_creator; m8502_device::m8502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6510_device(mconfig, M8502, "M8502", tag, owner, clock, "m8502", __FILE__) diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp index 338ee91c3e5..772f6ebda54 100644 --- a/src/devices/cpu/m6502/n2a03.cpp +++ b/src/devices/cpu/m6502/n2a03.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "n2a03.h" -const device_type N2A03 = &device_creator; +const device_type N2A03 = device_creator; READ8_MEMBER(n2a03_device::psg1_4014_r) { diff --git a/src/devices/cpu/m6502/r65c02.cpp b/src/devices/cpu/m6502/r65c02.cpp index 15594594360..eb6d85be265 100644 --- a/src/devices/cpu/m6502/r65c02.cpp +++ b/src/devices/cpu/m6502/r65c02.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "r65c02.h" -const device_type R65C02 = &device_creator; +const device_type R65C02 = device_creator; r65c02_device::r65c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m65c02_device(mconfig, R65C02, "R65C02", tag, owner, clock, "r65c02", __FILE__) diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp index 520e46d1c24..67148eccaa2 100644 --- a/src/devices/cpu/m6800/m6800.cpp +++ b/src/devices/cpu/m6800/m6800.cpp @@ -520,16 +520,16 @@ const uint8_t m6800_cpu_device::cycles_nsc8105[256] = } -const device_type M6800 = &device_creator; -const device_type M6801 = &device_creator; -const device_type M6802 = &device_creator; -const device_type M6803 = &device_creator; -const device_type M6808 = &device_creator; -const device_type HD6301 = &device_creator; -const device_type HD63701 = &device_creator; -const device_type NSC8105 = &device_creator; -const device_type HD6303R = &device_creator; -const device_type HD6303Y = &device_creator; +const device_type M6800 = device_creator; +const device_type M6801 = device_creator; +const device_type M6802 = device_creator; +const device_type M6803 = device_creator; +const device_type M6808 = device_creator; +const device_type HD6301 = device_creator; +const device_type HD63701 = device_creator; +const device_type NSC8105 = device_creator; +const device_type HD6303R = device_creator; +const device_type HD6303Y = device_creator; m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index 244ad3149c8..44c21eb8818 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -2271,7 +2271,7 @@ void m68000_base_device::m68ki_exception_interrupt(m68000_base_device *m68k, uin } -const device_type M68K = &device_creator; +const device_type M68K = device_creator; //------------------------------------------------- // h6280_device - constructor @@ -2495,24 +2495,24 @@ const address_space_config *m68000_base_device::memory_space_config(address_spac -const device_type M68000 = &device_creator; -const device_type M68301 = &device_creator; -const device_type M68008 = &device_creator; -const device_type M68008PLCC = &device_creator; -const device_type M68010 = &device_creator; -const device_type M68EC020 = &device_creator; -const device_type M68020 = &device_creator; -const device_type M68020FPU = &device_creator; -const device_type M68020PMMU = &device_creator; -const device_type M68020HMMU = &device_creator; -const device_type M68EC030 = &device_creator; -const device_type M68030 = &device_creator; -const device_type M68EC040 = &device_creator; -const device_type M68LC040 = &device_creator; -const device_type M68040 = &device_creator; -const device_type SCC68070 = &device_creator; -const device_type FSCPU32 = &device_creator; -const device_type MCF5206E = &device_creator; +const device_type M68000 = device_creator; +const device_type M68301 = device_creator; +const device_type M68008 = device_creator; +const device_type M68008PLCC = device_creator; +const device_type M68010 = device_creator; +const device_type M68EC020 = device_creator; +const device_type M68020 = device_creator; +const device_type M68020FPU = device_creator; +const device_type M68020PMMU = device_creator; +const device_type M68020HMMU = device_creator; +const device_type M68EC030 = device_creator; +const device_type M68030 = device_creator; +const device_type M68EC040 = device_creator; +const device_type M68LC040 = device_creator; +const device_type M68040 = device_creator; +const device_type SCC68070 = device_creator; +const device_type FSCPU32 = device_creator; +const device_type MCF5206E = device_creator; m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, "m68000", __FILE__) diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp index 12af2c62007..a606077a021 100644 --- a/src/devices/cpu/m6805/m6805.cpp +++ b/src/devices/cpu/m6805/m6805.cpp @@ -707,6 +707,6 @@ void hd63705_device::interrupt_vector() } -const device_type M6805 = &device_creator; -const device_type M68HC05EG = &device_creator; -const device_type HD63705 = &device_creator; +const device_type M6805 = device_creator; +const device_type M68HC05EG = device_creator; +const device_type HD63705 = device_creator; diff --git a/src/devices/cpu/m6805/m68705.cpp b/src/devices/cpu/m6805/m68705.cpp index 9c652a85e2d..b05f9c0431c 100644 --- a/src/devices/cpu/m6805/m68705.cpp +++ b/src/devices/cpu/m6805/m68705.cpp @@ -87,10 +87,10 @@ constexpr u16 M68705_INT_MASK = 0x03; * Global variables ****************************************************************************/ -device_type const M68705P3 = &device_creator; -device_type const M68705P5 = &device_creator; -device_type const M68705R3 = &device_creator; -device_type const M68705U3 = &device_creator; +device_type const M68705P3 = device_creator; +device_type const M68705P5 = device_creator; +device_type const M68705R3 = device_creator; +device_type const M68705U3 = device_creator; /**************************************************************************** diff --git a/src/devices/cpu/m6805/m68hc05.cpp b/src/devices/cpu/m6805/m68hc05.cpp index 00db265d782..352f5e99f1a 100644 --- a/src/devices/cpu/m6805/m68hc05.cpp +++ b/src/devices/cpu/m6805/m68hc05.cpp @@ -89,9 +89,9 @@ constexpr u16 M68HC05_INT_MASK = M68HC05_INT_IRQ | M68HC05_INT_TIMER; * Global variables ****************************************************************************/ -device_type const M68HC05C4 = &device_creator; -device_type const M68HC05C8 = &device_creator; -device_type const M68HC705C8A = &device_creator; +device_type const M68HC05C4 = device_creator; +device_type const M68HC05C8 = device_creator; +device_type const M68HC705C8A = device_creator; diff --git a/src/devices/cpu/m6809/hd6309.cpp b/src/devices/cpu/m6809/hd6309.cpp index d8227c6162f..25673b0d761 100644 --- a/src/devices/cpu/m6809/hd6309.cpp +++ b/src/devices/cpu/m6809/hd6309.cpp @@ -124,7 +124,7 @@ March 2013 NPW: // DEVICE INTERFACE //************************************************************************** -const device_type HD6309 = &device_creator; +const device_type HD6309 = device_creator; //------------------------------------------------- diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp index ba6acfe05a5..e8114c7e75d 100644 --- a/src/devices/cpu/m6809/konami.cpp +++ b/src/devices/cpu/m6809/konami.cpp @@ -77,7 +77,7 @@ March 2013 NPW: // DEVICE INTERFACE //************************************************************************** -const device_type KONAMI = &device_creator; +const device_type KONAMI = device_creator; //------------------------------------------------- diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index 27b15dc97a5..f3c6e1584ca 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -103,8 +103,8 @@ March 2013 NPW: // DEVICE INTERFACE //************************************************************************** -const device_type M6809 = &device_creator; -const device_type M6809E = &device_creator; +const device_type M6809 = device_creator; +const device_type M6809E = device_creator; //------------------------------------------------- diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp index d37ae61e740..3ba9afdc1ad 100644 --- a/src/devices/cpu/mb86233/mb86233.cpp +++ b/src/devices/cpu/mb86233/mb86233.cpp @@ -20,7 +20,7 @@ #include "mb86233.h" -const device_type MB86233 = &device_creator; +const device_type MB86233 = device_creator; mb86233_cpu_device::mb86233_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/mb86235/mb86235.cpp b/src/devices/cpu/mb86235/mb86235.cpp index 44a1d596310..c2a2d1e2c88 100644 --- a/src/devices/cpu/mb86235/mb86235.cpp +++ b/src/devices/cpu/mb86235/mb86235.cpp @@ -28,7 +28,7 @@ -const device_type MB86235 = &device_creator; +const device_type MB86235 = device_creator; static ADDRESS_MAP_START(internal_abus, AS_DATA, 32, mb86235_device) diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp index 0c3c8b70758..3d0b88b2382 100644 --- a/src/devices/cpu/mb88xx/mb88xx.cpp +++ b/src/devices/cpu/mb88xx/mb88xx.cpp @@ -20,13 +20,13 @@ #include "mb88xx.h" -const device_type MB88 = &device_creator; -const device_type MB88201 = &device_creator; -const device_type MB88202 = &device_creator; -const device_type MB8841 = &device_creator; -const device_type MB8842 = &device_creator; -const device_type MB8843 = &device_creator; -const device_type MB8844 = &device_creator; +const device_type MB88 = device_creator; +const device_type MB88201 = device_creator; +const device_type MB88202 = device_creator; +const device_type MB8841 = device_creator; +const device_type MB8842 = device_creator; +const device_type MB8843 = device_creator; +const device_type MB8844 = device_creator; /*************************************************************************** diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp index c8eeec1ca23..e4405d4c1ec 100644 --- a/src/devices/cpu/mc68hc11/mc68hc11.cpp +++ b/src/devices/cpu/mc68hc11/mc68hc11.cpp @@ -39,7 +39,7 @@ enum static const int div_tab[4] = { 1, 4, 8, 16 }; -const device_type MC68HC11 = &device_creator; +const device_type MC68HC11 = device_creator; mc68hc11_cpu_device::mc68hc11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp index 423c522c195..fd14f473852 100644 --- a/src/devices/cpu/mcs48/mcs48.cpp +++ b/src/devices/cpu/mcs48/mcs48.cpp @@ -149,25 +149,25 @@ T0 output clock -const device_type I8021 = &device_creator; -const device_type I8022 = &device_creator; -const device_type I8035 = &device_creator; -const device_type I8048 = &device_creator; -const device_type I8648 = &device_creator; -const device_type I8748 = &device_creator; -const device_type I8039 = &device_creator; -const device_type I8049 = &device_creator; -const device_type I8749 = &device_creator; -const device_type I8040 = &device_creator; -const device_type I8050 = &device_creator; -const device_type I8041 = &device_creator; -const device_type I8741 = &device_creator; -const device_type I8042 = &device_creator; -const device_type I8242 = &device_creator; -const device_type I8742 = &device_creator; -const device_type MB8884 = &device_creator; -const device_type N7751 = &device_creator; -const device_type M58715 = &device_creator; +const device_type I8021 = device_creator; +const device_type I8022 = device_creator; +const device_type I8035 = device_creator; +const device_type I8048 = device_creator; +const device_type I8648 = device_creator; +const device_type I8748 = device_creator; +const device_type I8039 = device_creator; +const device_type I8049 = device_creator; +const device_type I8749 = device_creator; +const device_type I8040 = device_creator; +const device_type I8050 = device_creator; +const device_type I8041 = device_creator; +const device_type I8741 = device_creator; +const device_type I8042 = device_creator; +const device_type I8242 = device_creator; +const device_type I8742 = device_creator; +const device_type MB8884 = device_creator; +const device_type N7751 = device_creator; +const device_type M58715 = device_creator; /*************************************************************************** diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp index 9540acb00a0..30ea8d0198c 100644 --- a/src/devices/cpu/mcs51/mcs51.cpp +++ b/src/devices/cpu/mcs51/mcs51.cpp @@ -221,20 +221,20 @@ enum }; -const device_type I8031 = &device_creator; -const device_type I8032 = &device_creator; -const device_type I8051 = &device_creator; -const device_type I8751 = &device_creator; -const device_type I8052 = &device_creator; -const device_type I8752 = &device_creator; -const device_type I80C31 = &device_creator; -const device_type I80C51 = &device_creator; -const device_type I87C51 = &device_creator; -const device_type I80C32 = &device_creator; -const device_type I80C52 = &device_creator; -const device_type I87C52 = &device_creator; -const device_type AT89C4051 = &device_creator; -const device_type DS5002FP = &device_creator; +const device_type I8031 = device_creator; +const device_type I8032 = device_creator; +const device_type I8051 = device_creator; +const device_type I8751 = device_creator; +const device_type I8052 = device_creator; +const device_type I8752 = device_creator; +const device_type I80C31 = device_creator; +const device_type I80C51 = device_creator; +const device_type I87C51 = device_creator; +const device_type I80C32 = device_creator; +const device_type I80C52 = device_creator; +const device_type I87C52 = device_creator; +const device_type AT89C4051 = device_creator; +const device_type DS5002FP = device_creator; /*************************************************************************** diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp index a1302b5c3d7..6f78e7d00a9 100644 --- a/src/devices/cpu/mcs96/i8x9x.cpp +++ b/src/devices/cpu/mcs96/i8x9x.cpp @@ -368,7 +368,7 @@ p8098_device::p8098_device(const machine_config &mconfig, const char *tag, devic { } -const device_type C8095 = &device_creator; -const device_type P8098 = &device_creator; +const device_type C8095 = device_creator; +const device_type P8098 = device_creator; #include "cpu/mcs96/i8x9x.hxx" diff --git a/src/devices/cpu/melps4/m58846.cpp b/src/devices/cpu/melps4/m58846.cpp index b581f689300..b4089356f28 100644 --- a/src/devices/cpu/melps4/m58846.cpp +++ b/src/devices/cpu/melps4/m58846.cpp @@ -10,7 +10,7 @@ #include "m58846.h" -const device_type M58846 = &device_creator; +const device_type M58846 = device_creator; // internal memory maps diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp index 307cf8d73c7..599c53bcb35 100644 --- a/src/devices/cpu/minx/minx.cpp +++ b/src/devices/cpu/minx/minx.cpp @@ -72,7 +72,7 @@ TODO: #define GET_MINX_PC ( ( m_PC & 0x8000 ) ? ( m_V << 15 ) | (m_PC & 0x7FFF ) : m_PC ) -const device_type MINX = &device_creator; +const device_type MINX = device_creator; minx_cpu_device::minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp index d2153b7b6e1..13e6f00715f 100644 --- a/src/devices/cpu/mips/mips3.cpp +++ b/src/devices/cpu/mips/mips3.cpp @@ -98,22 +98,22 @@ static const uint8_t fpmode_source[4] = #define ROPCODE(pc) direct->read_dword(pc) -const device_type VR4300BE = &device_creator; -const device_type VR4300LE = &device_creator; -const device_type VR4310BE = &device_creator; -const device_type VR4310LE = &device_creator; -const device_type R4600BE = &device_creator; -const device_type R4600LE = &device_creator; -const device_type R4650BE = &device_creator; -const device_type R4650LE = &device_creator; -const device_type R4700BE = &device_creator; -const device_type R4700LE = &device_creator; -const device_type R5000BE = &device_creator; -const device_type R5000LE = &device_creator; -const device_type QED5271BE = &device_creator; -const device_type QED5271LE = &device_creator; -const device_type RM7000BE = &device_creator; -const device_type RM7000LE = &device_creator; +const device_type VR4300BE = device_creator; +const device_type VR4300LE = device_creator; +const device_type VR4310BE = device_creator; +const device_type VR4310LE = device_creator; +const device_type R4600BE = device_creator; +const device_type R4600LE = device_creator; +const device_type R4650BE = device_creator; +const device_type R4650LE = device_creator; +const device_type R4700BE = device_creator; +const device_type R4700LE = device_creator; +const device_type R5000BE = device_creator; +const device_type R5000LE = device_creator; +const device_type QED5271BE = device_creator; +const device_type QED5271LE = device_creator; +const device_type RM7000BE = device_creator; +const device_type RM7000LE = device_creator; // VR4300 and VR5432 have 4 fewer PFN bits, and only 32 TLB entries diff --git a/src/devices/cpu/mips/r3000.cpp b/src/devices/cpu/mips/r3000.cpp index f959dd4485d..a1dbba4e008 100644 --- a/src/devices/cpu/mips/r3000.cpp +++ b/src/devices/cpu/mips/r3000.cpp @@ -113,11 +113,11 @@ // DEVICE INTERFACE //************************************************************************** -const device_type R3041 = &device_creator; -const device_type R3051 = &device_creator; -const device_type R3052 = &device_creator; -const device_type R3071 = &device_creator; -const device_type R3081 = &device_creator; +const device_type R3041 = device_creator; +const device_type R3051 = device_creator; +const device_type R3052 = device_creator; +const device_type R3071 = device_creator; +const device_type R3081 = device_creator; //------------------------------------------------- diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp index 77af7f4d180..634a2ff9a5c 100644 --- a/src/devices/cpu/mn10200/mn10200.cpp +++ b/src/devices/cpu/mn10200/mn10200.cpp @@ -36,7 +36,7 @@ enum mn10200_flag }; -const device_type MN1020012A = &device_creator; +const device_type MN1020012A = device_creator; // internal memory maps static ADDRESS_MAP_START( mn1020012a_internal_map, AS_PROGRAM, 16, mn10200_device ) diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp index c74885b445d..83c228f49f0 100644 --- a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp +++ b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp @@ -41,7 +41,7 @@ enum { #define NANO_E_BIT (NANO_DC0_BIT + HP_NANO_DC_NO) // Extend flag #define NANO_I_BIT (NANO_E_BIT + 1) // Interrupt flag -const device_type HP_NANOPROCESSOR = &device_creator; +const device_type HP_NANOPROCESSOR = device_creator; hp_nanoprocessor_device::hp_nanoprocessor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig , HP_NANOPROCESSOR , "HP-Nanoprocessor" , tag , owner , clock , "nanoprocessor" , __FILE__), diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp index 1211e59bbd7..10bab677918 100644 --- a/src/devices/cpu/nec/nec.cpp +++ b/src/devices/cpu/nec/nec.cpp @@ -115,10 +115,10 @@ typedef uint32_t DWORD; #include "nec.h" #include "necpriv.h" -const device_type V20 = &device_creator; -const device_type V30 = &device_creator; -const device_type V33 = &device_creator; -const device_type V33A =&device_creator; +const device_type V20 = device_creator; +const device_type V30 = device_creator; +const device_type V33 = device_creator; +const device_type V33A =device_creator; diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp index a7abd58133e..bc1c944d34f 100644 --- a/src/devices/cpu/nec/v25.cpp +++ b/src/devices/cpu/nec/v25.cpp @@ -46,8 +46,8 @@ typedef uint32_t DWORD; #include "v25priv.h" #include "nec_common.h" -const device_type V25 = &device_creator; -const device_type V35 = &device_creator; +const device_type V25 = device_creator; +const device_type V35 = device_creator; v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, bool is_16bit, offs_t fetch_xor, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t chip_type) diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp index f56974dda9e..c596d46d824 100644 --- a/src/devices/cpu/nec/v53.cpp +++ b/src/devices/cpu/nec/v53.cpp @@ -13,8 +13,8 @@ #include "v53.h" -const device_type V53 = &device_creator; -const device_type V53A =&device_creator; +const device_type V53 = device_creator; +const device_type V53A =device_creator; WRITE8_MEMBER(v53_base_device::BSEL_w) { diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp index 25538e62002..bd9479038d2 100644 --- a/src/devices/cpu/patinhofeio/patinho_feio.cpp +++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp @@ -49,7 +49,7 @@ void patinho_feio_cpu_device::compute_effective_address(unsigned int addr){ } } -const device_type PATO_FEIO_CPU = &device_creator; +const device_type PATO_FEIO_CPU = device_creator; //Internal 4kbytes of RAM static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device) diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h index 9460e49908d..d33069143f8 100644 --- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h +++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h @@ -1,10 +1,10 @@ // license:GPL-2.0+ // copyright-holders:Felipe Sanches -#pragma once - #ifndef MAME_DEVICES_CPU_PATINHOFEIO_CPU_H #define MAME_DEVICES_CPU_PATINHOFEIO_CPU_H +#pragma once + #define MCFG_PATINHO_RC_READ_CB(_devcb) \ devcb = &patinho_feio_cpu_device::set_rc_read_callback(*device, DEVCB_##_devcb); #define MCFG_PATINHO_BUTTONS_READ_CB(_devcb) \ diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp index 4f3d59f4b20..8ad561c18d8 100644 --- a/src/devices/cpu/pdp1/pdp1.cpp +++ b/src/devices/cpu/pdp1/pdp1.cpp @@ -377,7 +377,7 @@ #define PREVIOUS_PC ((PC & ADDRESS_EXTENSION_MASK) | ((PC-1) & BASE_ADDRESS_MASK)) -const device_type PDP1 = &device_creator; +const device_type PDP1 = device_creator; pdp1_device::pdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp index 3b7e9f47546..4ceb64a0bbe 100644 --- a/src/devices/cpu/pdp1/tx0.cpp +++ b/src/devices/cpu/pdp1/tx0.cpp @@ -40,8 +40,8 @@ #define INCREMENT_PC_8KW (PC = (PC+1) & ADDRESS_MASK_8KW) -const device_type TX0_8KW = &device_creator; -const device_type TX0_64KW = &device_creator; +const device_type TX0_8KW = device_creator; +const device_type TX0_64KW = device_creator; tx0_device::tx0_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, int addr_bits, int address_mask, int ir_mask) diff --git a/src/devices/cpu/pdp8/pdp8.cpp b/src/devices/cpu/pdp8/pdp8.cpp index d158786d553..8443a699ff8 100644 --- a/src/devices/cpu/pdp8/pdp8.cpp +++ b/src/devices/cpu/pdp8/pdp8.cpp @@ -44,7 +44,7 @@ CPU_DISASSEMBLE( pdp8 ); #define OPR_GROUP1_VAL 0000 #define OPR_GROUP2_VAL 0400 -const device_type PDP8CPU = &device_creator; +const device_type PDP8CPU = device_creator; //------------------------------------------------- // pdp8_device - constructor diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp index 4f639734b5d..3c36f681915 100644 --- a/src/devices/cpu/pic16c5x/pic16c5x.cpp +++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp @@ -76,14 +76,14 @@ #include "pic16c5x.h" -const device_type PIC16C54 = &device_creator; -const device_type PIC16C55 = &device_creator; -const device_type PIC16C56 = &device_creator; -const device_type PIC16C57 = &device_creator; -const device_type PIC16C58 = &device_creator; - -const device_type PIC1650 = &device_creator; -const device_type PIC1655 = &device_creator; +const device_type PIC16C54 = device_creator; +const device_type PIC16C55 = device_creator; +const device_type PIC16C56 = device_creator; +const device_type PIC16C57 = device_creator; +const device_type PIC16C58 = device_creator; + +const device_type PIC1650 = device_creator; +const device_type PIC1655 = device_creator; /**************************************************************************** diff --git a/src/devices/cpu/pic16c62x/pic16c62x.cpp b/src/devices/cpu/pic16c62x/pic16c62x.cpp index 06d44b9ed16..9901fedc3a0 100644 --- a/src/devices/cpu/pic16c62x/pic16c62x.cpp +++ b/src/devices/cpu/pic16c62x/pic16c62x.cpp @@ -57,12 +57,12 @@ #include "pic16c62x.h" -const device_type PIC16C620 = &device_creator; -const device_type PIC16C620A = &device_creator; -const device_type PIC16C621 = &device_creator; -const device_type PIC16C621A = &device_creator; -const device_type PIC16C622 = &device_creator; -const device_type PIC16C622A = &device_creator; +const device_type PIC16C620 = device_creator; +const device_type PIC16C620A = device_creator; +const device_type PIC16C621 = device_creator; +const device_type PIC16C621A = device_creator; +const device_type PIC16C622 = device_creator; +const device_type PIC16C622A = device_creator; diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp index bcdc17ae9a1..14c9f97a710 100644 --- a/src/devices/cpu/powerpc/ppccom.cpp +++ b/src/devices/cpu/powerpc/ppccom.cpp @@ -195,16 +195,16 @@ static const uint8_t fcmp_cr_table_source[32] = }; -const device_type PPC601 = &device_creator; -const device_type PPC602 = &device_creator; -const device_type PPC603 = &device_creator; -const device_type PPC603E = &device_creator; -const device_type PPC603R = &device_creator; -const device_type PPC604 = &device_creator; -const device_type MPC8240 = &device_creator; -const device_type PPC403GA = &device_creator; -const device_type PPC403GCX = &device_creator; -const device_type PPC405GP = &device_creator; +const device_type PPC601 = device_creator; +const device_type PPC602 = device_creator; +const device_type PPC603 = device_creator; +const device_type PPC603E = device_creator; +const device_type PPC603R = device_creator; +const device_type PPC604 = device_creator; +const device_type MPC8240 = device_creator; +const device_type PPC403GA = device_creator; +const device_type PPC403GCX = device_creator; +const device_type PPC405GP = device_creator; ppc_device::ppc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int address_bits, int data_bits, powerpc_flavor flavor, uint32_t cap, uint32_t tb_divisor, address_map_constructor internal_map) diff --git a/src/devices/cpu/pps4/pps4.cpp b/src/devices/cpu/pps4/pps4.cpp index dfef6287b72..cf7acd70a8d 100644 --- a/src/devices/cpu/pps4/pps4.cpp +++ b/src/devices/cpu/pps4/pps4.cpp @@ -89,8 +89,8 @@ #define LOG(x) #endif -const device_type PPS4 = &device_creator; -const device_type PPS4_2 = &device_creator; +const device_type PPS4 = device_creator; +const device_type PPS4_2 = device_creator; pps4_device::pps4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *file) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, file) diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp index 6a382689f40..44cca2aa00d 100644 --- a/src/devices/cpu/psx/dma.cpp +++ b/src/devices/cpu/psx/dma.cpp @@ -25,7 +25,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c } } -const device_type PSX_DMA = &device_creator; +const device_type PSX_DMA = device_creator; psxdma_device::psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PSX_DMA, "Sony PSX DMA", tag, owner, clock, "psxdma", __FILE__), m_ram( ), m_ramsize(0), m_dpcp(0), m_dicr(0), diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp index 06f1d345ac3..a06e83866a9 100644 --- a/src/devices/cpu/psx/irq.cpp +++ b/src/devices/cpu/psx/irq.cpp @@ -28,7 +28,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c } } -const device_type PSX_IRQ = &device_creator; +const device_type PSX_IRQ = device_creator; psxirq_device::psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PSX_IRQ, "Sony PSX IRQ", tag, owner, clock, "psxirq", __FILE__), n_irqdata(0), n_irqmask(0), diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp index c91c50d1d43..6398ecc0160 100644 --- a/src/devices/cpu/psx/mdec.cpp +++ b/src/devices/cpu/psx/mdec.cpp @@ -28,7 +28,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c } } -const device_type PSX_MDEC = &device_creator; +const device_type PSX_MDEC = device_creator; psxmdec_device::psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PSX_MDEC, "Sony PSX MDEC", tag, owner, clock, "psxmdec", __FILE__), n_decoded(0), n_offset(0), n_0_command(0), n_0_address(0), n_0_size(0), n_1_command(0), n_1_status(0) diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp index 839bead5b73..3eeb9914806 100644 --- a/src/devices/cpu/psx/psx.cpp +++ b/src/devices/cpu/psx/psx.cpp @@ -66,11 +66,12 @@ */ #include "emu.h" -#include "debugger.h" #include "psx.h" #include "mdec.h" #include "rcnt.h" #include "sound/spu.h" +#include "machine/ram.h" +#include "debugger.h" #define LOG_BIOSCALL ( 0 ) @@ -165,12 +166,12 @@ static const char *const delayn[] = }; // device type definition -const device_type CXD8530AQ = &device_creator; -const device_type CXD8530BQ = &device_creator; -const device_type CXD8530CQ = &device_creator; -const device_type CXD8661R = &device_creator; -const device_type CXD8606BQ = &device_creator; -const device_type CXD8606CQ = &device_creator; +const device_type CXD8530AQ = device_creator; +const device_type CXD8530BQ = device_creator; +const device_type CXD8530CQ = device_creator; +const device_type CXD8661R = device_creator; +const device_type CXD8606BQ = device_creator; +const device_type CXD8606CQ = device_creator; static const uint32_t mtc0_writemask[]= { diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index fd210ae3220..417eecaae1a 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -7,12 +7,11 @@ * */ -#pragma once +#ifndef MAME_DEVICES_CPU_PSX_PSX_H +#define MAME_DEVICES_CPU_PSX_PSX_H -#ifndef __PSXCPU_H__ -#define __PSXCPU_H__ +#pragma once -#include "machine/ram.h" #include "dma.h" #include "gte.h" #include "irq.h" @@ -134,10 +133,12 @@ enum // TYPE DEFINITIONS //************************************************************************** +class ram_device; + class psxcpu_state { public: - virtual ~psxcpu_state() {}; + virtual ~psxcpu_state() { } virtual uint32_t pc() = 0; virtual uint32_t delayr() = 0; @@ -147,13 +148,9 @@ public: // ======================> psxcpu_device -class psxcpu_device : public cpu_device, - psxcpu_state +class psxcpu_device : public cpu_device, psxcpu_state { public: - // construction/destruction - virtual ~psxcpu_device() {}; - // static configuration helpers template static devcb_base &set_gpu_read_handler(device_t &device, _Object object) { return downcast(device).m_gpu_read_handler.set_callback(object); } template static devcb_base &set_gpu_write_handler(device_t &device, _Object object) { return downcast(device).m_gpu_write_handler.set_callback(object); } @@ -523,4 +520,4 @@ extern const device_type CXD8606CQ; extern unsigned DasmPSXCPU(psxcpu_state *state, std::ostream &stream, uint32_t pc, const uint8_t *opram); -#endif /* __PSXCPU_H__ */ +#endif // MAME_DEVICES_CPU_PSX_PSX_H diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp index aeaf90488f9..c3b574e4c31 100644 --- a/src/devices/cpu/psx/rcnt.cpp +++ b/src/devices/cpu/psx/rcnt.cpp @@ -25,7 +25,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c } } -const device_type PSX_RCNT = &device_creator; +const device_type PSX_RCNT = device_creator; psxrcnt_device::psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PSX_RCNT, "Sony PSX RCNT", tag, owner, clock, "psxrcnt", __FILE__), diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index 270e44f2c2a..048ab52de88 100644 --- a/src/devices/cpu/psx/sio.cpp +++ b/src/devices/cpu/psx/sio.cpp @@ -25,8 +25,8 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c } } -const device_type PSX_SIO0 = &device_creator; -const device_type PSX_SIO1 = &device_creator; +const device_type PSX_SIO0 = device_creator; +const device_type PSX_SIO1 = device_creator; psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : psxsio_device(mconfig, PSX_SIO0, "Sony PSX SIO-0", tag, owner, clock, "psxsio0", __FILE__) diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp index 2745b22ae54..30a929d50e6 100644 --- a/src/devices/cpu/rsp/rsp.cpp +++ b/src/devices/cpu/rsp/rsp.cpp @@ -14,7 +14,7 @@ #include "rspcp2d.h" -const device_type RSP = &device_creator; +const device_type RSP = device_creator; #define LOG_INSTRUCTION_EXECUTION 0 diff --git a/src/devices/cpu/s2650/s2650.cpp b/src/devices/cpu/s2650/s2650.cpp index 65fe70fb13a..1eff9ebd2ff 100644 --- a/src/devices/cpu/s2650/s2650.cpp +++ b/src/devices/cpu/s2650/s2650.cpp @@ -26,7 +26,7 @@ #define INLINE_EA 1 -const device_type S2650 = &device_creator; +const device_type S2650 = device_creator; s2650_device::s2650_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/saturn/saturn.cpp b/src/devices/cpu/saturn/saturn.cpp index 324caee4a99..c77006fd97d 100644 --- a/src/devices/cpu/saturn/saturn.cpp +++ b/src/devices/cpu/saturn/saturn.cpp @@ -39,7 +39,7 @@ -const device_type SATURN = &device_creator; +const device_type SATURN = device_creator; saturn_device::saturn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp index 72843013855..3d095eba8e0 100644 --- a/src/devices/cpu/sc61860/sc61860.cpp +++ b/src/devices/cpu/sc61860/sc61860.cpp @@ -46,7 +46,7 @@ #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type SC61860 = &device_creator; +const device_type SC61860 = device_creator; sc61860_device::sc61860_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp index 49e5d737695..f04d5e01f87 100644 --- a/src/devices/cpu/scmp/scmp.cpp +++ b/src/devices/cpu/scmp/scmp.cpp @@ -17,8 +17,8 @@ #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type SCMP = &device_creator; -const device_type INS8060 = &device_creator; +const device_type SCMP = device_creator; +const device_type INS8060 = device_creator; scmp_device::scmp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/score/score.cpp b/src/devices/cpu/score/score.cpp index cafaf73eaa0..b24c7b2f941 100644 --- a/src/devices/cpu/score/score.cpp +++ b/src/devices/cpu/score/score.cpp @@ -16,7 +16,7 @@ // CONSTANTS //************************************************************************** -const device_type SCORE7 = &device_creator; +const device_type SCORE7 = device_creator; //************************************************************************** diff --git a/src/devices/cpu/scudsp/scudsp.cpp b/src/devices/cpu/scudsp/scudsp.cpp index 4d608b3b8d5..2da97c8cc7f 100644 --- a/src/devices/cpu/scudsp/scudsp.cpp +++ b/src/devices/cpu/scudsp/scudsp.cpp @@ -95,7 +95,7 @@ #include "scudsp.h" -const device_type SCUDSP = &device_creator; +const device_type SCUDSP = device_creator; /* FLAGS */ #define PRF m_flags & 0x04000000 diff --git a/src/devices/cpu/se3208/se3208.cpp b/src/devices/cpu/se3208/se3208.cpp index 32cbf4d224d..29d04d867e5 100644 --- a/src/devices/cpu/se3208/se3208.cpp +++ b/src/devices/cpu/se3208/se3208.cpp @@ -42,7 +42,7 @@ // are such accesses simply illegal, be handled in a different way, or simply not be happening in the first place? #define ALLOW_UNALIGNED_DWORD_ACCESS 0 -const device_type SE3208 = &device_creator; +const device_type SE3208 = device_creator; se3208_device::se3208_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp index ad000212a13..b4a10a079cc 100644 --- a/src/devices/cpu/sh2/sh2.cpp +++ b/src/devices/cpu/sh2/sh2.cpp @@ -122,9 +122,9 @@ #define COMPILE_MAX_SEQUENCE 64 -const device_type SH1 = &device_creator; -const device_type SH2 = &device_creator; -const device_type SH2A = &device_creator; +const device_type SH1 = device_creator; +const device_type SH2 = device_creator; +const device_type SH2A = device_creator; /*------------------------------------------------- sh2_internal_a5 - read handler for diff --git a/src/devices/cpu/sh2/sh7604_bus.cpp b/src/devices/cpu/sh2/sh7604_bus.cpp index 3d26c807a87..5052d4a41f1 100644 --- a/src/devices/cpu/sh2/sh7604_bus.cpp +++ b/src/devices/cpu/sh2/sh7604_bus.cpp @@ -23,7 +23,7 @@ //************************************************************************** // device type definition -const device_type SH7604_BUS = &device_creator; +const device_type SH7604_BUS = device_creator; //************************************************************************** diff --git a/src/devices/cpu/sh2/sh7604_sci.cpp b/src/devices/cpu/sh2/sh7604_sci.cpp index 632749f68f1..a20d3c3135a 100644 --- a/src/devices/cpu/sh2/sh7604_sci.cpp +++ b/src/devices/cpu/sh2/sh7604_sci.cpp @@ -22,7 +22,7 @@ //************************************************************************** // device type definition -const device_type SH7604_SCI = &device_creator; +const device_type SH7604_SCI = device_creator; //************************************************************************** diff --git a/src/devices/cpu/sh2/sh7604_wdt.cpp b/src/devices/cpu/sh2/sh7604_wdt.cpp index e128b692fa0..a396e2872f3 100644 --- a/src/devices/cpu/sh2/sh7604_wdt.cpp +++ b/src/devices/cpu/sh2/sh7604_wdt.cpp @@ -20,7 +20,7 @@ //************************************************************************** // device type definition -const device_type SH7604_WDT = &device_creator; +const device_type SH7604_WDT = device_creator; //************************************************************************** diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp index 43b0d669a42..1605d918aed 100644 --- a/src/devices/cpu/sh4/sh4.cpp +++ b/src/devices/cpu/sh4/sh4.cpp @@ -55,10 +55,10 @@ CPU_DISASSEMBLE( sh4 ); CPU_DISASSEMBLE( sh4be ); -const device_type SH3LE = &device_creator; -const device_type SH3BE = &device_creator; -const device_type SH4LE = &device_creator; -const device_type SH4BE = &device_creator; +const device_type SH3LE = device_creator; +const device_type SH3BE = device_creator; +const device_type SH4LE = device_creator; +const device_type SH4BE = device_creator; #if 0 diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp index bfca22096c2..1b49b409e00 100644 --- a/src/devices/cpu/sharc/sharc.cpp +++ b/src/devices/cpu/sharc/sharc.cpp @@ -52,7 +52,7 @@ enum SHARC_B12, SHARC_B13, SHARC_B14, SHARC_B15 }; -const device_type ADSP21062 = &device_creator; +const device_type ADSP21062 = device_creator; static ADDRESS_MAP_START( internal_pgm, AS_PROGRAM, 64, adsp21062_device ) AM_RANGE(0x20000, 0x24fff) AM_READWRITE(pm0_r, pm0_w) diff --git a/src/devices/cpu/sm510/kb1013vk1-2core.cpp b/src/devices/cpu/sm510/kb1013vk1-2core.cpp index 85fd4b74a81..c7c70d28001 100644 --- a/src/devices/cpu/sm510/kb1013vk1-2core.cpp +++ b/src/devices/cpu/sm510/kb1013vk1-2core.cpp @@ -11,7 +11,7 @@ #include "debugger.h" // MCU types -const device_type KB1013VK12 = &device_creator; +const device_type KB1013VK12 = device_creator; // internal memory maps diff --git a/src/devices/cpu/sm510/sm500core.cpp b/src/devices/cpu/sm510/sm500core.cpp index 5e6041831a2..d25eaf9c673 100644 --- a/src/devices/cpu/sm510/sm500core.cpp +++ b/src/devices/cpu/sm510/sm500core.cpp @@ -12,7 +12,7 @@ // MCU types -const device_type SM500 = &device_creator; +const device_type SM500 = device_creator; // internal memory maps diff --git a/src/devices/cpu/sm510/sm510core.cpp b/src/devices/cpu/sm510/sm510core.cpp index 323d2eb84e4..a531fc37e69 100644 --- a/src/devices/cpu/sm510/sm510core.cpp +++ b/src/devices/cpu/sm510/sm510core.cpp @@ -12,7 +12,7 @@ // MCU types -const device_type SM510 = &device_creator; +const device_type SM510 = device_creator; // internal memory maps diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp index f71e93a968e..1c40e781764 100644 --- a/src/devices/cpu/sm510/sm511core.cpp +++ b/src/devices/cpu/sm510/sm511core.cpp @@ -12,8 +12,8 @@ // MCU types -const device_type SM511 = &device_creator; -const device_type SM512 = &device_creator; +const device_type SM511 = device_creator; +const device_type SM512 = device_creator; // internal memory maps diff --git a/src/devices/cpu/sm8500/sm8500.cpp b/src/devices/cpu/sm8500/sm8500.cpp index 90aaaaf6ed6..e6dc66e6ec5 100644 --- a/src/devices/cpu/sm8500/sm8500.cpp +++ b/src/devices/cpu/sm8500/sm8500.cpp @@ -24,7 +24,7 @@ they are internally. #include "sm8500.h" -const device_type SM8500 = &device_creator; +const device_type SM8500 = device_creator; static const uint8_t sm8500_b2w[8] = { diff --git a/src/devices/cpu/sparc/mb86901.cpp b/src/devices/cpu/sparc/mb86901.cpp index 3fc1eca330d..69142f5e474 100644 --- a/src/devices/cpu/sparc/mb86901.cpp +++ b/src/devices/cpu/sparc/mb86901.cpp @@ -22,7 +22,7 @@ #include "sparc.h" #include "sparcdefs.h" -const device_type MB86901 = &device_creator; +const device_type MB86901 = device_creator; const int mb86901_device::NWINDOWS = 7; diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp index 1668be70617..15700512a6e 100644 --- a/src/devices/cpu/spc700/spc700.cpp +++ b/src/devices/cpu/spc700/spc700.cpp @@ -216,7 +216,7 @@ static inline int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;} -const device_type SPC700 = &device_creator; +const device_type SPC700 = device_creator; spc700_device::spc700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp index c2f462a6738..92c85220bdf 100644 --- a/src/devices/cpu/ssem/ssem.cpp +++ b/src/devices/cpu/ssem/ssem.cpp @@ -76,7 +76,7 @@ inline void ssem_device::program_write32(uint32_t address, uint32_t data) /*****************************************************************************/ -const device_type SSEMCPU = &device_creator; +const device_type SSEMCPU = device_creator; //------------------------------------------------- // ssem_device - constructor diff --git a/src/devices/cpu/ssp1601/ssp1601.cpp b/src/devices/cpu/ssp1601/ssp1601.cpp index 25005fd8701..4f000067e38 100644 --- a/src/devices/cpu/ssp1601/ssp1601.cpp +++ b/src/devices/cpu/ssp1601/ssp1601.cpp @@ -189,7 +189,7 @@ #endif -const device_type SSP1601 = &device_creator; +const device_type SSP1601 = device_creator; ssp1601_device::ssp1601_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/superfx/superfx.cpp b/src/devices/cpu/superfx/superfx.cpp index 7ed250b49f4..d9487630348 100644 --- a/src/devices/cpu/superfx/superfx.cpp +++ b/src/devices/cpu/superfx/superfx.cpp @@ -5,7 +5,7 @@ #include "superfx.h" -const device_type SUPERFX = &device_creator; +const device_type SUPERFX = device_creator; superfx_device::superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig, SUPERFX, "SuperFX", tag, owner, clock, "superfx", __FILE__) diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp index 5c889099cd7..f02649af571 100644 --- a/src/devices/cpu/t11/t11.cpp +++ b/src/devices/cpu/t11/t11.cpp @@ -35,8 +35,8 @@ #define PSW m_psw.b.l -const device_type T11 = &device_creator; -const device_type K1801VM2 = &device_creator; +const device_type T11 = device_creator; +const device_type K1801VM2 = device_creator; k1801vm2_device::k1801vm2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/tlcs870/tlcs870.cpp b/src/devices/cpu/tlcs870/tlcs870.cpp index f8e47f28e81..440b8108ccf 100644 --- a/src/devices/cpu/tlcs870/tlcs870.cpp +++ b/src/devices/cpu/tlcs870/tlcs870.cpp @@ -96,7 +96,7 @@ static const char *const reg16p[] = { -const device_type TMP87PH40AN = &device_creator; +const device_type TMP87PH40AN = device_creator; static ADDRESS_MAP_START(tmp87ph40an_mem, AS_PROGRAM, 8, tlcs870_device) #if 0 diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp index f7e81101c98..973b29579bf 100644 --- a/src/devices/cpu/tlcs90/tlcs90.cpp +++ b/src/devices/cpu/tlcs90/tlcs90.cpp @@ -21,11 +21,11 @@ static const char *const op_names[] = { "??", "nop", "ex", "exx", ALLOW_SAVE_TYPE(tlcs90_device::e_mode); // allow save_item on a non-fundamental type -const device_type TMP90840 = &device_creator; -const device_type TMP90841 = &device_creator; -const device_type TMP90845 = &device_creator; -const device_type TMP91640 = &device_creator; -const device_type TMP91641 = &device_creator; +const device_type TMP90840 = device_creator; +const device_type TMP90841 = device_creator; +const device_type TMP90845 = device_creator; +const device_type TMP91640 = device_creator; +const device_type TMP91641 = device_creator; static ADDRESS_MAP_START(tmp90840_mem, AS_PROGRAM, 8, tlcs90_device) diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp index 9b87d5f54b4..96031d0637e 100644 --- a/src/devices/cpu/tlcs900/tlcs900.cpp +++ b/src/devices/cpu/tlcs900/tlcs900.cpp @@ -20,8 +20,8 @@ TODO: #include "tlcs900.h" -const device_type TMP95C061 = &device_creator; -const device_type TMP95C063 = &device_creator; +const device_type TMP95C061 = device_creator; +const device_type TMP95C063 = device_creator; static ADDRESS_MAP_START( tmp95c061_mem8, AS_PROGRAM, 8, tmp95c061_device ) diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp index 48d6aa516d0..c7dec0f2544 100644 --- a/src/devices/cpu/tms1000/tms0270.cpp +++ b/src/devices/cpu/tms1000/tms0270.cpp @@ -15,7 +15,7 @@ // - 64-term microinstructions PLA between the RAM and ROM, similar to TMS0980, // plus optional separate lines for custom opcode handling // - 48-term output PLA above the RAM (rotate opla 90 degrees) -const device_type TMS0270 = &device_creator; // 40-pin DIP, 16 O pins, 8+ R pins (some R pins are internally hooked up to support more I/O) +const device_type TMS0270 = device_creator; // 40-pin DIP, 16 O pins, 8+ R pins (some R pins are internally hooked up to support more I/O) // newer TMS0270 chips (eg. Speak & Math) have 42 pins // TMS0260 is same or similar? diff --git a/src/devices/cpu/tms1000/tms0970.cpp b/src/devices/cpu/tms1000/tms0970.cpp index 6bf398272e0..c4fbd7618df 100644 --- a/src/devices/cpu/tms1000/tms0970.cpp +++ b/src/devices/cpu/tms1000/tms0970.cpp @@ -13,7 +13,7 @@ // TMS0950 is a TMS1000 with a TMS0980 style opla, it was quickly succeeded by the TMS0970 // - RAM, ROM, microinstructions is the same as TMS1000 // - 10-term inverted output PLA and segment PLA on the top-left -const device_type TMS0950 = &device_creator; // 28-pin DIP, 8 O pins, 11? R pins +const device_type TMS0950 = device_creator; // 28-pin DIP, 8 O pins, 11? R pins // TMS0970 is a stripped-down version of the TMS0980, itself acting more like a TMS1000 // - RAM and ROM is the same as TMS1000 @@ -22,8 +22,8 @@ const device_type TMS0950 = &device_creator; // 28-pin DIP, // RETN, SETR, RBIT, SBIT, LDX, COMX, TDO, ..., redir(----0-00), LDP // - 32-term microinstructions PLA between the RAM and ROM, supporting 15 microinstructions // - 16-term inverted output PLA and segment PLA above the RAM (rotate opla 90 degrees) -const device_type TMS0970 = &device_creator; // 28-pin DIP, 11 R pins (note: pinout may slightly differ from chip to chip) -const device_type TMS1990 = &device_creator; // 28-pin DIP, ? R pins.. +const device_type TMS0970 = device_creator; // 28-pin DIP, 11 R pins (note: pinout may slightly differ from chip to chip) +const device_type TMS1990 = device_creator; // 28-pin DIP, ? R pins.. // internal memory maps diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp index 0057db927a2..b9bef8d3cf8 100644 --- a/src/devices/cpu/tms1000/tms0980.cpp +++ b/src/devices/cpu/tms1000/tms0980.cpp @@ -20,13 +20,13 @@ // TDO, SBIT, RETN, SETR, REAC, XDA, SAL, RBIT, ..., OFF, SBL, LDP, redir(------00- + R0^BL) // - 64-term microinstructions PLA between the RAM and ROM, supporting 20 microinstructions // - 16-term inverted output PLA and segment PLA above the RAM (rotate opla 90 degrees) -const device_type TMS0980 = &device_creator; // 28-pin DIP, 9 R pins +const device_type TMS0980 = device_creator; // 28-pin DIP, 9 R pins // TMS1980 is a TMS0980 with a TMS1x00 style opla // - RAM, ROM, and main instructions PLAs is the same as TMS0980 // - one of the microinstructions redirects to a RSTR instruction, like on TMS0270 // - 32-term inverted output PLA above the RAM, 7 bits! (rotate opla 270 degrees) -const device_type TMS1980 = &device_creator; // 28-pin DIP, 7 O pins, 10 R pins, high voltage +const device_type TMS1980 = device_creator; // 28-pin DIP, 7 O pins, 10 R pins, high voltage // internal memory maps diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp index 2f97dedd360..a1b543a846c 100644 --- a/src/devices/cpu/tms1000/tms1000.cpp +++ b/src/devices/cpu/tms1000/tms1000.cpp @@ -19,13 +19,13 @@ // - 30-term microinstructions PLA(mpla) at the top half, to the right of the midline, supporting 16 microinstructions // - 20-term output PLA(opla) at the top-left // - the ALU is between the opla and mpla -const device_type TMS1000 = &device_creator; // 28-pin DIP, 11 R pins -const device_type TMS1070 = &device_creator; // high voltage version -const device_type TMS1040 = &device_creator; // same as TMS1070 with just a different pinout? -const device_type TMS1200 = &device_creator; // 40-pin DIP, 13 R pins +const device_type TMS1000 = device_creator; // 28-pin DIP, 11 R pins +const device_type TMS1070 = device_creator; // high voltage version +const device_type TMS1040 = device_creator; // same as TMS1070 with just a different pinout? +const device_type TMS1200 = device_creator; // 40-pin DIP, 13 R pins // TMS1270 has 10 O pins, how does that work? -const device_type TMS1700 = &device_creator; // 28-pin DIP, RAM/ROM size halved, 9 R pins -const device_type TMS1730 = &device_creator; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins(output PLA is still 8-bit, O1,O3,O5 unused) +const device_type TMS1700 = device_creator; // 28-pin DIP, RAM/ROM size halved, 9 R pins +const device_type TMS1730 = device_creator; // 20-pin DIP, same die as TMS1700, package has less pins: 6 R pins, 5 O pins(output PLA is still 8-bit, O1,O3,O5 unused) // internal memory maps diff --git a/src/devices/cpu/tms1000/tms1100.cpp b/src/devices/cpu/tms1000/tms1100.cpp index a49469aa920..781998ffc07 100644 --- a/src/devices/cpu/tms1000/tms1100.cpp +++ b/src/devices/cpu/tms1000/tms1100.cpp @@ -11,10 +11,10 @@ #include "debugger.h" // TMS1100 is nearly the same as TMS1000, some different opcodes, and with double the RAM and ROM -const device_type TMS1100 = &device_creator; // 28-pin DIP, 11 R pins -const device_type TMS1170 = &device_creator; // high voltage version -const device_type TMS1300 = &device_creator; // 40-pin DIP, 16 R pins -const device_type TMS1370 = &device_creator; // high voltage version +const device_type TMS1100 = device_creator; // 28-pin DIP, 11 R pins +const device_type TMS1170 = device_creator; // high voltage version +const device_type TMS1300 = device_creator; // 40-pin DIP, 16 R pins +const device_type TMS1370 = device_creator; // high voltage version // internal memory maps diff --git a/src/devices/cpu/tms1000/tms1400.cpp b/src/devices/cpu/tms1000/tms1400.cpp index ece13f4968e..46b0271c54c 100644 --- a/src/devices/cpu/tms1000/tms1400.cpp +++ b/src/devices/cpu/tms1000/tms1400.cpp @@ -16,14 +16,14 @@ // TMS1400 follows the TMS1100, it doubles the ROM size again (4 chapters of 16 pages), and adds a 3-level callstack // - rotate the view and mirror the OR-mask to get the proper layout of the mpla, the default is identical to tms1100 // - the opla size is increased from 20 to 32 terms -const device_type TMS1400 = &device_creator; // 28-pin DIP, 11 R pins (TMS1400CR is same, but with TMS1100 pinout) -const device_type TMS1470 = &device_creator; // high voltage version, 1 R pin removed for Vdd +const device_type TMS1400 = device_creator; // 28-pin DIP, 11 R pins (TMS1400CR is same, but with TMS1100 pinout) +const device_type TMS1470 = device_creator; // high voltage version, 1 R pin removed for Vdd // TMS1600 adds more I/O to the TMS1400, input pins are doubled with added L1,2,4,8 // - rotate the view and mirror the OR-mask to get the proper layout of the mpla, the default is identical to tms1100 // - the opla size is increased from 20 to 32 terms -const device_type TMS1600 = &device_creator; // 40-pin DIP, 16 R pins -const device_type TMS1670 = &device_creator; // high voltage version +const device_type TMS1600 = device_creator; // 40-pin DIP, 16 R pins +const device_type TMS1670 = device_creator; // high voltage version // internal memory maps diff --git a/src/devices/cpu/tms1000/tp0320.cpp b/src/devices/cpu/tms1000/tp0320.cpp index f6b162ca728..c5118781499 100644 --- a/src/devices/cpu/tms1000/tp0320.cpp +++ b/src/devices/cpu/tms1000/tp0320.cpp @@ -22,7 +22,7 @@ // - 64-term microinstructions PLA between the RAM and ROM, similar to TMS0980, // plus separate lines for custom opcode handling like TMS0270, used for SETR and RSTR // - 24-term output PLA above LCD RAM -const device_type TP0320 = &device_creator; // 28-pin SDIP, .. +const device_type TP0320 = device_creator; // 28-pin SDIP, .. // internal memory maps diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp index 76d178b5c73..19e9efb8e2b 100644 --- a/src/devices/cpu/tms32010/tms32010.cpp +++ b/src/devices/cpu/tms32010/tms32010.cpp @@ -73,9 +73,9 @@ #define P_OUT(A,V) TMS32010_Out(A,V) -const device_type TMS32010 = &device_creator; -const device_type TMS32015 = &device_creator; -const device_type TMS32016 = &device_creator; +const device_type TMS32010 = device_creator; +const device_type TMS32015 = device_creator; +const device_type TMS32016 = device_creator; /**************************************************************************** diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp index 5abbd29aa96..3bc8d77938e 100644 --- a/src/devices/cpu/tms32025/tms32025.cpp +++ b/src/devices/cpu/tms32025/tms32025.cpp @@ -183,8 +183,8 @@ Table 3-2. TMS32025/26 Memory Blocks #define IND m_AR[ARP] /* address used in indirect memory access operations */ -const device_type TMS32025 = &device_creator; -const device_type TMS32026 = &device_creator; +const device_type TMS32025 = device_creator; +const device_type TMS32026 = device_creator; static ADDRESS_MAP_START( tms32025_data, AS_DATA, 16, tms32025_device ) AM_RANGE(0x0000, 0x0000) AM_READWRITE(drr_r, drr_w) diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp index 6f957b685f5..58cbccdebf5 100644 --- a/src/devices/cpu/tms32031/tms32031.cpp +++ b/src/devices/cpu/tms32031/tms32031.cpp @@ -87,8 +87,8 @@ const int GIEFLAG = 0x2000; //************************************************************************** // device type definition -const device_type TMS32031 = &device_creator; -const device_type TMS32032 = &device_creator; +const device_type TMS32031 = device_creator; +const device_type TMS32032 = device_creator; // internal memory maps diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp index fee1df7fdc8..54c53659b61 100644 --- a/src/devices/cpu/tms32051/tms32051.cpp +++ b/src/devices/cpu/tms32051/tms32051.cpp @@ -46,8 +46,8 @@ enum }; -const device_type TMS32051 = &device_creator; -const device_type TMS32053 = &device_creator; +const device_type TMS32051 = device_creator; +const device_type TMS32053 = device_creator; /************************************************************************** diff --git a/src/devices/cpu/tms32082/tms32082.cpp b/src/devices/cpu/tms32082/tms32082.cpp index 1540fdc03a2..de23e2f7736 100644 --- a/src/devices/cpu/tms32082/tms32082.cpp +++ b/src/devices/cpu/tms32082/tms32082.cpp @@ -14,8 +14,8 @@ extern CPU_DISASSEMBLE(tms32082_mp); extern CPU_DISASSEMBLE(tms32082_pp); -const device_type TMS32082_MP = &device_creator; -const device_type TMS32082_PP = &device_creator; +const device_type TMS32082_MP = device_creator; +const device_type TMS32082_PP = device_creator; diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp index 23b181147a6..cf2de1129c0 100644 --- a/src/devices/cpu/tms34010/tms34010.cpp +++ b/src/devices/cpu/tms34010/tms34010.cpp @@ -10,9 +10,11 @@ ***************************************************************************/ #include "emu.h" -#include "debugger.h" #include "tms34010.h" +#include "debugger.h" +#include "screen.h" + /*************************************************************************** DEBUG STATE & STRUCTURES @@ -25,8 +27,8 @@ #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type TMS34010 = &device_creator; -const device_type TMS34020 = &device_creator; +const device_type TMS34010 = device_creator; +const device_type TMS34020 = device_creator; /*************************************************************************** diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp index e39b7766107..88e49847b80 100644 --- a/src/devices/cpu/tms57002/tms57002.cpp +++ b/src/devices/cpu/tms57002/tms57002.cpp @@ -13,7 +13,7 @@ #include "debugger.h" #include "tms57002.h" -const device_type TMS57002 = &device_creator; +const device_type TMS57002 = device_creator; // Can't use a DEVICE_ADDRESS_MAP, not yet anyway static ADDRESS_MAP_START(internal_pgm, AS_PROGRAM, 32, tms57002_device) diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp index a064d0fc9ad..e0069300f6d 100644 --- a/src/devices/cpu/tms7000/tms7000.cpp +++ b/src/devices/cpu/tms7000/tms7000.cpp @@ -22,29 +22,29 @@ // TMS7000 is the most basic one, 128 bytes internal RAM and no internal ROM. // TMS7020 and TMS7040 are same, but with 2KB and 4KB internal ROM respectively. -const device_type TMS7000 = &device_creator; -const device_type TMS7020 = &device_creator; -const device_type TMS7040 = &device_creator; +const device_type TMS7000 = device_creator; +const device_type TMS7020 = device_creator; +const device_type TMS7040 = device_creator; // Exelvision (spinoff of TI) TMS7020 added one custom opcode. -const device_type TMS7020_EXL = &device_creator; +const device_type TMS7020_EXL = device_creator; // CMOS devices biggest difference in a 'real world' setting is that the power // requirements are much lower. This obviously has no use in software emulation. -const device_type TMS70C00 = &device_creator; -const device_type TMS70C20 = &device_creator; -const device_type TMS70C40 = &device_creator; +const device_type TMS70C00 = device_creator; +const device_type TMS70C20 = device_creator; +const device_type TMS70C40 = device_creator; // TMS70x1 features more peripheral I/O, the main addition being a serial port. // TMS70x2 is the same, just with twice more RAM (256 bytes) -const device_type TMS7001 = &device_creator; -const device_type TMS7041 = &device_creator; -const device_type TMS7002 = &device_creator; -const device_type TMS7042 = &device_creator; +const device_type TMS7001 = device_creator; +const device_type TMS7041 = device_creator; +const device_type TMS7002 = device_creator; +const device_type TMS7042 = device_creator; // TMS70C46 is literally a shell around a TMS70C40, with support for external // memory bus, auto external clock divider on slow memory, and wake-up on keypress. -const device_type TMS70C46 = &device_creator; +const device_type TMS70C46 = device_creator; // TMS70Cx2 is an update to TMS70x2 with some extra features. Due to some changes // in peripheral file I/O, it is not backward compatible to TMS70x2. diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp index 586f8bee8c9..9fafeb11563 100644 --- a/src/devices/cpu/tms9900/ti990_10.cpp +++ b/src/devices/cpu/tms9900/ti990_10.cpp @@ -147,4 +147,4 @@ offs_t ti990_10_device::disasm_disassemble(std::ostream &stream, offs_t pc, cons return CPU_DISASSEMBLE_NAME(tms9900)(this, stream, pc, oprom, opram, options); } -const device_type TI990_10 = &device_creator; +const device_type TI990_10 = device_creator; diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp index 5181d9cd1c7..4b057b8f4f7 100644 --- a/src/devices/cpu/tms9900/tms9900.cpp +++ b/src/devices/cpu/tms9900/tms9900.cpp @@ -2777,4 +2777,4 @@ offs_t tms99xx_device::disasm_disassemble(std::ostream &stream, offs_t pc, const } -const device_type TMS9900 = &device_creator; +const device_type TMS9900 = device_creator; diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp index 46c76797d81..54459206715 100644 --- a/src/devices/cpu/tms9900/tms9980a.cpp +++ b/src/devices/cpu/tms9900/tms9980a.cpp @@ -298,4 +298,4 @@ offs_t tms9980a_device::disasm_disassemble(std::ostream &stream, offs_t pc, cons return CPU_DISASSEMBLE_NAME(tms9980)(this, stream, pc, oprom, opram, options); } -const device_type TMS9980A = &device_creator; +const device_type TMS9980A = device_creator; diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp index ec12a230276..556dfb09694 100644 --- a/src/devices/cpu/tms9900/tms9995.cpp +++ b/src/devices/cpu/tms9900/tms9995.cpp @@ -3556,5 +3556,5 @@ offs_t tms9995_device::disasm_disassemble(std::ostream &stream, offs_t pc, const } -const device_type TMS9995 = &device_creator; -const device_type TMS9995_MP9537 = &device_creator; +const device_type TMS9995 = device_creator; +const device_type TMS9995_MP9537 = device_creator; diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp index 3d2b164672f..551b2d437e6 100644 --- a/src/devices/cpu/ucom4/ucom4.cpp +++ b/src/devices/cpu/ucom4/ucom4.cpp @@ -26,12 +26,12 @@ // uCOM-43 products: 2000x8 ROM, RAM size custom, supports full instruction set -const device_type NEC_D553 = &device_creator; // 42-pin PMOS, 35 pins for I/O, Open Drain output, 96x4 RAM -const device_type NEC_D557L = &device_creator; // 28-pin PMOS, 21 pins for I/O, Open Drain output, 96x4 RAM -const device_type NEC_D650 = &device_creator; // 42-pin CMOS, 35 pins for I/O, push-pull output, 96x4 RAM +const device_type NEC_D553 = device_creator; // 42-pin PMOS, 35 pins for I/O, Open Drain output, 96x4 RAM +const device_type NEC_D557L = device_creator; // 28-pin PMOS, 21 pins for I/O, Open Drain output, 96x4 RAM +const device_type NEC_D650 = device_creator; // 42-pin CMOS, 35 pins for I/O, push-pull output, 96x4 RAM // uCOM-44 products: 1000x8 ROM, 64x4 RAM, does not support external interrupt -const device_type NEC_D552 = &device_creator; // 42-pin PMOS, 35 pins for I/O, Open Drain output +const device_type NEC_D552 = device_creator; // 42-pin PMOS, 35 pins for I/O, Open Drain output // uCOM-45 products: ROM size custom, 32x4 RAM //.. diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp index 1d40ba330ee..e33ec57d580 100644 --- a/src/devices/cpu/unsp/unsp.cpp +++ b/src/devices/cpu/unsp/unsp.cpp @@ -13,7 +13,7 @@ #include "unsp.h" -const device_type UNSP = &device_creator; +const device_type UNSP = device_creator; unsp_device::unsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp index d50ff1762c3..2b8ce34595b 100644 --- a/src/devices/cpu/upd7725/upd7725.cpp +++ b/src/devices/cpu/upd7725/upd7725.cpp @@ -21,8 +21,8 @@ //************************************************************************** // device type definition -const device_type UPD7725 = &device_creator; -const device_type UPD96050 = &device_creator; +const device_type UPD7725 = device_creator; +const device_type UPD96050 = device_creator; necdsp_device::necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t abits, uint32_t dbits, const char *name, const char *shortname, const char *source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp index 4f78ad642a0..888e90824fb 100644 --- a/src/devices/cpu/upd7810/upd7810.cpp +++ b/src/devices/cpu/upd7810/upd7810.cpp @@ -374,11 +374,11 @@ STOP 01001000 10111011 12 stop #include "upd7810_macros.h" -const device_type UPD7810 = &device_creator; -const device_type UPD7807 = &device_creator; -const device_type UPD7801 = &device_creator; -const device_type UPD78C05 = &device_creator; -const device_type UPD78C06 = &device_creator; +const device_type UPD7810 = device_creator; +const device_type UPD7807 = device_creator; +const device_type UPD7801 = device_creator; +const device_type UPD78C05 = device_creator; +const device_type UPD78C06 = device_creator; upd7810_device::upd7810_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) diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp index 6781756a58c..ca4ca40a0f7 100644 --- a/src/devices/cpu/v30mz/v30mz.cpp +++ b/src/devices/cpu/v30mz/v30mz.cpp @@ -94,7 +94,7 @@ enum BREGS { /***************************************************************************/ -const device_type V30MZ = &device_creator; +const device_type V30MZ = device_creator; v30mz_cpu_device::v30mz_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp index 8fee43ffa58..1d0bf2641ae 100644 --- a/src/devices/cpu/v60/v60.cpp +++ b/src/devices/cpu/v60/v60.cpp @@ -77,8 +77,8 @@ Package: 132-pin PGA, 200-pin QFP #include "debugger.h" #include "v60.h" -const device_type V60 = &device_creator; -const device_type V70 = &device_creator; +const device_type V60 = device_creator; +const device_type V70 = device_creator; v60_device::v60_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/v810/v810.cpp b/src/devices/cpu/v810/v810.cpp index 4243aab92ab..a9d5fe08053 100644 --- a/src/devices/cpu/v810/v810.cpp +++ b/src/devices/cpu/v810/v810.cpp @@ -35,7 +35,7 @@ #define clkMEM 3 -const device_type V810 = &device_creator; +const device_type V810 = device_creator; v810_device::v810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp index a9ba848ebdd..1c7d58dff75 100644 --- a/src/devices/cpu/z180/z180.cpp +++ b/src/devices/cpu/z180/z180.cpp @@ -78,7 +78,7 @@ Hitachi HD647180 series: /* register is calculated as follows: refresh=(Regs.R&127)|(Regs.R2&128) */ /****************************************************************************/ -const device_type Z180 = &device_creator; +const device_type Z180 = device_creator; z180_device::z180_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp index 19e27a4070c..d29a5d9f081 100644 --- a/src/devices/cpu/z8/z8.cpp +++ b/src/devices/cpu/z8/z8.cpp @@ -152,9 +152,9 @@ enum #define PRE1 m_r[Z8_REGISTER_PRE1] -const device_type Z8601 = &device_creator; -const device_type UB8830D = &device_creator; -const device_type Z8611 = &device_creator; +const device_type Z8601 = device_creator; +const device_type UB8830D = device_creator; +const device_type Z8611 = device_creator; /*************************************************************************** diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp index fcf8f577a27..6a16ca22bf6 100644 --- a/src/devices/cpu/z80/kl5c80a12.cpp +++ b/src/devices/cpu/z80/kl5c80a12.cpp @@ -16,7 +16,7 @@ #include "emu.h" #include "kl5c80a12.h" -const device_type KL5C80A12 = &device_creator; +const device_type KL5C80A12 = device_creator; kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp index 2ae617f502d..2f24b48ab2d 100644 --- a/src/devices/cpu/z80/tmpz84c011.cpp +++ b/src/devices/cpu/z80/tmpz84c011.cpp @@ -13,7 +13,7 @@ #include "emu.h" #include "tmpz84c011.h" -const device_type TMPZ84C011 = &device_creator; +const device_type TMPZ84C011 = device_creator; static ADDRESS_MAP_START( tmpz84c011_internal_io_map, AS_IO, 8, tmpz84c011_device ) AM_RANGE(0x10, 0x13) AM_MIRROR(0xff00) AM_DEVREADWRITE("tmpz84c011_ctc", z80ctc_device, read, write) diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp index b00a7013b5d..27021fc596e 100644 --- a/src/devices/cpu/z80/tmpz84c015.cpp +++ b/src/devices/cpu/z80/tmpz84c015.cpp @@ -15,7 +15,7 @@ #include "emu.h" #include "tmpz84c015.h" -const device_type TMPZ84C015 = &device_creator; +const device_type TMPZ84C015 = device_creator; static ADDRESS_MAP_START( tmpz84c015_internal_io_map, AS_IO, 8, tmpz84c015_device ) AM_RANGE(0x10, 0x13) AM_MIRROR(0xff00) AM_DEVREADWRITE("tmpz84c015_ctc", z80ctc_device, read, write) diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp index cb0848bda9c..fcfbcb264e0 100644 --- a/src/devices/cpu/z80/z80.cpp +++ b/src/devices/cpu/z80/z80.cpp @@ -3724,11 +3724,11 @@ const address_space_config *z80_device::memory_space_config(address_spacenum spa } } -const device_type Z80 = &device_creator; +const device_type Z80 = device_creator; nsc800_device::nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : z80_device(mconfig, NSC800, "NSC800", tag, owner, clock, "nsc800", __FILE__) { } -const device_type NSC800 = &device_creator; +const device_type NSC800 = device_creator; diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp index be15136f4ff..f513233b792 100644 --- a/src/devices/cpu/z8000/z8000.cpp +++ b/src/devices/cpu/z8000/z8000.cpp @@ -28,8 +28,8 @@ extern int z8k_segm_mode; #include "z8000cpu.h" -const device_type Z8001 = &device_creator; -const device_type Z8002 = &device_creator; +const device_type Z8001 = device_creator; +const device_type Z8002 = device_creator; z8002_device::z8002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/imagedev/bitbngr.cpp b/src/devices/imagedev/bitbngr.cpp index eb56d7251f8..40cd8f70306 100644 --- a/src/devices/imagedev/bitbngr.cpp +++ b/src/devices/imagedev/bitbngr.cpp @@ -15,7 +15,7 @@ IMPLEMENTATION ***************************************************************************/ -const device_type BITBANGER = &device_creator; +const device_type BITBANGER = device_creator; /*------------------------------------------------- ctor diff --git a/src/devices/imagedev/cassette.cpp b/src/devices/imagedev/cassette.cpp index c89faa1cc06..c8123157e97 100644 --- a/src/devices/imagedev/cassette.cpp +++ b/src/devices/imagedev/cassette.cpp @@ -17,7 +17,7 @@ #define LOG(x) do { if (VERBOSE) logerror x; } while (0) // device type definition -const device_type CASSETTE = &device_creator; +const device_type CASSETTE = device_creator; //------------------------------------------------- // cassette_image_device - constructor diff --git a/src/devices/imagedev/cassette.h b/src/devices/imagedev/cassette.h index 4a98dc3b61a..899f9078dcd 100644 --- a/src/devices/imagedev/cassette.h +++ b/src/devices/imagedev/cassette.h @@ -120,7 +120,7 @@ private: extern const device_type CASSETTE; // device iterator -typedef device_type_iterator<&device_creator, cassette_image_device> cassette_device_iterator; +typedef device_type_iterator cassette_device_iterator; /*************************************************************************** DEVICE CONFIGURATION MACROS diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp index 166fdf7945c..0c1c054b4a8 100644 --- a/src/devices/imagedev/chd_cd.cpp +++ b/src/devices/imagedev/chd_cd.cpp @@ -13,7 +13,7 @@ #include "chd_cd.h" // device type definition -const device_type CDROM = &device_creator; +const device_type CDROM = device_creator; //------------------------------------------------- // cdrom_image_device - constructor diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp index 5852da4a58e..07a66bd68de 100644 --- a/src/devices/imagedev/diablo.cpp +++ b/src/devices/imagedev/diablo.cpp @@ -23,7 +23,7 @@ static const char *dsk_option_spec = // device type definition -const device_type DIABLO = &device_creator; +const device_type DIABLO = device_creator; //------------------------------------------------- // diablo_image_device - constructor diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp index ad0884d3379..e7b77dd4b72 100644 --- a/src/devices/imagedev/flopdrv.cpp +++ b/src/devices/imagedev/flopdrv.cpp @@ -690,7 +690,7 @@ READ_LINE_MEMBER( legacy_floppy_image_device::floppy_ready_r ) } // device type definition -const device_type LEGACY_FLOPPY = &device_creator; +const device_type LEGACY_FLOPPY = device_creator; //------------------------------------------------- // legacy_floppy_image_device - constructor diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 2e9b4e4d931..b4f9d88bfff 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -7,9 +7,11 @@ *********************************************************************/ #include "emu.h" -#include "zippath.h" #include "floppy.h" + +#include "speaker.cpp" #include "formats/imageutl.h" +#include "zippath.h" /* Debugging flags. Set to 0 or 1. @@ -24,94 +26,94 @@ #define FLOPSND_TAG "floppysound" // device type definition -const device_type FLOPPY_CONNECTOR = &device_creator; +const device_type FLOPPY_CONNECTOR = device_creator; // generic 3" drives -const device_type FLOPPY_3_SSDD = &device_creator; -const device_type FLOPPY_3_DSDD = &device_creator; +const device_type FLOPPY_3_SSDD = device_creator; +const device_type FLOPPY_3_DSDD = device_creator; // generic 3.5" drives -const device_type FLOPPY_35_SSDD = &device_creator; -const device_type FLOPPY_35_DD = &device_creator; -const device_type FLOPPY_35_HD = &device_creator; -const device_type FLOPPY_35_ED = &device_creator; +const device_type FLOPPY_35_SSDD = device_creator; +const device_type FLOPPY_35_DD = device_creator; +const device_type FLOPPY_35_HD = device_creator; +const device_type FLOPPY_35_ED = device_creator; // generic 5.25" drives -const device_type FLOPPY_525_SSSD_35T = &device_creator; -const device_type FLOPPY_525_SD_35T = &device_creator; -const device_type FLOPPY_525_SSSD = &device_creator; -const device_type FLOPPY_525_SD = &device_creator; -const device_type FLOPPY_525_SSDD = &device_creator; -const device_type FLOPPY_525_DD = &device_creator; -const device_type FLOPPY_525_SSQD = &device_creator; -const device_type FLOPPY_525_QD = &device_creator; -const device_type FLOPPY_525_HD = &device_creator; +const device_type FLOPPY_525_SSSD_35T = device_creator; +const device_type FLOPPY_525_SD_35T = device_creator; +const device_type FLOPPY_525_SSSD = device_creator; +const device_type FLOPPY_525_SD = device_creator; +const device_type FLOPPY_525_SSDD = device_creator; +const device_type FLOPPY_525_DD = device_creator; +const device_type FLOPPY_525_SSQD = device_creator; +const device_type FLOPPY_525_QD = device_creator; +const device_type FLOPPY_525_HD = device_creator; // generic 8" drives -const device_type FLOPPY_8_SSSD = &device_creator; -const device_type FLOPPY_8_DSSD = &device_creator; -const device_type FLOPPY_8_SSDD = &device_creator; -const device_type FLOPPY_8_DSDD = &device_creator; +const device_type FLOPPY_8_SSSD = device_creator; +const device_type FLOPPY_8_DSSD = device_creator; +const device_type FLOPPY_8_SSDD = device_creator; +const device_type FLOPPY_8_DSDD = device_creator; // Epson 3.5" drives #if 0 -const device_type EPSON_SMD_110 = &device_creator; -const device_type EPSON_SMD_120 = &device_creator; -const device_type EPSON_SMD_125 = &device_creator; -const device_type EPSON_SMD_130 = &device_creator; -const device_type EPSON_SMD_140 = &device_creator; -const device_type EPSON_SMD_150 = &device_creator; -const device_type EPSON_SMD_160 = &device_creator; +const device_type EPSON_SMD_110 = device_creator; +const device_type EPSON_SMD_120 = device_creator; +const device_type EPSON_SMD_125 = device_creator; +const device_type EPSON_SMD_130 = device_creator; +const device_type EPSON_SMD_140 = device_creator; +const device_type EPSON_SMD_150 = device_creator; +const device_type EPSON_SMD_160 = device_creator; #endif -const device_type EPSON_SMD_165 = &device_creator; +const device_type EPSON_SMD_165 = device_creator; #if 0 -const device_type EPSON_SMD_170 = &device_creator; -const device_type EPSON_SMD_180 = &device_creator; -const device_type EPSON_SMD_240L = &device_creator; -const device_type EPSON_SMD_280HL = &device_creator; -const device_type EPSON_SMD_440L = &device_creator; -const device_type EPSON_SMD_449L = &device_creator; -const device_type EPSON_SMD_480LM = &device_creator; -const device_type EPSON_SMD_489M = &device_creator; +const device_type EPSON_SMD_170 = device_creator; +const device_type EPSON_SMD_180 = device_creator; +const device_type EPSON_SMD_240L = device_creator; +const device_type EPSON_SMD_280HL = device_creator; +const device_type EPSON_SMD_440L = device_creator; +const device_type EPSON_SMD_449L = device_creator; +const device_type EPSON_SMD_480LM = device_creator; +const device_type EPSON_SMD_489M = device_creator; #endif // Epson 5.25" drives #if 0 -const device_type EPSON_SD_311 = &device_creator; +const device_type EPSON_SD_311 = device_creator; #endif -const device_type EPSON_SD_320 = &device_creator; -const device_type EPSON_SD_321 = &device_creator; +const device_type EPSON_SD_320 = device_creator; +const device_type EPSON_SD_321 = device_creator; #if 0 -const device_type EPSON_SD_521L = &device_creator; -const device_type EPSON_SD_525 = &device_creator; -const device_type EPSON_SD_543 = &device_creator; -const device_type EPSON_SD_545 = &device_creator; -const device_type EPSON_SD_560 = &device_creator; -const device_type EPSON_SD_580L = &device_creator; -const device_type EPSON_SD_581L = &device_creator; -const device_type EPSON_SD_621L = &device_creator; -const device_type EPSON_SD_680L = &device_creator; +const device_type EPSON_SD_521L = device_creator; +const device_type EPSON_SD_525 = device_creator; +const device_type EPSON_SD_543 = device_creator; +const device_type EPSON_SD_545 = device_creator; +const device_type EPSON_SD_560 = device_creator; +const device_type EPSON_SD_580L = device_creator; +const device_type EPSON_SD_581L = device_creator; +const device_type EPSON_SD_621L = device_creator; +const device_type EPSON_SD_680L = device_creator; #endif // Sony 3.5" drives -const device_type SONY_OA_D31V = &device_creator; -const device_type SONY_OA_D32W = &device_creator; -const device_type SONY_OA_D32V = &device_creator; +const device_type SONY_OA_D31V = device_creator; +const device_type SONY_OA_D32W = device_creator; +const device_type SONY_OA_D32V = device_creator; // TEAC 5.25" drives #if 0 -const device_type TEAC_FD_55A = &device_creator; -const device_type TEAC_FD_55B = &device_creator; +const device_type TEAC_FD_55A = device_creator; +const device_type TEAC_FD_55B = device_creator; #endif -const device_type TEAC_FD_55E = &device_creator; -const device_type TEAC_FD_55F = &device_creator; -const device_type TEAC_FD_55G = &device_creator; +const device_type TEAC_FD_55E = device_creator; +const device_type TEAC_FD_55F = device_creator; +const device_type TEAC_FD_55G = device_creator; // ALPS 5.25" drives -const device_type ALPS_3255190x = &device_creator; +const device_type ALPS_3255190x = device_creator; // IBM 8" drives -const device_type IBM_6360 = &device_creator; +const device_type IBM_6360 = device_creator; template class device_finder; @@ -1358,7 +1360,7 @@ machine_config_constructor floppy_image_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( floppy_img ); } -const device_type FLOPPYSOUND = &device_creator; +const device_type FLOPPYSOUND = device_creator; //************************************************************************** diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp index 355b43bcb65..01b773d91f5 100644 --- a/src/devices/imagedev/harddriv.cpp +++ b/src/devices/imagedev/harddriv.cpp @@ -32,7 +32,7 @@ static const char *hd_option_spec = // device type definition -const device_type HARDDISK = &device_creator; +const device_type HARDDISK = device_creator; //------------------------------------------------- // harddisk_image_device - constructor diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp index 312c597a31c..ba9d7e2a81d 100644 --- a/src/devices/imagedev/mfmhd.cpp +++ b/src/devices/imagedev/mfmhd.cpp @@ -939,7 +939,7 @@ mfm_hd_generic_device::mfm_hd_generic_device(const machine_config &mconfig, cons { } -const device_type MFMHD_GENERIC = &device_creator; +const device_type MFMHD_GENERIC = device_creator; /* Various models. @@ -955,7 +955,7 @@ mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const ch m_maxseek_time = 150; } -const device_type MFMHD_ST213 = &device_creator; +const device_type MFMHD_ST213 = device_creator; mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mfm_harddisk_device(mconfig, MFMHD_ST225, "Seagate ST-225 MFM hard disk", tag, owner, clock, "mfm_hd_st225", __FILE__) @@ -968,7 +968,7 @@ mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const ch m_maxseek_time = 150; } -const device_type MFMHD_ST225 = &device_creator; +const device_type MFMHD_ST225 = device_creator; mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mfm_harddisk_device(mconfig, MFMHD_ST251, "Seagate ST-251 MFM hard disk", tag, owner, clock, "mfm_hd_st251", __FILE__) @@ -981,7 +981,7 @@ mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const ch m_maxseek_time = 70; } -const device_type MFMHD_ST251 = &device_creator; +const device_type MFMHD_ST251 = device_creator; // =========================================================== // Track cache @@ -1222,4 +1222,4 @@ void mfm_harddisk_connector::device_config_complete() } } -const device_type MFM_HD_CONNECTOR = &device_creator; +const device_type MFM_HD_CONNECTOR = device_creator; diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp index b4c556760db..d19e8bdea57 100644 --- a/src/devices/imagedev/midiin.cpp +++ b/src/devices/imagedev/midiin.cpp @@ -16,7 +16,7 @@ IMPLEMENTATION ***************************************************************************/ -const device_type MIDIIN = &device_creator; +const device_type MIDIIN = device_creator; /*------------------------------------------------- ctor diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h index 08429c54003..98566dde197 100644 --- a/src/devices/imagedev/midiin.h +++ b/src/devices/imagedev/midiin.h @@ -73,6 +73,6 @@ private: extern const device_type MIDIIN; // device iterator -typedef device_type_iterator<&device_creator, midiin_device> midiin_device_iterator; +typedef device_type_iterator midiin_device_iterator; #endif /* __MIDIIN_H__ */ diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp index e2784f72992..6765d2ab4f0 100644 --- a/src/devices/imagedev/midiout.cpp +++ b/src/devices/imagedev/midiout.cpp @@ -16,7 +16,7 @@ IMPLEMENTATION ***************************************************************************/ -const device_type MIDIOUT = &device_creator; +const device_type MIDIOUT = device_creator; /*------------------------------------------------- ctor diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h index b62e9a161c5..b742cb6b746 100644 --- a/src/devices/imagedev/midiout.h +++ b/src/devices/imagedev/midiout.h @@ -68,6 +68,6 @@ private: extern const device_type MIDIOUT; // device iterator -typedef device_type_iterator<&device_creator, midiout_device> midiout_device_iterator; +typedef device_type_iterator midiout_device_iterator; #endif /* __MIDIOUT_H__ */ diff --git a/src/devices/imagedev/printer.cpp b/src/devices/imagedev/printer.cpp index be6abe8df41..90fd4126a2d 100644 --- a/src/devices/imagedev/printer.cpp +++ b/src/devices/imagedev/printer.cpp @@ -13,7 +13,7 @@ // device type definition -const device_type PRINTER = &device_creator; +const device_type PRINTER = device_creator; //------------------------------------------------- // printer_image_device - constructor diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp index 110288abf1f..96d0d2475e2 100644 --- a/src/devices/imagedev/snapquik.cpp +++ b/src/devices/imagedev/snapquik.cpp @@ -12,7 +12,7 @@ #include "snapquik.h" // device type definition -const device_type SNAPSHOT = &device_creator; +const device_type SNAPSHOT = device_creator; //------------------------------------------------- // snapshot_image_device - constructor @@ -90,7 +90,7 @@ image_init_result snapshot_image_device::call_load() } // device type definition -const device_type QUICKLOAD = &device_creator; +const device_type QUICKLOAD = device_creator; //------------------------------------------------- // quickload_image_device - constructor diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp index 5eab87e1bf2..1252e81f785 100644 --- a/src/devices/machine/40105.cpp +++ b/src/devices/machine/40105.cpp @@ -32,8 +32,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CD40105 = &device_creator; -const device_type HC40105 = &device_creator; +const device_type CD40105 = device_creator; +const device_type HC40105 = device_creator; //************************************************************************** diff --git a/src/devices/machine/53c7xx.cpp b/src/devices/machine/53c7xx.cpp index daabe348188..e84c4358901 100644 --- a/src/devices/machine/53c7xx.cpp +++ b/src/devices/machine/53c7xx.cpp @@ -52,7 +52,7 @@ static void ATTR_PRINTF(3,4) verbose_log(running_machine &machine, int level, co // LIVE DEVICE //************************************************************************** -const device_type NCR53C7XX = &device_creator; +const device_type NCR53C7XX = device_creator; //------------------------------------------------- // ncr53c7xx_device - constructor/destructor diff --git a/src/devices/machine/53c810.cpp b/src/devices/machine/53c810.cpp index cdbee6a288e..5564525869d 100644 --- a/src/devices/machine/53c810.cpp +++ b/src/devices/machine/53c810.cpp @@ -813,4 +813,4 @@ unsigned lsi53c810_device::lsi53c810_dasm(char *buf, uint32_t pc) return result; } -const device_type LSI53C810 = &device_creator; +const device_type LSI53C810 = device_creator; diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp index dfebc6dd0bd..5ce4497c860 100644 --- a/src/devices/machine/64h156.cpp +++ b/src/devices/machine/64h156.cpp @@ -43,7 +43,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C64H156 = &device_creator; +const device_type C64H156 = device_creator; diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp index 90c060038c1..80ecb5c2a8a 100644 --- a/src/devices/machine/6522via.cpp +++ b/src/devices/machine/6522via.cpp @@ -148,7 +148,7 @@ uint16_t via6522_device::get_counter1_value() //************************************************************************** // device type definition -const device_type VIA6522 = &device_creator; +const device_type VIA6522 = device_creator; DEVICE_ADDRESS_MAP_START( map, 8, via6522_device ) AM_RANGE(0x00, 0x0f) AM_READWRITE(read, write) diff --git a/src/devices/machine/6525tpi.cpp b/src/devices/machine/6525tpi.cpp index 1658ce08d5b..be33b929b6b 100644 --- a/src/devices/machine/6525tpi.cpp +++ b/src/devices/machine/6525tpi.cpp @@ -104,7 +104,7 @@ #define CB_MANUAL_LEVEL ((m_cr & 0x40) ? 1 : 0) -const device_type TPI6525 = &device_creator; +const device_type TPI6525 = device_creator; tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock, "tpi6525", __FILE__), diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp index 94b56366d6d..c1b0fb03e7e 100644 --- a/src/devices/machine/6532riot.cpp +++ b/src/devices/machine/6532riot.cpp @@ -22,7 +22,7 @@ The timer seems to follow these rules: //************************************************************************** // device type definition -const device_type RIOT6532 = &device_creator; +const device_type RIOT6532 = device_creator; enum { diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp index f086b16cd71..4d9bd20d07a 100644 --- a/src/devices/machine/68153bim.cpp +++ b/src/devices/machine/68153bim.cpp @@ -59,9 +59,9 @@ // DEVICE DEFINITIONS //************************************************************************** // device type definition -const device_type MC68153_CHANNEL = &device_creator; -const device_type MC68153 = &device_creator; -const device_type EI68C153 = &device_creator; +const device_type MC68153_CHANNEL = device_creator; +const device_type MC68153 = device_creator; +const device_type EI68C153 = device_creator; //------------------------------------------------- // device_mconfig_additions - diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp index ab71db7bfa6..2d1e20859dc 100644 --- a/src/devices/machine/6821pia.cpp +++ b/src/devices/machine/6821pia.cpp @@ -55,7 +55,7 @@ //************************************************************************** // device type definition -const device_type PIA6821 = &device_creator; +const device_type PIA6821 = device_creator; template class device_finder; template class device_finder; diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp index f7351c20217..bf5cfec90b7 100644 --- a/src/devices/machine/68230pit.cpp +++ b/src/devices/machine/68230pit.cpp @@ -58,7 +58,7 @@ // DEVICE TYPE DEFINITIONS //************************************************************************** -const device_type PIT68230 = &device_creator; +const device_type PIT68230 = device_creator; //------------------------------------------------- // pit68230_device - constructors diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp index 58865272653..fbbf8400ad7 100644 --- a/src/devices/machine/68307.cpp +++ b/src/devices/machine/68307.cpp @@ -5,6 +5,9 @@ #include "emu.h" #include "68307.h" +const device_type M68307 = device_creator; + + /* 68307 SERIAL Module */ /* all ports on this are 8-bit? */ diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h index b3e2cd4b8fd..c3ea6ea9286 100644 --- a/src/devices/machine/68307.h +++ b/src/devices/machine/68307.h @@ -122,7 +122,7 @@ protected: virtual void device_reset() override; }; -static const device_type M68307 = &device_creator; +extern const device_type M68307; #endif diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp index 79b1e55331c..36d42b869fa 100644 --- a/src/devices/machine/68340.cpp +++ b/src/devices/machine/68340.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "68340.h" - +const device_type M68340 = device_creator; int m68340_calc_cs(m68340cpu_device *m68k, offs_t address) diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h index c0c76f467e3..350021100a3 100644 --- a/src/devices/machine/68340.h +++ b/src/devices/machine/68340.h @@ -15,10 +15,8 @@ #include "68340tmu.h" - - - -class m68340cpu_device : public fscpu32_device { +class m68340cpu_device : public fscpu32_device +{ public: m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -58,17 +56,13 @@ public: TIMER_CALLBACK_MEMBER(periodic_interrupt_timer_callback); void start_68340_sim(void); void do_timer_irq(void); -protected: +protected: virtual void device_start() override; virtual void device_reset() override; }; -static const device_type M68340 = &device_creator; - - - - +extern const device_type M68340; #endif diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp index 7532d47622b..883821cb039 100644 --- a/src/devices/machine/6840ptm.cpp +++ b/src/devices/machine/6840ptm.cpp @@ -63,7 +63,7 @@ const char *const ptm6840_device::opmode[] = ***************************************************************************/ // device type definition -const device_type PTM6840 = &device_creator; +const device_type PTM6840 = device_creator; //------------------------------------------------- // ptm6840_device - constructor diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp index 9a84b9e0a72..567a0af6e9f 100644 --- a/src/devices/machine/6850acia.cpp +++ b/src/devices/machine/6850acia.cpp @@ -58,7 +58,7 @@ const int acia6850_device::transmitter_control[4][3] = ***************************************************************************/ // device type definition -const device_type ACIA6850 = &device_creator; +const device_type ACIA6850 = device_creator; template class device_finder; template class device_finder; diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp index e44c53e3e88..ce96d058dab 100644 --- a/src/devices/machine/68561mpcc.cpp +++ b/src/devices/machine/68561mpcc.cpp @@ -86,11 +86,11 @@ FEATURES // DEVICE DEFINITIONS //************************************************************************** // device type definition -const device_type MPCC = &device_creator; -const device_type MPCC68560 = &device_creator; -const device_type MPCC68560A = &device_creator; -const device_type MPCC68561 = &device_creator; -const device_type MPCC68561A = &device_creator; +const device_type MPCC = device_creator; +const device_type MPCC68560 = device_creator; +const device_type MPCC68560A = device_creator; +const device_type MPCC68561 = device_creator; +const device_type MPCC68561A = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/machine/7200fifo.cpp b/src/devices/machine/7200fifo.cpp index 6a08e548aa4..b15f7f551c6 100644 --- a/src/devices/machine/7200fifo.cpp +++ b/src/devices/machine/7200fifo.cpp @@ -14,7 +14,7 @@ #include "machine/7200fifo.h" -const device_type FIFO7200 = &device_creator; +const device_type FIFO7200 = device_creator; //------------------------------------------------- // fifo7200_device - constructor diff --git a/src/devices/machine/7400.cpp b/src/devices/machine/7400.cpp index ef20c91df9a..fa189e91a7d 100644 --- a/src/devices/machine/7400.cpp +++ b/src/devices/machine/7400.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "7400.h" -const device_type TTL7400 = &device_creator; +const device_type TTL7400 = device_creator; ttl7400_device::ttl7400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TTL7400, "7400 Quad 2-Input NAND Gate", tag, owner, clock, "7400", __FILE__) diff --git a/src/devices/machine/7404.cpp b/src/devices/machine/7404.cpp index 8491d848149..09251088c87 100644 --- a/src/devices/machine/7404.cpp +++ b/src/devices/machine/7404.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "7404.h" -const device_type TTL7404 = &device_creator; +const device_type TTL7404 = device_creator; ttl7404_device::ttl7404_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TTL7404, "5/7404 Hex Inverters", tag, owner, clock, "7404", __FILE__) diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp index ad3cd7d2a0c..7fde031e7aa 100644 --- a/src/devices/machine/74123.cpp +++ b/src/devices/machine/74123.cpp @@ -22,7 +22,7 @@ //************************************************************************** // device type definition -const device_type TTL74123 = &device_creator; +const device_type TTL74123 = device_creator; //------------------------------------------------- // ttl74123_device - constructor diff --git a/src/devices/machine/74145.cpp b/src/devices/machine/74145.cpp index 218a65829f5..4f6b3e2a7be 100644 --- a/src/devices/machine/74145.cpp +++ b/src/devices/machine/74145.cpp @@ -50,7 +50,7 @@ #include "coreutil.h" -const device_type TTL74145 = &device_creator; +const device_type TTL74145 = device_creator; /*************************************************************************** DEVICE INTERFACE diff --git a/src/devices/machine/74148.cpp b/src/devices/machine/74148.cpp index 8786d2aa7b4..79a74f16a40 100644 --- a/src/devices/machine/74148.cpp +++ b/src/devices/machine/74148.cpp @@ -44,7 +44,7 @@ #include "machine/74148.h" -const device_type TTL74148 = &device_creator; +const device_type TTL74148 = device_creator; ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TTL74148, "74148 TTL", tag, owner, clock, "74148", __FILE__), diff --git a/src/devices/machine/74153.cpp b/src/devices/machine/74153.cpp index 42d08d48eae..143a5b07fea 100644 --- a/src/devices/machine/74153.cpp +++ b/src/devices/machine/74153.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TTL153 = &device_creator; +const device_type TTL153 = device_creator; //************************************************************************** diff --git a/src/devices/machine/74157.cpp b/src/devices/machine/74157.cpp index 88f7b1dd03d..b68dc1472e6 100644 --- a/src/devices/machine/74157.cpp +++ b/src/devices/machine/74157.cpp @@ -20,7 +20,7 @@ // 74LS157 DEVICE //************************************************************************** -const device_type LS157 = &device_creator; +const device_type LS157 = device_creator; //------------------------------------------------- // ls157_device - constructor @@ -211,7 +211,7 @@ void ls157_device::update_output() // 74HCT157 DEVICE //************************************************************************** -const device_type HCT157 = &device_creator; +const device_type HCT157 = device_creator; hct157_device::hct157_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ls157_device(mconfig, HCT157, "74HCT157 Quad 2-to-1 Multiplexer", tag, owner, clock, "74hct157", __FILE__) diff --git a/src/devices/machine/74161.cpp b/src/devices/machine/74161.cpp index 96279e57f1b..2c81cdfcb1a 100644 --- a/src/devices/machine/74161.cpp +++ b/src/devices/machine/74161.cpp @@ -9,10 +9,10 @@ #include "emu.h" #include "74161.h" -const device_type TTL74160 = &device_creator; -const device_type TTL74161 = &device_creator; -const device_type TTL74162 = &device_creator; -const device_type TTL74163 = &device_creator; +const device_type TTL74160 = device_creator; +const device_type TTL74161 = device_creator; +const device_type TTL74162 = device_creator; +const device_type TTL74163 = device_creator; ttl7416x_device::ttl7416x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, bool synchronous_reset, uint8_t limit) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) diff --git a/src/devices/machine/74175.cpp b/src/devices/machine/74175.cpp index 5de13e040f9..7c8135f4450 100644 --- a/src/devices/machine/74175.cpp +++ b/src/devices/machine/74175.cpp @@ -9,8 +9,8 @@ #include "emu.h" #include "74175.h" -const device_type TTL74174 = &device_creator; -const device_type TTL74175 = &device_creator; +const device_type TTL74174 = device_creator; +const device_type TTL74175 = device_creator; ttl741745_device::ttl741745_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp index 8a2802b63d2..bcd2b8db332 100644 --- a/src/devices/machine/74181.cpp +++ b/src/devices/machine/74181.cpp @@ -16,7 +16,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TTL74181 = &device_creator; +const device_type TTL74181 = device_creator; //************************************************************************** diff --git a/src/devices/machine/7474.cpp b/src/devices/machine/7474.cpp index 50852c76e0c..69178d9f57c 100644 --- a/src/devices/machine/7474.cpp +++ b/src/devices/machine/7474.cpp @@ -49,7 +49,7 @@ //************************************************************************** // device type definition -const device_type TTL7474 = &device_creator; +const device_type TTL7474 = device_creator; //------------------------------------------------- // ttl7474_device - constructor diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp index ff0dc3b6727..8c7d4b70dcd 100644 --- a/src/devices/machine/8042kbdc.cpp +++ b/src/devices/machine/8042kbdc.cpp @@ -191,7 +191,7 @@ #define LOG_KEYBOARD 0 #define LOG_ACCESSES 0 -const device_type KBDC8042 = &device_creator; +const device_type KBDC8042 = device_creator; //------------------------------------------------- // kbdc8042_device - constructor diff --git a/src/devices/machine/82s129.cpp b/src/devices/machine/82s129.cpp index f8f8b754ee4..b705bd6e29e 100644 --- a/src/devices/machine/82s129.cpp +++ b/src/devices/machine/82s129.cpp @@ -11,8 +11,8 @@ const uint32_t prom82s129_base_device::PROM_SIZE = 256; -const device_type PROM82S126 = &device_creator; -const device_type PROM82S129 = &device_creator; +const device_type PROM82S126 = device_creator; +const device_type PROM82S129 = device_creator; prom82s129_base_device::prom82s129_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) diff --git a/src/devices/machine/8364_paula.cpp b/src/devices/machine/8364_paula.cpp index 496d78b916d..da535b75627 100644 --- a/src/devices/machine/8364_paula.cpp +++ b/src/devices/machine/8364_paula.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PAULA_8364 = &device_creator; +const device_type PAULA_8364 = device_creator; //************************************************************************* diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp index ee7631d241c..7e042049e7c 100644 --- a/src/devices/machine/8530scc.cpp +++ b/src/devices/machine/8530scc.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "8530scc.h" -const device_type SCC8530 = &device_creator; +const device_type SCC8530 = device_creator; /*************************************************************************** diff --git a/src/devices/machine/aakart.cpp b/src/devices/machine/aakart.cpp index 687a40e9481..6608ba32a3c 100644 --- a/src/devices/machine/aakart.cpp +++ b/src/devices/machine/aakart.cpp @@ -19,7 +19,7 @@ TODO: //************************************************************************** // device type definition -const device_type AAKART = &device_creator; +const device_type AAKART = device_creator; #define HRST 0xff #define RAK1 0xfe diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp index 902133161d4..d55d14a2ed0 100644 --- a/src/devices/machine/adc0808.cpp +++ b/src/devices/machine/adc0808.cpp @@ -17,7 +17,7 @@ //************************************************************************** // device type definition -const device_type ADC0808 = &device_creator; +const device_type ADC0808 = device_creator; //------------------------------------------------- // adc0808_device - constructor diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp index 375bc442a93..d1666967f78 100644 --- a/src/devices/machine/adc083x.cpp +++ b/src/devices/machine/adc083x.cpp @@ -46,10 +46,10 @@ enum TYPE DEFINITIONS ***************************************************************************/ -const device_type ADC0831 = &device_creator; -const device_type ADC0832 = &device_creator; -const device_type ADC0834 = &device_creator; -const device_type ADC0838 = &device_creator; +const device_type ADC0831 = device_creator; +const device_type ADC0832 = device_creator; +const device_type ADC0834 = device_creator; +const device_type ADC0838 = device_creator; adc083x_device::adc083x_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), diff --git a/src/devices/machine/adc1038.cpp b/src/devices/machine/adc1038.cpp index d0591c867b6..66f65878b65 100644 --- a/src/devices/machine/adc1038.cpp +++ b/src/devices/machine/adc1038.cpp @@ -13,7 +13,7 @@ #include "adc1038.h" -const device_type ADC1038 = &device_creator; +const device_type ADC1038 = device_creator; adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ADC1038, "ADC1038", tag, owner, clock, "adc1038", __FILE__), m_cycle(0), m_clk(0), m_adr(0), m_data_in(0), m_data_out(0), m_adc_data(0), m_sars(0), diff --git a/src/devices/machine/adc1213x.cpp b/src/devices/machine/adc1213x.cpp index ed501313156..d3c39ba036e 100644 --- a/src/devices/machine/adc1213x.cpp +++ b/src/devices/machine/adc1213x.cpp @@ -34,7 +34,7 @@ -const device_type ADC12130 = &device_creator; +const device_type ADC12130 = device_creator; adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : adc12138_device(mconfig, ADC12130, "ADC12130", tag, owner, clock, "adc12130", __FILE__) @@ -42,7 +42,7 @@ adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, } -const device_type ADC12132 = &device_creator; +const device_type ADC12132 = device_creator; adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : adc12138_device(mconfig, ADC12132, "ADC12132", tag, owner, clock, "adc12132", __FILE__) @@ -50,7 +50,7 @@ adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag, } -const device_type ADC12138 = &device_creator; +const device_type ADC12138 = device_creator; adc12138_device::adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ADC12138, "ADC12138", tag, owner, clock, "adc12138", __FILE__) diff --git a/src/devices/machine/aicartc.cpp b/src/devices/machine/aicartc.cpp index f52c5269dab..864c9e5ced9 100644 --- a/src/devices/machine/aicartc.cpp +++ b/src/devices/machine/aicartc.cpp @@ -19,7 +19,7 @@ //************************************************************************** // device type definition -const device_type AICARTC = &device_creator; +const device_type AICARTC = device_creator; //************************************************************************** diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp index a01a1c79dd4..e464f70431f 100644 --- a/src/devices/machine/akiko.cpp +++ b/src/devices/machine/akiko.cpp @@ -31,7 +31,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type AKIKO = &device_creator; +const device_type AKIKO = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/machine/am2847.cpp b/src/devices/machine/am2847.cpp index 574ddd81acc..93c288c6b68 100644 --- a/src/devices/machine/am2847.cpp +++ b/src/devices/machine/am2847.cpp @@ -9,9 +9,9 @@ #include "emu.h" #include "am2847.h" -const device_type AM2847 = &device_creator; -const device_type AM2849 = &device_creator; -const device_type TMS3409 = &device_creator; +const device_type AM2847 = device_creator; +const device_type AM2849 = device_creator; +const device_type TMS3409 = device_creator; am2847_base_device::am2847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, size_t size) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp index 60bfe25ddb0..d2770b383ce 100644 --- a/src/devices/machine/am53cf96.cpp +++ b/src/devices/machine/am53cf96.cpp @@ -191,4 +191,4 @@ void am53cf96_device::dma_write_data(int bytes, uint8_t *pData) write_data(pData, bytes); } -const device_type AM53CF96 = &device_creator; +const device_type AM53CF96 = device_creator; diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp index a7b652a79ed..b29fdf7b13a 100644 --- a/src/devices/machine/am9517a.cpp +++ b/src/devices/machine/am9517a.cpp @@ -48,9 +48,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type AM9517A = &device_creator; -const device_type V53_DMAU = &device_creator; -const device_type PCXPORT_DMAC = &device_creator; +const device_type AM9517A = device_creator; +const device_type V53_DMAU = device_creator; +const device_type PCXPORT_DMAC = device_creator; //************************************************************************** diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp index 89a626e46fc..188221d0052 100644 --- a/src/devices/machine/amigafdc.cpp +++ b/src/devices/machine/amigafdc.cpp @@ -12,7 +12,7 @@ #include "formats/ami_dsk.h" #include "amigafdc.h" -const device_type AMIGA_FDC = &device_creator; +const device_type AMIGA_FDC = device_creator; FLOPPY_FORMATS_MEMBER( amiga_fdc::floppy_formats ) FLOPPY_ADF_FORMAT diff --git a/src/devices/machine/appldriv.cpp b/src/devices/machine/appldriv.cpp index 47b4408657e..ef6a46dfb6d 100644 --- a/src/devices/machine/appldriv.cpp +++ b/src/devices/machine/appldriv.cpp @@ -291,7 +291,7 @@ int apple525_read_status(device_t *device) } // device type definition -const device_type FLOPPY_APPLE = &device_creator; +const device_type FLOPPY_APPLE = device_creator; //------------------------------------------------- // apple525_floppy_image_device - constructor diff --git a/src/devices/machine/applefdc.cpp b/src/devices/machine/applefdc.cpp index 8b0f6ed4cd2..6d9d10fbd13 100644 --- a/src/devices/machine/applefdc.cpp +++ b/src/devices/machine/applefdc.cpp @@ -565,7 +565,7 @@ uint8_t applefdc_base_device::get_lines() APPLE FDC - Used on Apple II ***************************************************************************/ -const device_type APPLEFDC = &device_creator; +const device_type APPLEFDC = device_creator; applefdc_device::applefdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : applefdc_base_device(APPLEFDC_APPLE2, mconfig, APPLEFDC, "Apple FDC", tag, owner, clock, "apple_fdc", __FILE__) @@ -578,7 +578,7 @@ applefdc_device::applefdc_device(const machine_config &mconfig, const char *tag, IWM - Used on early Macs ***************************************************************************/ -const device_type IWM = &device_creator; +const device_type IWM = device_creator; iwm_device::iwm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : applefdc_base_device(APPLEFDC_IWM, mconfig, IWM, "Apple IWM (Integrated Woz Machine)", tag, owner, clock, "iwm", __FILE__) diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index 85db65f68d5..1ee69769c6f 100644 --- a/src/devices/machine/at28c16.cpp +++ b/src/devices/machine/at28c16.cpp @@ -33,7 +33,7 @@ ADDRESS_MAP_END //************************************************************************** // device type definition -const device_type AT28C16 = &device_creator; +const device_type AT28C16 = device_creator; //------------------------------------------------- // at28c16_device - constructor diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp index c6dcf109fe0..2c56a1c45c2 100644 --- a/src/devices/machine/at29x.cpp +++ b/src/devices/machine/at29x.cpp @@ -521,6 +521,6 @@ void at29x_device::device_reset(void) m_programming_last_offset = 0; } -const device_type AT29C020 = &device_creator; -const device_type AT29C040 = &device_creator; -const device_type AT29C040A = &device_creator; +const device_type AT29C020 = device_creator; +const device_type AT29C040 = device_creator; +const device_type AT29C040A = device_creator; diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp index 6788609cc56..e1b44c4ee0e 100644 --- a/src/devices/machine/at45dbxx.cpp +++ b/src/devices/machine/at45dbxx.cpp @@ -33,9 +33,9 @@ //************************************************************************** // device type definition -const device_type AT45DB041 = &device_creator; -const device_type AT45DB081 = &device_creator; -const device_type AT45DB161 = &device_creator; +const device_type AT45DB041 = device_creator; +const device_type AT45DB081 = device_creator; +const device_type AT45DB161 = device_creator; //************************************************************************** diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp index 56b3907e638..d8db7bf8d46 100644 --- a/src/devices/machine/at_keybc.cpp +++ b/src/devices/machine/at_keybc.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type AT_KEYBOARD_CONTROLLER = &device_creator; +const device_type AT_KEYBOARD_CONTROLLER = device_creator; // i/o map for the 8042 static ADDRESS_MAP_START( at_keybc_io, AS_IO, 8, at_keyboard_controller_device) diff --git a/src/devices/machine/ataflash.cpp b/src/devices/machine/ataflash.cpp index c70f0d82a33..3ecbf3488ae 100644 --- a/src/devices/machine/ataflash.cpp +++ b/src/devices/machine/ataflash.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "ataflash.h" -const device_type ATA_FLASH_PCCARD = &device_creator; +const device_type ATA_FLASH_PCCARD = device_creator; ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ide_hdd_device(mconfig, ATA_FLASH_PCCARD, "ATA Flash PCCARD", tag, owner, clock, "ataflash", __FILE__) @@ -117,7 +117,7 @@ attotime ata_flash_pccard_device::seek_time() } -const device_type TAITO_PCCARD1 = &device_creator; +const device_type TAITO_PCCARD1 = device_creator; taito_pccard1_device::taito_pccard1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ata_flash_pccard_device(mconfig, TAITO_PCCARD1, "Taito PC-CARD (Type 1)", tag, owner, clock, "taito_pccard1", __FILE__), @@ -208,7 +208,7 @@ bool taito_pccard1_device::is_ready() return m_locked == 0; } -const device_type TAITO_PCCARD2 = &device_creator; +const device_type TAITO_PCCARD2 = device_creator; taito_pccard2_device::taito_pccard2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ata_flash_pccard_device(mconfig, TAITO_PCCARD1, "Taito PC-CARD (Type 2)", tag, owner, clock, "taito_pccard2", __FILE__), @@ -307,7 +307,7 @@ bool taito_pccard2_device::is_ready() return !m_locked; } -const device_type TAITO_COMPACT_FLASH = &device_creator; +const device_type TAITO_COMPACT_FLASH = device_creator; taito_compact_flash_device::taito_compact_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ata_flash_pccard_device(mconfig, TAITO_COMPACT_FLASH, "Taito Compact Flash", tag, owner, clock, "taito_cf", __FILE__), diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp index 7ec7dd8838d..09ca1a04e8d 100644 --- a/src/devices/machine/ataintf.cpp +++ b/src/devices/machine/ataintf.cpp @@ -215,7 +215,7 @@ ata_interface_device::ata_interface_device(const machine_config &mconfig, device } -const device_type ATA_INTERFACE = &device_creator; +const device_type ATA_INTERFACE = device_creator; ata_interface_device::ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ATA_INTERFACE, "ATA Interface", tag, owner, clock, "ata_interface", __FILE__), @@ -290,7 +290,7 @@ machine_config_constructor ata_interface_device::device_mconfig_additions() cons //************************************************************************** // device type definition -const device_type ATA_SLOT = &device_creator; +const device_type ATA_SLOT = device_creator; //------------------------------------------------- // ata_slot_device - constructor diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp index 7bda20dc96e..a7aa4449517 100644 --- a/src/devices/machine/atapicdr.cpp +++ b/src/devices/machine/atapicdr.cpp @@ -8,8 +8,8 @@ #define T10MMC_GET_EVENT_STATUS_NOTIFICATION 0x4a // device type definition -const device_type ATAPI_CDROM = &device_creator; -const device_type ATAPI_FIXED_CDROM = &device_creator; +const device_type ATAPI_CDROM = device_creator; +const device_type ATAPI_FIXED_CDROM = device_creator; atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : atapi_hle_device(mconfig, ATAPI_CDROM, "ATAPI CDROM", tag, owner, clock, "cdrom", __FILE__) diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp index 47b6568bd47..d19bea1d61b 100644 --- a/src/devices/machine/ay31015.cpp +++ b/src/devices/machine/ay31015.cpp @@ -94,8 +94,8 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop -const device_type AY31015 = &device_creator; -const device_type AY51013 = &device_creator; +const device_type AY31015 = device_creator; +const device_type AY51013 = device_creator; ay31015_device::ay31015_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), diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp index 71557056253..5c75b67e6f1 100644 --- a/src/devices/machine/bankdev.cpp +++ b/src/devices/machine/bankdev.cpp @@ -4,7 +4,7 @@ #include "bankdev.h" // device type definition -const device_type ADDRESS_MAP_BANK = &device_creator; +const device_type ADDRESS_MAP_BANK = device_creator; address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t(mconfig, ADDRESS_MAP_BANK, "Address Map Bank", tag, owner, clock, "address_map_bank", __FILE__), diff --git a/src/devices/machine/bcreader.cpp b/src/devices/machine/bcreader.cpp index 9b286f49281..55cca371322 100644 --- a/src/devices/machine/bcreader.cpp +++ b/src/devices/machine/bcreader.cpp @@ -53,7 +53,7 @@ #include "bcreader.h" // device type definition -const device_type BARCODE_READER = &device_creator; +const device_type BARCODE_READER = device_creator; //------------------------------------------------- // barcode_reader_device - constructor diff --git a/src/devices/machine/bcreader.h b/src/devices/machine/bcreader.h index 661c3008198..1e5da282b7a 100644 --- a/src/devices/machine/bcreader.h +++ b/src/devices/machine/bcreader.h @@ -54,7 +54,7 @@ protected: extern const device_type BARCODE_READER; // device type iterator -typedef device_type_iterator<&device_creator, barcode_reader_device> barcode_reader_device_iterator; +typedef device_type_iterator barcode_reader_device_iterator; #endif diff --git a/src/devices/machine/buffer.cpp b/src/devices/machine/buffer.cpp index 7497f49ecd4..b5d0839af5e 100644 --- a/src/devices/machine/buffer.cpp +++ b/src/devices/machine/buffer.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "buffer.h" -const device_type INPUT_BUFFER = &device_creator; +const device_type INPUT_BUFFER = device_creator; input_buffer_device::input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, INPUT_BUFFER, "Input Buffer", tag, owner, clock, "input_buffer", __FILE__), diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp index 5539da4c40e..422d3ff5fe2 100644 --- a/src/devices/machine/cdp1852.cpp +++ b/src/devices/machine/cdp1852.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CDP1852 = &device_creator; +const device_type CDP1852 = device_creator; diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp index 9e219c1e460..586597ce41b 100644 --- a/src/devices/machine/cdp1871.cpp +++ b/src/devices/machine/cdp1871.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CDP1871 = &device_creator; +const device_type CDP1871 = device_creator; diff --git a/src/devices/machine/cdp1879.cpp b/src/devices/machine/cdp1879.cpp index a4ed8e39a13..4cac4cf90fd 100644 --- a/src/devices/machine/cdp1879.cpp +++ b/src/devices/machine/cdp1879.cpp @@ -15,7 +15,7 @@ //************************************************************************** // device type definition -const device_type CDP1879 = &device_creator; +const device_type CDP1879 = device_creator; //------------------------------------------------- // cdp1879_device - constructor diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp index ea3b686399e..c1e291300db 100644 --- a/src/devices/machine/clock.cpp +++ b/src/devices/machine/clock.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "clock.h" -const device_type CLOCK = &device_creator; +const device_type CLOCK = device_creator; clock_device::clock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CLOCK, "Clock", tag, owner, clock, "clock", __FILE__), diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp index 389ef52ac63..db1fa072f14 100644 --- a/src/devices/machine/com8116.cpp +++ b/src/devices/machine/com8116.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -const device_type COM8116 = &device_creator; +const device_type COM8116 = device_creator; // Parts with T after the number do not have an internal oscillator and require an external clock source // The SMC/COM 5xxx parts are all dual 5v/12v parts, while the 8xxx parts are 5v only diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp index 95cd4a17cb9..fa64568ce37 100644 --- a/src/devices/machine/corvushd.cpp +++ b/src/devices/machine/corvushd.cpp @@ -70,7 +70,7 @@ #include -const device_type CORVUS_HDC = &device_creator; +const device_type CORVUS_HDC = device_creator; corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CORVUS_HDC, "Corvus Flat Cable HDC", tag, owner, clock, "corvus_hdc", __FILE__), diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp index 2e268662f85..11b084a3b7b 100644 --- a/src/devices/machine/cr511b.cpp +++ b/src/devices/machine/cr511b.cpp @@ -17,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CR511B = &device_creator; +const device_type CR511B = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/machine/cr589.cpp b/src/devices/machine/cr589.cpp index faf430c8ec7..99f90c257ce 100644 --- a/src/devices/machine/cr589.cpp +++ b/src/devices/machine/cr589.cpp @@ -138,7 +138,7 @@ void matsushita_cr589_device::WriteData( uint8_t *data, int dataLength ) } // device type definition -const device_type CR589 = &device_creator; +const device_type CR589 = device_creator; matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : atapi_cdrom_device(mconfig, CR589, "Matsushita CR589 CD-ROM Drive", tag, owner, clock, "cr589", __FILE__), diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index e6aaddeac85..669f301e9e4 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -44,7 +44,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CS4031 = &device_creator; +const device_type CS4031 = device_creator; const char* cs4031_device::m_register_names[] = { diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp index 2d3d0e2f218..bc94f1e19af 100644 --- a/src/devices/machine/cs8221.cpp +++ b/src/devices/machine/cs8221.cpp @@ -27,7 +27,7 @@ #define LOG_REGISTER 1 #define LOG_MEMORY 1 -const device_type CS8221 = &device_creator; +const device_type CS8221 = device_creator; static const char *const register_names[] = diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp index 4325a8ec941..c49ce231005 100644 --- a/src/devices/machine/diablo_hd.cpp +++ b/src/devices/machine/diablo_hd.cpp @@ -1454,4 +1454,4 @@ machine_config_constructor diablo_hd_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( diablo_drive ); } -const device_type DIABLO_HD = &device_creator; +const device_type DIABLO_HD = device_creator; diff --git a/src/devices/machine/dm9334.cpp b/src/devices/machine/dm9334.cpp index c890e7a09cf..5a673f7cf24 100644 --- a/src/devices/machine/dm9334.cpp +++ b/src/devices/machine/dm9334.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "dm9334.h" -const device_type DM9334 = &device_creator; +const device_type DM9334 = device_creator; dm9334_device::dm9334_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DM9334, "National Semiconductor 9334/DM9334 8-Bit Addressable Latch", tag, owner, clock, "dm9334", __FILE__) diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp index e493eba7536..cd0911f9995 100644 --- a/src/devices/machine/dmac.cpp +++ b/src/devices/machine/dmac.cpp @@ -27,7 +27,7 @@ BOARDS: // DEVICE DEFINITIONS //************************************************************************** -const device_type DMAC = &device_creator; +const device_type DMAC = device_creator; //************************************************************************** diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp index 64f6fcbb407..6057260da34 100644 --- a/src/devices/machine/dp8390.cpp +++ b/src/devices/machine/dp8390.cpp @@ -6,8 +6,8 @@ #define DP8390_BYTE_ORDER(w) ((m_regs.dcr & 3) == 3 ? ((data << 8) | (data >> 8)) : data) #define LOOPBACK (!(m_regs.dcr & 8) && (m_regs.tcr & 6)) -const device_type DP8390D = &device_creator; -const device_type RTL8019A = &device_creator; +const device_type DP8390D = device_creator; +const device_type RTL8019A = device_creator; dp8390d_device::dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : dp8390_device(mconfig, DP8390D, "DP8390D", tag, owner, clock, 10.0f, "dp8390d", __FILE__) { diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp index 62df5bce313..8e326ab451f 100644 --- a/src/devices/machine/ds1204.cpp +++ b/src/devices/machine/ds1204.cpp @@ -27,7 +27,7 @@ inline void ATTR_PRINTF( 3, 4 ) ds1204_device::verboselog( int n_level, const ch } // device type definition -const device_type DS1204 = &device_creator; +const device_type DS1204 = device_creator; ds1204_device::ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t( mconfig, DS1204, "DS1204", tag, owner, clock, "ds1204", __FILE__ ), diff --git a/src/devices/machine/ds128x.cpp b/src/devices/machine/ds128x.cpp index a7068f59f31..88b40ac3d9c 100644 --- a/src/devices/machine/ds128x.cpp +++ b/src/devices/machine/ds128x.cpp @@ -5,7 +5,7 @@ /// TODO: Only DV2/DV1/DV0 == 0/1/0 is supported as the chip only has a 15 stage divider and not 22. -const device_type DS12885 = &device_creator; +const device_type DS12885 = device_creator; //------------------------------------------------- // ds12885_device - constructor diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp index a89bfed7c24..8050523f65a 100644 --- a/src/devices/machine/ds1302.cpp +++ b/src/devices/machine/ds1302.cpp @@ -66,7 +66,7 @@ enum //************************************************************************** // device type definition -const device_type DS1302 = &device_creator; +const device_type DS1302 = device_creator; //------------------------------------------------- diff --git a/src/devices/machine/ds1315.cpp b/src/devices/machine/ds1315.cpp index dbdc56b231e..6056f4e075e 100644 --- a/src/devices/machine/ds1315.cpp +++ b/src/devices/machine/ds1315.cpp @@ -26,11 +26,11 @@ #include "coreutil.h" -const device_type DS1315 = &device_creator; +const device_type DS1315 = device_creator; ds1315_device::ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__), m_mode(), m_count(0) - { + : device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__), m_mode(), m_count(0) +{ } //------------------------------------------------- diff --git a/src/devices/machine/ds1386.cpp b/src/devices/machine/ds1386.cpp index 5846f44ab32..74c5d14fdf5 100644 --- a/src/devices/machine/ds1386.cpp +++ b/src/devices/machine/ds1386.cpp @@ -27,8 +27,8 @@ #define HOURS_12_24 (0x40) #define HOURS_AM_PM (0x20) -const device_type DS1386_8K = &device_creator; -const device_type DS1386_32K = &device_creator; +const device_type DS1386_8K = device_creator; +const device_type DS1386_32K = device_creator; ds1386_device::ds1386_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, size_t size) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__) diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp index 663b89ce493..c0a6b4bce00 100644 --- a/src/devices/machine/ds2401.cpp +++ b/src/devices/machine/ds2401.cpp @@ -27,7 +27,7 @@ inline void ds2401_device::verboselog(int n_level, const char *s_fmt, ...) } // device type definition -const device_type DS2401 = &device_creator; +const device_type DS2401 = device_creator; ds2401_device::ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DS2401, "DS2401", tag, owner, clock, "ds2401", __FILE__), m_state(0), m_bit(0), m_shift(0), m_byte(0), m_rx(false), m_tx(false), m_timer_main(nullptr), m_timer_reset(nullptr) diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp index 08d4667da97..7d1dbfcf103 100644 --- a/src/devices/machine/ds2404.cpp +++ b/src/devices/machine/ds2404.cpp @@ -18,7 +18,7 @@ //************************************************************************** // device type definition -const device_type DS2404 = &device_creator; +const device_type DS2404 = device_creator; //------------------------------------------------- // ds2404_device - constructor diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp index c7d1dfa544d..1accfc2ace2 100644 --- a/src/devices/machine/ds75160a.cpp +++ b/src/devices/machine/ds75160a.cpp @@ -15,7 +15,7 @@ // DEVICE TYPE DEFINITIONS //************************************************************************** -const device_type DS75160A = &device_creator; +const device_type DS75160A = device_creator; diff --git a/src/devices/machine/ds75161a.cpp b/src/devices/machine/ds75161a.cpp index 2e3fac35883..5c35c4717e2 100644 --- a/src/devices/machine/ds75161a.cpp +++ b/src/devices/machine/ds75161a.cpp @@ -15,7 +15,7 @@ // DEVICE TYPE DEFINITIONS //************************************************************************** -const device_type DS75161A = &device_creator; +const device_type DS75161A = device_creator; diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp index 2643583caf8..d4b83533e5f 100644 --- a/src/devices/machine/e0516.cpp +++ b/src/devices/machine/e0516.cpp @@ -32,7 +32,7 @@ enum //************************************************************************** // device type definition -const device_type E0516 = &device_creator; +const device_type E0516 = device_creator; //------------------------------------------------- // e0516_device - constructor diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp index 4f031f3da28..b7c5d66bee2 100644 --- a/src/devices/machine/e05a03.cpp +++ b/src/devices/machine/e05a03.cpp @@ -14,7 +14,7 @@ DEVICE INTERFACE *****************************************************************************/ -const device_type E05A03 = &device_creator; +const device_type E05A03 = device_creator; e05a03_device::e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, E05A03, "E05A03", tag, owner, clock, "e05a03", __FILE__), diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp index 6f34b42d24c..5ff64619ffa 100644 --- a/src/devices/machine/e05a30.cpp +++ b/src/devices/machine/e05a30.cpp @@ -20,7 +20,7 @@ DEVICE INTERFACE *****************************************************************************/ -const device_type E05A30 = &device_creator; +const device_type E05A30 = device_creator; e05a30_device::e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, E05A30, "E05A30", tag, owner, clock, "e05a30", __FILE__), diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp index cf92b2db69e..46b721d2983 100644 --- a/src/devices/machine/eeprompar.cpp +++ b/src/devices/machine/eeprompar.cpp @@ -121,7 +121,7 @@ eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(con { \ static_set_size(*this, _cells, _bits); \ } \ -const device_type EEPROM_PARALLEL_##_uppercase = &device_creator; +const device_type EEPROM_PARALLEL_##_uppercase = device_creator; // standard 28XX class of 8-bit EEPROMs DEFINE_PARALLEL_EEPROM_DEVICE(28xx, 2804, 2804, 8, 512) DEFINE_PARALLEL_EEPROM_DEVICE(28xx, 2816, 2816, 8, 2048) diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp index 90e03109f76..fb59b51c269 100644 --- a/src/devices/machine/eepromser.cpp +++ b/src/devices/machine/eepromser.cpp @@ -1133,7 +1133,7 @@ eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_# static_set_size(*this, _cells, _bits); \ static_set_address_bits(*this, _addrbits); \ } \ -const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT = &device_creator; +const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT = device_creator; // standard 93CX6 class of 16-bit EEPROMs DEFINE_SERIAL_EEPROM_DEVICE(93cxx, 93c06, 93C06, 16, 16, 6) DEFINE_SERIAL_EEPROM_DEVICE(93cxx, 93c46, 93C46, 16, 64, 6) diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp index 5953419156e..aee6839a658 100644 --- a/src/devices/machine/er2055.cpp +++ b/src/devices/machine/er2055.cpp @@ -17,7 +17,7 @@ //************************************************************************** // device type definition -const device_type ER2055 = &device_creator; +const device_type ER2055 = device_creator; static ADDRESS_MAP_START( er2055_map, AS_PROGRAM, 8, er2055_device ) AM_RANGE(0x0000, 0x003f) AM_RAM diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp index dd9e80434b1..512a783c2f2 100644 --- a/src/devices/machine/f3853.cpp +++ b/src/devices/machine/f3853.cpp @@ -43,7 +43,7 @@ //************************************************************************** // device type definition -const device_type F3853 = &device_creator; +const device_type F3853 = device_creator; //------------------------------------------------- // f3853_device - constructor diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp index 8883bbb0b40..d4151a98b9d 100644 --- a/src/devices/machine/fdc37c665gt.cpp +++ b/src/devices/machine/fdc37c665gt.cpp @@ -59,4 +59,4 @@ machine_config_constructor fdc37c665gt_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(fdc37c665gt); } -const device_type FDC37C665GT = &device_creator; +const device_type FDC37C665GT = device_creator; diff --git a/src/devices/machine/fga002.cpp b/src/devices/machine/fga002.cpp index 72e989153cc..3fcef596746 100644 --- a/src/devices/machine/fga002.cpp +++ b/src/devices/machine/fga002.cpp @@ -64,7 +64,7 @@ // DEVICE DEFINITIONS //************************************************************************** // device type definition -const device_type FGA002 = &device_creator; +const device_type FGA002 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp index 5e281c62511..58cdc33ede3 100644 --- a/src/devices/machine/gayle.cpp +++ b/src/devices/machine/gayle.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type GAYLE = &device_creator; +const device_type GAYLE = device_creator; //************************************************************************** diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp index 76efe7c5c72..1cf2841a6fa 100644 --- a/src/devices/machine/gen_latch.cpp +++ b/src/devices/machine/gen_latch.cpp @@ -14,8 +14,8 @@ // DEVICE TYPE DEFINITIONS //************************************************************************** -const device_type GENERIC_LATCH_8 = &device_creator; -const device_type GENERIC_LATCH_16 = &device_creator; +const device_type GENERIC_LATCH_8 = device_creator; +const device_type GENERIC_LATCH_16 = device_creator; //************************************************************************** diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index af575f674ab..ec4e631ca42 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -9,12 +9,15 @@ #include "emu.h" #include "machine/genpc.h" + +#include "imagedev/cassette.h" #include "machine/i8255.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "sound/speaker.h" #include "machine/ram.h" -#include "imagedev/cassette.h" +#include "sound/spkrdev.h" +#include "speaker.h" + #define VERBOSE_PIO 0 /* PIO (keyboard controller) */ @@ -386,7 +389,7 @@ WRITE8_MEMBER( ibm5160_mb_device::nmi_enable_w ) // GLOBAL VARIABLES //************************************************************************** -const device_type IBM5160_MOTHERBOARD = &device_creator; +const device_type IBM5160_MOTHERBOARD = device_creator; //************************************************************************** // DEVICE CONFIGURATION @@ -573,7 +576,7 @@ void ibm5160_mb_device::device_reset() // GLOBAL VARIABLES //************************************************************************** -const device_type IBM5150_MOTHERBOARD = &device_creator; +const device_type IBM5150_MOTHERBOARD = device_creator; //************************************************************************** // DEVICE CONFIGURATION @@ -755,7 +758,7 @@ WRITE8_MEMBER( ibm5150_mb_device::pc_ppi_portb_w ) // GLOBAL VARIABLES //************************************************************************** -const device_type EC1841_MOTHERBOARD = &device_creator; +const device_type EC1841_MOTHERBOARD = device_creator; static MACHINE_CONFIG_FRAGMENT( ec1841_mb_config ) MCFG_FRAGMENT_ADD(ibm5160_mb_config) @@ -918,4 +921,4 @@ DEVICE_ADDRESS_MAP_START( map, 8, pc_noppi_mb_device ) AM_RANGE(0x00a0, 0x00a1) AM_WRITE(nmi_enable_w) ADDRESS_MAP_END -const device_type PCNOPPI_MOTHERBOARD = &device_creator; +const device_type PCNOPPI_MOTHERBOARD = device_creator; diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h index 9c982c3fccd..abd6c78974d 100644 --- a/src/devices/machine/genpc.h +++ b/src/devices/machine/genpc.h @@ -6,20 +6,22 @@ * ****************************************************************************/ -#ifndef GENPC_H_ -#define GENPC_H_ +#ifndef MAME_DEVICES_MACHINE_GENPC_H +#define MAME_DEVICES_MACHINE_GENPC_H -#include "machine/ins8250.h" -#include "machine/i8255.h" +#include "imagedev/cassette.h" #include "machine/am9517a.h" -#include "bus/isa/isa.h" -#include "bus/isa/isa_cards.h" -#include "bus/pc_kbd/pc_kbdc.h" +#include "machine/i8255.h" +#include "machine/ins8250.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" #include "machine/ram.h" +#include "sound/spkrdev.h" + +#include "bus/isa/isa.h" +#include "bus/isa/isa_cards.h" +#include "bus/pc_kbd/pc_kbdc.h" + #define MCFG_IBM5160_MOTHERBOARD_ADD(_tag, _cputag) \ MCFG_DEVICE_ADD(_tag, IBM5160_MOTHERBOARD, 0) \ @@ -192,4 +194,4 @@ public: extern const device_type PCNOPPI_MOTHERBOARD; -#endif /* GENPC_H_ */ +#endif // MAME_DEVICES_MACHINE_GENPC_H diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp index f433d68bdb1..71f6504817c 100644 --- a/src/devices/machine/gt64xxx.cpp +++ b/src/devices/machine/gt64xxx.cpp @@ -13,7 +13,7 @@ #define LOG_DMA (0) #define LOG_PCI (0) -const device_type GT64XXX = &device_creator; +const device_type GT64XXX = device_creator; DEVICE_ADDRESS_MAP_START(config_map, 32, gt64xxx_device) AM_INHERIT_FROM(pci_device::config_map) diff --git a/src/devices/machine/hd63450.cpp b/src/devices/machine/hd63450.cpp index a0aa3e3b503..2185103a484 100644 --- a/src/devices/machine/hd63450.cpp +++ b/src/devices/machine/hd63450.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "hd63450.h" -const device_type HD63450 = &device_creator; +const device_type HD63450 = device_creator; hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, HD63450, "Hitachi HD63450", tag, owner, clock, "hd63450", __FILE__), diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp index 80a08dd50e2..885f0ae8b3c 100644 --- a/src/devices/machine/hd64610.cpp +++ b/src/devices/machine/hd64610.cpp @@ -20,7 +20,7 @@ // device type definition -const device_type HD64610 = &device_creator; +const device_type HD64610 = device_creator; //************************************************************************** diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp index e5473bb5ae5..cda79df1137 100644 --- a/src/devices/machine/hdc92x4.cpp +++ b/src/devices/machine/hdc92x4.cpp @@ -4823,5 +4823,5 @@ void hdc92x4_device::device_reset() m_out_dmarq(CLEAR_LINE); } -const device_type HDC9224 = &device_creator; -const device_type HDC9234 = &device_creator; +const device_type HDC9224 = device_creator; +const device_type HDC9234 = device_creator; diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp index 0f427765875..4a43b71686d 100644 --- a/src/devices/machine/hp_taco.cpp +++ b/src/devices/machine/hp_taco.cpp @@ -277,7 +277,7 @@ static const hp_taco_device::tape_pos_t tape_holes[] = { }; // Device type definition -const device_type HP_TACO = &device_creator; +const device_type HP_TACO = device_creator; // Constructors hp_taco_device::hp_taco_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname) diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp index 02aa54d2771..e04fbd5f845 100644 --- a/src/devices/machine/i2cmem.cpp +++ b/src/devices/machine/i2cmem.cpp @@ -58,7 +58,7 @@ static inline void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level //************************************************************************** // device type definition -const device_type I2CMEM = &device_creator; +const device_type I2CMEM = device_creator; //************************************************************************** diff --git a/src/devices/machine/i6300esb.cpp b/src/devices/machine/i6300esb.cpp index 056725c69de..6879a02aeb3 100644 --- a/src/devices/machine/i6300esb.cpp +++ b/src/devices/machine/i6300esb.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "i6300esb.h" -const device_type I6300ESB_WATCHDOG = &device_creator; -const device_type I6300ESB_LPC = &device_creator; +const device_type I6300ESB_WATCHDOG = device_creator; +const device_type I6300ESB_LPC = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, i6300esb_watchdog_device) ADDRESS_MAP_END diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp index 38990cbe508..fb11dc8480d 100644 --- a/src/devices/machine/i80130.cpp +++ b/src/devices/machine/i80130.cpp @@ -16,7 +16,7 @@ //************************************************************************** // device type definition -const device_type I80130 = &device_creator; +const device_type I80130 = device_creator; DEVICE_ADDRESS_MAP_START( rom_map, 16, i80130_device ) diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp index aca33145518..4bdcbf81963 100644 --- a/src/devices/machine/i8155.cpp +++ b/src/devices/machine/i8155.cpp @@ -19,8 +19,8 @@ // device type definitions -const device_type I8155 = &device_creator; -const device_type I8156 = &device_creator; +const device_type I8155 = device_creator; +const device_type I8156 = device_creator; //************************************************************************** diff --git a/src/devices/machine/i8212.cpp b/src/devices/machine/i8212.cpp index a9b12e5937c..7d59c5c09ad 100644 --- a/src/devices/machine/i8212.cpp +++ b/src/devices/machine/i8212.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -const device_type I8212 = &device_creator; +const device_type I8212 = device_creator; //------------------------------------------------- // i8212_device - constructor diff --git a/src/devices/machine/i8214.cpp b/src/devices/machine/i8214.cpp index 4efeb83bf2a..a1f0977baca 100644 --- a/src/devices/machine/i8214.cpp +++ b/src/devices/machine/i8214.cpp @@ -12,7 +12,7 @@ // device type definition -const device_type I8214 = &device_creator; +const device_type I8214 = device_creator; //************************************************************************** diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp index 9ae8c1fdb70..d9dbf235c71 100644 --- a/src/devices/machine/i82371sb.cpp +++ b/src/devices/machine/i82371sb.cpp @@ -4,11 +4,15 @@ #include "emu.h" #include "i82371sb.h" #include "cpu/i386/i386.h" + #include "bus/pc_kbd/keyboards.h" // VGA-HACK #include "video/pc_vga.h" // end-VGA-HACK -const device_type I82371SB_ISA = &device_creator; +#include "speaker.h" + + +const device_type I82371SB_ISA = device_creator; DEVICE_ADDRESS_MAP_START(config_map, 32, i82371sb_isa_device) AM_RANGE(0x4c, 0x4f) AM_READWRITE8 (iort_r, iort_w, 0x000000ff) diff --git a/src/devices/machine/i82371sb.h b/src/devices/machine/i82371sb.h index b35fe2f988a..a64343e232d 100644 --- a/src/devices/machine/i82371sb.h +++ b/src/devices/machine/i82371sb.h @@ -15,7 +15,7 @@ #include "machine/ataintf.h" #include "machine/at_keybc.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "machine/ram.h" #include "machine/nvram.h" diff --git a/src/devices/machine/i8243.cpp b/src/devices/machine/i8243.cpp index 241888bb31a..cc3e23211e8 100644 --- a/src/devices/machine/i8243.cpp +++ b/src/devices/machine/i8243.cpp @@ -16,7 +16,7 @@ //************************************************************************** // device type definition -const device_type I8243 = &device_creator; +const device_type I8243 = device_creator; //------------------------------------------------- // i8243_device - constructor diff --git a/src/devices/machine/i82439hx.cpp b/src/devices/machine/i82439hx.cpp index 9ed288c3346..b1dd2ccd5d7 100644 --- a/src/devices/machine/i82439hx.cpp +++ b/src/devices/machine/i82439hx.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "i82439hx.h" -const device_type I82439HX = &device_creator; +const device_type I82439HX = device_creator; DEVICE_ADDRESS_MAP_START(config_map, 32, i82439hx_host_device) AM_RANGE(0x50, 0x53) AM_READWRITE8(pcon_r, pcon_w, 0x000000ff) diff --git a/src/devices/machine/i82439tx.cpp b/src/devices/machine/i82439tx.cpp index 565dfe0c546..35d82cd8216 100644 --- a/src/devices/machine/i82439tx.cpp +++ b/src/devices/machine/i82439tx.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "i82439tx.h" -const device_type I82439TX_NEW = &device_creator; +const device_type I82439TX_NEW = device_creator; DEVICE_ADDRESS_MAP_START(config_map, 32, i82439tx_host_device) AM_RANGE(0x50, 0x53) AM_READWRITE8(pcon_r, pcon_w, 0x000000ff) diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp index 2c33c6decb3..048e4bc9947 100644 --- a/src/devices/machine/i8251.cpp +++ b/src/devices/machine/i8251.cpp @@ -30,8 +30,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type I8251 = &device_creator; -const device_type V53_SCU = &device_creator; +const device_type I8251 = device_creator; +const device_type V53_SCU = device_creator; template class device_finder; template class device_finder; diff --git a/src/devices/machine/i82541.cpp b/src/devices/machine/i82541.cpp index b319d7cce4f..6ddd492aae9 100644 --- a/src/devices/machine/i82541.cpp +++ b/src/devices/machine/i82541.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "i82541.h" -const device_type I82541 = &device_creator; +const device_type I82541 = device_creator; DEVICE_ADDRESS_MAP_START(registers_map, 32, i82541_device) ADDRESS_MAP_END diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp index 75023183392..522c27a18d4 100644 --- a/src/devices/machine/i8255.cpp +++ b/src/devices/machine/i8255.cpp @@ -63,8 +63,8 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type I8255 = &device_creator; -const device_type I8255A = &device_creator; +const device_type I8255 = device_creator; +const device_type I8255A = device_creator; //************************************************************************** diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp index bc4be4bbb22..a36b670ddc1 100644 --- a/src/devices/machine/i8257.cpp +++ b/src/devices/machine/i8257.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type I8257 = &device_creator; +const device_type I8257 = device_creator; diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp index f4f0c08a55c..8a2509050c0 100644 --- a/src/devices/machine/i8271.cpp +++ b/src/devices/machine/i8271.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "i8271.h" -const device_type I8271 = &device_creator; +const device_type I8271 = device_creator; i8271_device::i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, I8271, "Intel 8271", tag, owner, clock, "i8271", __FILE__), ready_connected(false), mode(0), main_phase(0), diff --git a/src/devices/machine/i8279.cpp b/src/devices/machine/i8279.cpp index 59b78d73553..d279219c8d9 100644 --- a/src/devices/machine/i8279.cpp +++ b/src/devices/machine/i8279.cpp @@ -84,7 +84,7 @@ that uses this feature. //************************************************************************** // device type definition -const device_type I8279 = &device_creator; +const device_type I8279 = device_creator; //------------------------------------------------- // i8279_device - constructor diff --git a/src/devices/machine/i82875p.cpp b/src/devices/machine/i82875p.cpp index cc16a951610..21e7850ccf7 100644 --- a/src/devices/machine/i82875p.cpp +++ b/src/devices/machine/i82875p.cpp @@ -3,9 +3,9 @@ #include "emu.h" #include "i82875p.h" -const device_type I82875P_HOST = &device_creator; -const device_type I82875P_AGP = &device_creator; -const device_type I82875P_OVERFLOW = &device_creator; +const device_type I82875P_HOST = device_creator; +const device_type I82875P_AGP = device_creator; +const device_type I82875P_OVERFLOW = device_creator; DEVICE_ADDRESS_MAP_START(agp_translation_map, 32, i82875p_host_device) ADDRESS_MAP_END diff --git a/src/devices/machine/i8355.cpp b/src/devices/machine/i8355.cpp index bb3731aab58..0d4850e1f59 100644 --- a/src/devices/machine/i8355.cpp +++ b/src/devices/machine/i8355.cpp @@ -39,7 +39,7 @@ enum //************************************************************************** // device type definition -const device_type I8355 = &device_creator; +const device_type I8355 = device_creator; // default address map static ADDRESS_MAP_START( i8355, AS_0, 8, i8355_device ) diff --git a/src/devices/machine/idectrl.cpp b/src/devices/machine/idectrl.cpp index 8a4729e490d..7320f4b7b37 100644 --- a/src/devices/machine/idectrl.cpp +++ b/src/devices/machine/idectrl.cpp @@ -25,7 +25,7 @@ CONSTANTS ***************************************************************************/ -const device_type IDE_CONTROLLER = &device_creator; +const device_type IDE_CONTROLLER = device_creator; ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ata_interface_device(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock, "ide_controller", __FILE__) @@ -88,7 +88,7 @@ WRITE16_MEMBER( ide_controller_device::write_cs1 ) } -const device_type IDE_CONTROLLER_32 = &device_creator; +const device_type IDE_CONTROLLER_32 = device_creator; ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ide_controller_device(mconfig, IDE_CONTROLLER, "IDE Controller (32 bit)", tag, owner, clock, "ide_controller32", __FILE__) @@ -167,7 +167,7 @@ WRITE32_MEMBER(ide_controller_32_device::write_cs1) #define IDE_BUSMASTER_STATUS_ERROR 0x02 #define IDE_BUSMASTER_STATUS_IRQ 0x04 -const device_type BUS_MASTER_IDE_CONTROLLER = &device_creator; +const device_type BUS_MASTER_IDE_CONTROLLER = device_creator; bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ide_controller_32_device(mconfig, BUS_MASTER_IDE_CONTROLLER, "Bus Master IDE Controller", tag, owner, clock, "bus_master_ide_controller", __FILE__), diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp index 4a5d59f9344..e5637dade4c 100644 --- a/src/devices/machine/idehd.cpp +++ b/src/devices/machine/idehd.cpp @@ -774,7 +774,7 @@ void ata_mass_storage_device::process_command() //************************************************************************** // device type definition -const device_type IDE_HARDDISK = &device_creator; +const device_type IDE_HARDDISK = device_creator; //------------------------------------------------- // ide_hdd_device - constructor diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp index 6bb1729f647..df2c5b809b1 100644 --- a/src/devices/machine/im6402.cpp +++ b/src/devices/machine/im6402.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type IM6402 = &device_creator; +const device_type IM6402 = device_creator; diff --git a/src/devices/machine/input_merger.cpp b/src/devices/machine/input_merger.cpp index 27c9c0b2dd3..e77e24f794b 100644 --- a/src/devices/machine/input_merger.cpp +++ b/src/devices/machine/input_merger.cpp @@ -20,8 +20,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type INPUT_MERGER_ACTIVE_HIGH = &device_creator; -const device_type INPUT_MERGER_ACTIVE_LOW = &device_creator; +const device_type INPUT_MERGER_ACTIVE_HIGH = device_creator; +const device_type INPUT_MERGER_ACTIVE_LOW = device_creator; //************************************************************************** diff --git a/src/devices/machine/ins8154.cpp b/src/devices/machine/ins8154.cpp index 4183756f2b1..7d58a299a27 100644 --- a/src/devices/machine/ins8154.cpp +++ b/src/devices/machine/ins8154.cpp @@ -36,7 +36,7 @@ enum //************************************************************************** // device type definition -const device_type INS8154 = &device_creator; +const device_type INS8154 = device_creator; //------------------------------------------------- // ins8154_device - constructor diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp index c0d55d6a12d..5ebebc9f0b9 100644 --- a/src/devices/machine/ins8250.cpp +++ b/src/devices/machine/ins8250.cpp @@ -87,10 +87,10 @@ History: #include "emu.h" #include "machine/ins8250.h" -const device_type INS8250 = &device_creator; -const device_type NS16450 = &device_creator; -const device_type NS16550 = &device_creator; -const device_type PC16552D = &device_creator; +const device_type INS8250 = device_creator; +const device_type NS16450 = device_creator; +const device_type NS16550 = device_creator; +const device_type PC16552D = device_creator; ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, uint32_t clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp index fcc24af7904..844cb0db4f9 100644 --- a/src/devices/machine/intelfsh.cpp +++ b/src/devices/machine/intelfsh.cpp @@ -78,38 +78,38 @@ enum //************************************************************************** // device type definition -const device_type INTEL_28F016S5 = &device_creator; -const device_type SHARP_LH28F016S = &device_creator; -const device_type SHARP_LH28F016S_16BIT = &device_creator; -const device_type ATMEL_29C010 = &device_creator; -const device_type AMD_29F010 = &device_creator; -const device_type AMD_29F040 = &device_creator; -const device_type AMD_29F080 = &device_creator; -const device_type AMD_29F400T = &device_creator; -const device_type AMD_29F800T = &device_creator; -const device_type AMD_29LV200T = &device_creator; -const device_type FUJITSU_29F160T = &device_creator; -const device_type FUJITSU_29F016A = &device_creator; -const device_type FUJITSU_29DL16X = &device_creator; -const device_type INTEL_E28F400B = &device_creator; -const device_type MACRONIX_29L001MC = &device_creator; -const device_type MACRONIX_29LV160TMC = &device_creator; -const device_type TMS_29F040 = &device_creator; - -const device_type PANASONIC_MN63F805MNP = &device_creator; -const device_type SANYO_LE26FV10N1TS = &device_creator; -const device_type SST_28SF040 = &device_creator; -const device_type SST_39VF020 = &device_creator; - -const device_type SHARP_LH28F400 = &device_creator; -const device_type INTEL_E28F008SA = &device_creator; -const device_type INTEL_TE28F160 = &device_creator; -const device_type INTEL_TE28F320 = &device_creator; -const device_type SHARP_UNK128MBIT = &device_creator; -const device_type INTEL_28F320J3D = &device_creator; -const device_type INTEL_28F320J5 = &device_creator; - -const device_type SST_39VF400A = &device_creator; +const device_type INTEL_28F016S5 = device_creator; +const device_type SHARP_LH28F016S = device_creator; +const device_type SHARP_LH28F016S_16BIT = device_creator; +const device_type ATMEL_29C010 = device_creator; +const device_type AMD_29F010 = device_creator; +const device_type AMD_29F040 = device_creator; +const device_type AMD_29F080 = device_creator; +const device_type AMD_29F400T = device_creator; +const device_type AMD_29F800T = device_creator; +const device_type AMD_29LV200T = device_creator; +const device_type FUJITSU_29F160T = device_creator; +const device_type FUJITSU_29F016A = device_creator; +const device_type FUJITSU_29DL16X = device_creator; +const device_type INTEL_E28F400B = device_creator; +const device_type MACRONIX_29L001MC = device_creator; +const device_type MACRONIX_29LV160TMC = device_creator; +const device_type TMS_29F040 = device_creator; + +const device_type PANASONIC_MN63F805MNP = device_creator; +const device_type SANYO_LE26FV10N1TS = device_creator; +const device_type SST_28SF040 = device_creator; +const device_type SST_39VF020 = device_creator; + +const device_type SHARP_LH28F400 = device_creator; +const device_type INTEL_E28F008SA = device_creator; +const device_type INTEL_TE28F160 = device_creator; +const device_type INTEL_TE28F320 = device_creator; +const device_type SHARP_UNK128MBIT = device_creator; +const device_type INTEL_28F320J3D = device_creator; +const device_type INTEL_28F320J5 = device_creator; + +const device_type SST_39VF400A = device_creator; //************************************************************************** diff --git a/src/devices/machine/k033906.cpp b/src/devices/machine/k033906.cpp index 1bc22070ccb..6e0fc522895 100644 --- a/src/devices/machine/k033906.cpp +++ b/src/devices/machine/k033906.cpp @@ -15,7 +15,7 @@ //************************************************************************** // device type definition -const device_type K033906 = &device_creator; +const device_type K033906 = device_creator; //------------------------------------------------- // k033906_device - constructor diff --git a/src/devices/machine/k053252.cpp b/src/devices/machine/k053252.cpp index bcd41295f9b..b13035ffcf4 100644 --- a/src/devices/machine/k053252.cpp +++ b/src/devices/machine/k053252.cpp @@ -62,8 +62,10 @@ TODO: #include "emu.h" #include "k053252.h" +#include "screen.h" -const device_type K053252 = &device_creator; + +const device_type K053252 = device_creator; k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K053252, "K053252 Timing/Interrupt", tag, owner, clock, "k053252", __FILE__) diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h index 577654559c8..1927c99cb3b 100644 --- a/src/devices/machine/k053252.h +++ b/src/devices/machine/k053252.h @@ -2,10 +2,10 @@ // copyright-holders:Angelo Salese /** Konami 053252 **/ /* CRT and interrupt control unit */ -#pragma once +#ifndef MAME_DEVICES_MACHINE_K053252_H +#define MAME_DEVICES_MACHINE_K053252_H -#ifndef __K053252_H__ -#define __K053252_H__ +#pragma once #define MCFG_K053252_INT1_EN_CB(_devcb) \ @@ -30,19 +30,17 @@ k053252_device::static_set_slave_screen(*device, "^" _tag); -class k053252_device : public device_t, - public device_video_interface +class k053252_device : public device_t, public device_video_interface { public: k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - ~k053252_device() {} - template static devcb_base &set_int1_en_callback(device_t &device, _Object object) { return downcast(device).m_int1_en_cb.set_callback(object); } - template static devcb_base &set_int2_en_callback(device_t &device, _Object object) { return downcast(device).m_int2_en_cb.set_callback(object); } - template static devcb_base &set_int1_ack_callback(device_t &device, _Object object) { return downcast(device).m_int1_ack_cb.set_callback(object); } - template static devcb_base &set_int2_ack_callback(device_t &device, _Object object) { return downcast(device).m_int2_ack_cb.set_callback(object); } - //template static devcb_base &set_int_time_callback(device_t &device, _Object object) { return downcast(device).m_int_time_cb.set_callback(object); } - static void set_offsets(device_t &device, int offsx, int offsy) { downcast(device).m_offsx = offsx; downcast(device).m_offsy = offsy;} + template static devcb_base &set_int1_en_callback(device_t &device, Object &&obj) { return downcast(device).m_int1_en_cb.set_callback(std::forward(obj)); } + template static devcb_base &set_int2_en_callback(device_t &device, Object &&obj) { return downcast(device).m_int2_en_cb.set_callback(std::forward(obj)); } + template static devcb_base &set_int1_ack_callback(device_t &device, Object &&obj) { return downcast(device).m_int1_ack_cb.set_callback(std::forward(obj)); } + template static devcb_base &set_int2_ack_callback(device_t &device, Object &&obj) { return downcast(device).m_int2_ack_cb.set_callback(std::forward(obj)); } + //template static devcb_base &set_int_time_callback(device_t &device, Object &&obj) { return downcast(device).m_int_time_cb.set_callback(std::forward(obj)); } + static void set_offsets(device_t &device, int offsx, int offsy) { downcast(device).m_offsx = offsx; downcast(device).m_offsy = offsy; } DECLARE_READ8_MEMBER( read ); // CCU registers DECLARE_WRITE8_MEMBER( write ); @@ -82,4 +80,4 @@ protected: extern const device_type K053252; -#endif /* __K033906_H__ */ +#endif // MAME_DEVICES_MACHINE_K053252_H diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp index d666813951b..11d47320f2d 100644 --- a/src/devices/machine/k056230.cpp +++ b/src/devices/machine/k056230.cpp @@ -15,7 +15,7 @@ //************************************************************************** // device type definition -const device_type K056230 = &device_creator; +const device_type K056230 = device_creator; //------------------------------------------------- // k056230_device - constructor diff --git a/src/devices/machine/kb3600.cpp b/src/devices/machine/kb3600.cpp index dc371ce8ef3..a3ade5080de 100644 --- a/src/devices/machine/kb3600.cpp +++ b/src/devices/machine/kb3600.cpp @@ -33,7 +33,7 @@ //************************************************************************** // devices -const device_type AY3600 = &device_creator; +const device_type AY3600 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp index cd4f9b01bc0..2e9fa529424 100644 --- a/src/devices/machine/keyboard.cpp +++ b/src/devices/machine/keyboard.cpp @@ -234,7 +234,7 @@ INPUT_PORTS_END DEVICE TYPE GLOBALS ***************************************************************************/ -device_type const GENERIC_KEYBOARD = &device_creator; +device_type const GENERIC_KEYBOARD = device_creator; diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp index 8133143fd22..fc68a848b0f 100644 --- a/src/devices/machine/kr2376.cpp +++ b/src/devices/machine/kr2376.cpp @@ -64,7 +64,7 @@ static const uint8_t KR2376_KEY_CODES[3][8][11] = }; -const device_type KR2376 = &device_creator; +const device_type KR2376 = device_creator; kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KR2376, "SMC KR2376", tag, owner, clock, "kr2376", __FILE__), diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h index b69dec3ff86..6065fda25ba 100644 --- a/src/devices/machine/laserdsc.h +++ b/src/devices/machine/laserdsc.h @@ -10,9 +10,10 @@ #pragma once -#ifndef __LASERDSC_H__ -#define __LASERDSC_H__ +#ifndef MAME_DEVICES_MACHINE_LASERDSC_H +#define MAME_DEVICES_MACHINE_LASERDSC_H +#include "screen.h" #include "vbiparse.h" #include "avhuff.h" @@ -412,4 +413,4 @@ inline int laserdisc_device::chapter_from_metadata(const vbi_metadata &metadata) } -#endif +#endif // MAME_DEVICES_MACHINE_LASERDSC_H diff --git a/src/devices/machine/latch.cpp b/src/devices/machine/latch.cpp index b6e04c6ec97..6cf14e413ea 100644 --- a/src/devices/machine/latch.cpp +++ b/src/devices/machine/latch.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "latch.h" -const device_type OUTPUT_LATCH = &device_creator; +const device_type OUTPUT_LATCH = device_creator; output_latch_device::output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, OUTPUT_LATCH, "Output Latch", tag, owner, clock, "output_latch", __FILE__), diff --git a/src/devices/machine/latch8.cpp b/src/devices/machine/latch8.cpp index ff01e9113a2..f7e392db05d 100644 --- a/src/devices/machine/latch8.cpp +++ b/src/devices/machine/latch8.cpp @@ -143,7 +143,7 @@ WRITE8_MEMBER( latch8_device::bit5_w ) { bitx_w(5, offset, data); } WRITE8_MEMBER( latch8_device::bit6_w ) { bitx_w(6, offset, data); } WRITE8_MEMBER( latch8_device::bit7_w ) { bitx_w(7, offset, data); } -const device_type LATCH8 = &device_creator; +const device_type LATCH8 = device_creator; latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock, "latch8", __FILE__), diff --git a/src/devices/machine/lc89510.cpp b/src/devices/machine/lc89510.cpp index daa1498085f..c1cbb62b2e6 100644 --- a/src/devices/machine/lc89510.cpp +++ b/src/devices/machine/lc89510.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "lc89510.h" -const device_type LC89510 = &device_creator; +const device_type LC89510 = device_creator; lc89510_device::lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LC89510, "lc89510_device", tag, owner, clock, "lc89510", __FILE__) diff --git a/src/devices/machine/ldp1000.cpp b/src/devices/machine/ldp1000.cpp index 2c9e8535a34..42bd30443dd 100644 --- a/src/devices/machine/ldp1000.cpp +++ b/src/devices/machine/ldp1000.cpp @@ -27,7 +27,7 @@ ROM_END //************************************************************************** // device type definition -const device_type SONY_LDP1000 = &device_creator; +const device_type SONY_LDP1000 = device_creator; //************************************************************************** diff --git a/src/devices/machine/ldp1450.cpp b/src/devices/machine/ldp1450.cpp index f30a154f013..2e07e47b061 100644 --- a/src/devices/machine/ldp1450.cpp +++ b/src/devices/machine/ldp1450.cpp @@ -34,7 +34,7 @@ ROM_END //************************************************************************** // device type definition -const device_type SONY_LDP1450 = &device_creator; +const device_type SONY_LDP1450 = device_creator; //************************************************************************** diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp index 834b38f056f..6412d1f587a 100644 --- a/src/devices/machine/ldpr8210.cpp +++ b/src/devices/machine/ldpr8210.cpp @@ -68,8 +68,8 @@ //************************************************************************** // devices -const device_type PIONEER_PR8210 = &device_creator; -const device_type SIMUTREK_SPECIAL = &device_creator; +const device_type PIONEER_PR8210 = device_creator; +const device_type SIMUTREK_SPECIAL = device_creator; // bitmaps for the characters diff --git a/src/devices/machine/ldstub.cpp b/src/devices/machine/ldstub.cpp index 7c9e0cb0033..219df8ec3d3 100644 --- a/src/devices/machine/ldstub.cpp +++ b/src/devices/machine/ldstub.cpp @@ -17,5 +17,5 @@ //************************************************************************** // device type definition -const device_type PIONEER_PR7820 = &device_creator; -const device_type PHILLIPS_22VP932 = &device_creator; +const device_type PIONEER_PR7820 = device_creator; +const device_type PHILLIPS_22VP932 = device_creator; diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp index e1b4f8e1a70..47ffb93c5c4 100644 --- a/src/devices/machine/ldv1000.cpp +++ b/src/devices/machine/ldv1000.cpp @@ -52,7 +52,7 @@ //************************************************************************** // devices -const device_type PIONEER_LDV1000 = &device_creator; +const device_type PIONEER_LDV1000 = device_creator; diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp index 258b049da00..6c488e57a1d 100644 --- a/src/devices/machine/ldvp931.cpp +++ b/src/devices/machine/ldvp931.cpp @@ -45,7 +45,7 @@ //************************************************************************** // devices -const device_type PHILLIPS_22VP931 = &device_creator; +const device_type PHILLIPS_22VP931 = device_creator; diff --git a/src/devices/machine/lh5810.cpp b/src/devices/machine/lh5810.cpp index a0a5ad0590d..590037aa940 100644 --- a/src/devices/machine/lh5810.cpp +++ b/src/devices/machine/lh5810.cpp @@ -17,7 +17,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type LH5810 = &device_creator; +const device_type LH5810 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp index 416eb23102d..a068997240c 100644 --- a/src/devices/machine/linflash.cpp +++ b/src/devices/machine/linflash.cpp @@ -34,7 +34,7 @@ WRITE16_MEMBER( linear_flash_pccard_device::write_memory ) } -const device_type LINEAR_FLASH_PCCARD_16MB = &device_creator; +const device_type LINEAR_FLASH_PCCARD_16MB = device_creator; static ADDRESS_MAP_START(linear_flash_pccard_16mb, AS_0, 16, linear_flash_pccard_16mb_device) ADDRESS_MAP_UNMAP_HIGH @@ -71,7 +71,7 @@ machine_config_constructor linear_flash_pccard_16mb_device::device_mconfig_addit } -const device_type LINEAR_FLASH_PCCARD_32MB = &device_creator; +const device_type LINEAR_FLASH_PCCARD_32MB = device_creator; static ADDRESS_MAP_START(linear_flash_pccard_32mb, AS_0, 16, linear_flash_pccard_32mb_device) ADDRESS_MAP_UNMAP_HIGH @@ -124,7 +124,7 @@ machine_config_constructor linear_flash_pccard_32mb_device::device_mconfig_addit } -const device_type LINEAR_FLASH_PCCARD_64MB = &device_creator; +const device_type LINEAR_FLASH_PCCARD_64MB = device_creator; static ADDRESS_MAP_START(linear_flash_pccard_64mb, AS_0, 16, linear_flash_pccard_64mb_device) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/devices/machine/lpc-acpi.cpp b/src/devices/machine/lpc-acpi.cpp index 902a66701bc..0b18a7fe15b 100644 --- a/src/devices/machine/lpc-acpi.cpp +++ b/src/devices/machine/lpc-acpi.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "lpc-acpi.h" -const device_type LPC_ACPI = &device_creator; +const device_type LPC_ACPI = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, lpc_acpi_device) AM_RANGE(0x00, 0x03) AM_READWRITE16(pm1_sts_r, pm1_sts_w, 0x0000ffff) diff --git a/src/devices/machine/lpc-pit.cpp b/src/devices/machine/lpc-pit.cpp index b79b174e0bc..803c7fd0aee 100644 --- a/src/devices/machine/lpc-pit.cpp +++ b/src/devices/machine/lpc-pit.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "lpc-pit.h" -const device_type LPC_PIT = &device_creator; +const device_type LPC_PIT = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, lpc_pit_device) AM_RANGE(0x40, 0x43) AM_READWRITE8(status_r, access_w, 0x00ffffff) diff --git a/src/devices/machine/lpc-rtc.cpp b/src/devices/machine/lpc-rtc.cpp index 277d4b1f9cd..65c49650e0c 100644 --- a/src/devices/machine/lpc-rtc.cpp +++ b/src/devices/machine/lpc-rtc.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "lpc-rtc.h" -const device_type LPC_RTC = &device_creator; +const device_type LPC_RTC = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, lpc_rtc_device) AM_RANGE(0x70, 0x77) AM_READWRITE8(index_r, index_w, 0x00ff00ff) diff --git a/src/devices/machine/lpci.cpp b/src/devices/machine/lpci.cpp index c5b53baa840..ac94da1be17 100644 --- a/src/devices/machine/lpci.cpp +++ b/src/devices/machine/lpci.cpp @@ -80,7 +80,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PCI_BUS_LEGACY = &device_creator; +const device_type PCI_BUS_LEGACY = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp index be1d92b2079..9fedabf18a9 100644 --- a/src/devices/machine/m6m80011ap.cpp +++ b/src/devices/machine/m6m80011ap.cpp @@ -16,7 +16,7 @@ Template for skeleton device //************************************************************************** // device type definition -const device_type M6M80011AP = &device_creator; +const device_type M6M80011AP = device_creator; //************************************************************************** diff --git a/src/devices/machine/mb14241.cpp b/src/devices/machine/mb14241.cpp index 4a462fb6c5b..c341fe8679e 100644 --- a/src/devices/machine/mb14241.cpp +++ b/src/devices/machine/mb14241.cpp @@ -15,7 +15,7 @@ //------------------------------------------------- -const device_type MB14241 = &device_creator; +const device_type MB14241 = device_creator; mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MB14241, "MB14241 Data Shifter", tag, owner, clock, "mb14241", __FILE__), m_shift_data(0), m_shift_count(0) diff --git a/src/devices/machine/mb3773.cpp b/src/devices/machine/mb3773.cpp index 72a4dda7845..18239981249 100644 --- a/src/devices/machine/mb3773.cpp +++ b/src/devices/machine/mb3773.cpp @@ -23,7 +23,7 @@ //************************************************************************** // device type definition -const device_type MB3773 = &device_creator; +const device_type MB3773 = device_creator; //------------------------------------------------- // mb3773_device - constructor diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp index 53eaa818f90..0e7532b1740 100644 --- a/src/devices/machine/mb8421.cpp +++ b/src/devices/machine/mb8421.cpp @@ -15,7 +15,7 @@ #include "machine/mb8421.h" -const device_type MB8421 = &device_creator; +const device_type MB8421 = device_creator; //------------------------------------------------- // mb8421_device - constructor diff --git a/src/devices/machine/mb87078.cpp b/src/devices/machine/mb87078.cpp index 5e0199697bb..cab6460f412 100644 --- a/src/devices/machine/mb87078.cpp +++ b/src/devices/machine/mb87078.cpp @@ -102,7 +102,7 @@ static const int mb87078_gain_percent[66] = { DEVICE INTERFACE *****************************************************************************/ -const device_type MB87078 = &device_creator; +const device_type MB87078 = device_creator; mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MB87078, "MB87078 Volume Controller", tag, owner, clock, "mb87078", __FILE__), diff --git a/src/devices/machine/mb8795.cpp b/src/devices/machine/mb8795.cpp index a427780578e..bf3aadba660 100644 --- a/src/devices/machine/mb8795.cpp +++ b/src/devices/machine/mb8795.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "mb8795.h" -const device_type MB8795 = &device_creator; +const device_type MB8795 = device_creator; DEVICE_ADDRESS_MAP_START(map, 8, mb8795_device) AM_RANGE(0x0, 0x0) AM_READWRITE(txstat_r, txstat_w) diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp index a679e8081e4..ad27bae81e0 100644 --- a/src/devices/machine/mb89352.cpp +++ b/src/devices/machine/mb89352.cpp @@ -108,7 +108,7 @@ * Device config */ -const device_type MB89352A = &device_creator; +const device_type MB89352A = device_creator; /* diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp index f4584971424..1f854473f21 100644 --- a/src/devices/machine/mb89363b.cpp +++ b/src/devices/machine/mb89363b.cpp @@ -81,7 +81,7 @@ -extern const device_type MB89363B = &device_creator; +const device_type MB89363B = device_creator; mb89363b_device::mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/machine/mb89371.cpp b/src/devices/machine/mb89371.cpp index d9ec2f12e48..90bc2097df8 100644 --- a/src/devices/machine/mb89371.cpp +++ b/src/devices/machine/mb89371.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "mb89371.h" -const device_type MB89371 = &device_creator; +const device_type MB89371 = device_creator; mb89371_device::mb89371_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t(mconfig, MB89371, "MB89371 Dual Serial UART", tag, owner, clock, "mb89371", __FILE__) diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index 0b7b9d66d2b..a6ebb615a5b 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -25,7 +25,7 @@ // device type definition -const device_type MC146818 = &device_creator; +const device_type MC146818 = device_creator; //------------------------------------------------- // mc146818_device - constructor diff --git a/src/devices/machine/mc2661.cpp b/src/devices/machine/mc2661.cpp index 2548fbb50e3..8f79893aadd 100644 --- a/src/devices/machine/mc2661.cpp +++ b/src/devices/machine/mc2661.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MC2661 = &device_creator; +const device_type MC2661 = device_creator; diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp index 052565ae315..6b548a62a00 100644 --- a/src/devices/machine/mc68328.cpp +++ b/src/devices/machine/mc68328.cpp @@ -28,7 +28,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, co } } -const device_type MC68328 = &device_creator; +const device_type MC68328 = device_creator; mc68328_device::mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp index a7b0684d2cd..64b09f2de8d 100644 --- a/src/devices/machine/mc6843.cpp +++ b/src/devices/machine/mc6843.cpp @@ -72,7 +72,7 @@ static const char *const mc6843_cmd[16] = -const device_type MC6843 = &device_creator; +const device_type MC6843 = device_creator; mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MC6843, "MC6843 floppy controller", tag, owner, clock, "mc6843", __FILE__), diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp index d2cbc0ecdbb..a250c67b15b 100644 --- a/src/devices/machine/mc6846.cpp +++ b/src/devices/machine/mc6846.cpp @@ -43,7 +43,7 @@ #define FACTOR ((m_tcr & 4) ? 8 : 1) -const device_type MC6846 = &device_creator; +const device_type MC6846 = device_creator; mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MC6846, "MC6846 Programmable Timer", tag, owner, clock, "mc6846", __FILE__), diff --git a/src/devices/machine/mc6852.cpp b/src/devices/machine/mc6852.cpp index b07597b6417..39291a0ea65 100644 --- a/src/devices/machine/mc6852.cpp +++ b/src/devices/machine/mc6852.cpp @@ -29,7 +29,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MC6852 = &device_creator; +const device_type MC6852 = device_creator; diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp index 079d138966e..1164b35308e 100644 --- a/src/devices/machine/mc6854.cpp +++ b/src/devices/machine/mc6854.cpp @@ -165,7 +165,7 @@ static const int word_length[4] = { 5, 6, 7, 8 }; -const device_type MC6854 = &device_creator; +const device_type MC6854 = device_creator; mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MC6854, "MC6854 ADLC", tag, owner, clock, "mc6854", __FILE__), diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp index 7428929ab3c..cc3c88d4103 100644 --- a/src/devices/machine/mc68681.cpp +++ b/src/devices/machine/mc68681.cpp @@ -56,9 +56,9 @@ static const int baud_rate_ACR_1[] = { 75, 110, 134, 150, 300, 600, 1200, 2000, #define CHAND_TAG "chd" // device type definition -const device_type MC68681 = &device_creator; -const device_type SC28C94 = &device_creator; -const device_type MC68681_CHANNEL = &device_creator; +const device_type MC68681 = device_creator; +const device_type SC28C94 = device_creator; +const device_type MC68681_CHANNEL = device_creator; MACHINE_CONFIG_FRAGMENT( duart68681 ) MCFG_DEVICE_ADD(CHANA_TAG, MC68681_CHANNEL, 0) diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp index fa6256f1871..5239cceb660 100644 --- a/src/devices/machine/mc68901.cpp +++ b/src/devices/machine/mc68901.cpp @@ -49,7 +49,7 @@ // device type definition -const device_type MC68901 = &device_creator; +const device_type MC68901 = device_creator; //************************************************************************** diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp index f7937780d47..0a39b833529 100644 --- a/src/devices/machine/mccs1850.cpp +++ b/src/devices/machine/mccs1850.cpp @@ -100,7 +100,7 @@ enum //************************************************************************** // device type definition -const device_type MCCS1850 = &device_creator; +const device_type MCCS1850 = device_creator; diff --git a/src/devices/machine/mcf5206e.cpp b/src/devices/machine/mcf5206e.cpp index 5b69889de56..c9e18c24cc7 100644 --- a/src/devices/machine/mcf5206e.cpp +++ b/src/devices/machine/mcf5206e.cpp @@ -822,7 +822,7 @@ WRITE16_MEMBER( mcf5206e_peripheral_device::TCN1_w) //************************************************************************** // device type definition -const device_type MCF5206E_PERIPHERAL = &device_creator; +const device_type MCF5206E_PERIPHERAL = device_creator; //------------------------------------------------- // mcf5206e_peripheral_device - constructor diff --git a/src/devices/machine/microtch.cpp b/src/devices/machine/microtch.cpp index a9e309eb5d5..93c51dc8208 100644 --- a/src/devices/machine/microtch.cpp +++ b/src/devices/machine/microtch.cpp @@ -16,7 +16,7 @@ #define LOG 0 -const device_type MICROTOUCH = &device_creator; +const device_type MICROTOUCH = device_creator; microtouch_device::microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MICROTOUCH, "Microtouch Touchscreen", tag, owner, clock, "microtouch", __FILE__), diff --git a/src/devices/machine/mm5740.cpp b/src/devices/machine/mm5740.cpp index 9756dd95938..fc535c42438 100644 --- a/src/devices/machine/mm5740.cpp +++ b/src/devices/machine/mm5740.cpp @@ -11,12 +11,13 @@ #include + //************************************************************************** // GLOBAL VARIABLES //************************************************************************** // devices -const device_type MM5740 = &device_creator; +const device_type MM5740 = device_creator; //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp index 0cf17b48ce9..e84dbad17e9 100644 --- a/src/devices/machine/mm58167.cpp +++ b/src/devices/machine/mm58167.cpp @@ -17,7 +17,7 @@ //************************************************************************** // device type definition -const device_type MM58167 = &device_creator; +const device_type MM58167 = device_creator; // registers (0-7 are the live data, 8-f are the setting for the compare IRQ) typedef enum diff --git a/src/devices/machine/mm58274c.cpp b/src/devices/machine/mm58274c.cpp index fe29117ce3a..491ace25a34 100644 --- a/src/devices/machine/mm58274c.cpp +++ b/src/devices/machine/mm58274c.cpp @@ -44,7 +44,7 @@ enum -const device_type MM58274C = &device_creator; +const device_type MM58274C = device_creator; mm58274c_device::mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp index 1b44783abc6..1effb4ac144 100644 --- a/src/devices/machine/mm74c922.cpp +++ b/src/devices/machine/mm74c922.cpp @@ -23,8 +23,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MM74C922 = &device_creator; -const device_type MM74C923 = &device_creator; +const device_type MM74C922 = device_creator; +const device_type MM74C923 = device_creator; diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp index c5f08a68530..265f4eabb6c 100644 --- a/src/devices/machine/mos6526.cpp +++ b/src/devices/machine/mos6526.cpp @@ -112,10 +112,10 @@ enum // DEVICE TYPE DEFINITIONS //************************************************************************** -const device_type MOS6526 = &device_creator; -const device_type MOS6526A = &device_creator; -const device_type MOS8520 = &device_creator; -const device_type MOS5710 = &device_creator; +const device_type MOS6526 = device_creator; +const device_type MOS6526A = device_creator; +const device_type MOS8520 = device_creator; +const device_type MOS5710 = device_creator; diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp index 297ab50ae1e..d3e3c5a7764 100644 --- a/src/devices/machine/mos6529.cpp +++ b/src/devices/machine/mos6529.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -const device_type MOS6529 = &device_creator; +const device_type MOS6529 = device_creator; diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp index 2a32917d0c4..ce3b0d67b71 100644 --- a/src/devices/machine/mos6530.cpp +++ b/src/devices/machine/mos6530.cpp @@ -38,7 +38,7 @@ enum DEVICE INTERFACE ***************************************************************************/ -const device_type MOS6530 = &device_creator; +const device_type MOS6530 = device_creator; mos6530_device::mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MOS6530, "MOS6530 RRIOT", tag, owner, clock, "mos6530", __FILE__), diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp index e5b290e2cca..ffa182b831c 100644 --- a/src/devices/machine/mos6530n.cpp +++ b/src/devices/machine/mos6530n.cpp @@ -25,8 +25,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MOS6530n = &device_creator; -const device_type MOS6532n = &device_creator; +const device_type MOS6530n = device_creator; +const device_type MOS6532n = device_creator; DEVICE_ADDRESS_MAP_START( rom_map, 8, mos6530_t ) diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp index 594c9ac35a7..9ae4ee3253c 100644 --- a/src/devices/machine/mos6551.cpp +++ b/src/devices/machine/mos6551.cpp @@ -11,7 +11,7 @@ #define LOG 0 -const device_type MOS6551 = &device_creator; +const device_type MOS6551 = device_creator; mos6551_device::mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock, "mos6551", __FILE__), diff --git a/src/devices/machine/mos6702.cpp b/src/devices/machine/mos6702.cpp index b1e54f894d5..69268f6341e 100644 --- a/src/devices/machine/mos6702.cpp +++ b/src/devices/machine/mos6702.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MOS6702 = &device_creator; +const device_type MOS6702 = device_creator; diff --git a/src/devices/machine/mos8706.cpp b/src/devices/machine/mos8706.cpp index d42be7a5c99..d3127eb4e58 100644 --- a/src/devices/machine/mos8706.cpp +++ b/src/devices/machine/mos8706.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -const device_type MOS8706 = &device_creator; +const device_type MOS8706 = device_creator; diff --git a/src/devices/machine/mos8722.cpp b/src/devices/machine/mos8722.cpp index 93e5c34c328..1472320cf57 100644 --- a/src/devices/machine/mos8722.cpp +++ b/src/devices/machine/mos8722.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MOS8722 = &device_creator; +const device_type MOS8722 = device_creator; diff --git a/src/devices/machine/mos8726.cpp b/src/devices/machine/mos8726.cpp index b8e0f280ff4..39d4f450fa8 100644 --- a/src/devices/machine/mos8726.cpp +++ b/src/devices/machine/mos8726.cpp @@ -29,7 +29,7 @@ // DEVICE TYPE DEFINITIONS //************************************************************************** -const device_type MOS8726 = &device_creator; +const device_type MOS8726 = device_creator; diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp index 95a82ea029e..cc65d695476 100644 --- a/src/devices/machine/mpu401.cpp +++ b/src/devices/machine/mpu401.cpp @@ -91,7 +91,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type MPU401 = &device_creator; +const device_type MPU401 = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp index 361f9b7ba71..e5db53f3ec8 100644 --- a/src/devices/machine/msm5832.cpp +++ b/src/devices/machine/msm5832.cpp @@ -23,7 +23,7 @@ // device type definition -const device_type MSM5832 = &device_creator; +const device_type MSM5832 = device_creator; //************************************************************************** diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp index c34f107fa9b..ed0ed62d8b9 100644 --- a/src/devices/machine/msm58321.cpp +++ b/src/devices/machine/msm58321.cpp @@ -21,7 +21,7 @@ // device type definition -const device_type MSM58321 = &device_creator; +const device_type MSM58321 = device_creator; //************************************************************************** diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp index e02732da8c7..fec76467966 100644 --- a/src/devices/machine/msm6242.cpp +++ b/src/devices/machine/msm6242.cpp @@ -54,11 +54,11 @@ enum //************************************************************************** // device type definitions -const device_type MSM6242 = &device_creator; -const device_type RTC62421 = &device_creator; -const device_type RTC62423 = &device_creator; -const device_type RTC72421 = &device_creator; -const device_type RTC72423 = &device_creator; +const device_type MSM6242 = device_creator; +const device_type RTC62421 = device_creator; +const device_type RTC62423 = device_creator; +const device_type RTC72421 = device_creator; +const device_type RTC72423 = device_creator; //************************************************************************** diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp index 37c05421424..23e1ab1b821 100644 --- a/src/devices/machine/ncr5380.cpp +++ b/src/devices/machine/ncr5380.cpp @@ -72,7 +72,7 @@ static int get_cmd_len(int cbyte) // LIVE DEVICE //************************************************************************** -const device_type NCR5380 = &device_creator; +const device_type NCR5380 = device_creator; //------------------------------------------------- // ncr5380_device - constructor/destructor diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp index 84e1c08184e..c8b66fcf3f4 100644 --- a/src/devices/machine/ncr5380n.cpp +++ b/src/devices/machine/ncr5380n.cpp @@ -17,7 +17,7 @@ #include "emu.h" #include "ncr5380n.h" -const device_type NCR5380N = &device_creator; +const device_type NCR5380N = device_creator; DEVICE_ADDRESS_MAP_START(map, 8, ncr5380n_device) AM_RANGE(0x0, 0x0) AM_READWRITE(scsidata_r, outdata_w) diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp index 4fc9257a009..f5fb37be436 100644 --- a/src/devices/machine/ncr5390.cpp +++ b/src/devices/machine/ncr5390.cpp @@ -6,7 +6,7 @@ #define DELAY_HACK -const device_type NCR5390 = &device_creator; +const device_type NCR5390 = device_creator; DEVICE_ADDRESS_MAP_START(map, 8, ncr5390_device) AM_RANGE(0x0, 0x0) AM_READWRITE(tcount_lo_r, tcount_lo_w) diff --git a/src/devices/machine/ncr539x.cpp b/src/devices/machine/ncr539x.cpp index 67959d7fa08..ac7cfcd7698 100644 --- a/src/devices/machine/ncr539x.cpp +++ b/src/devices/machine/ncr539x.cpp @@ -110,7 +110,7 @@ static int get_cmd_len(int cbyte) // LIVE DEVICE //************************************************************************** -const device_type NCR539X = &device_creator; +const device_type NCR539X = device_creator; //------------------------------------------------- // ncr539x_device - constructor/destructor diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index cc80ab894e3..3adb760553a 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -30,21 +30,21 @@ //#define LOG_DEV_CALLS(x) printf x #define LOG_DEV_CALLS(x) do { } while (0) -const device_type NETLIST_CORE = &device_creator; -const device_type NETLIST_CPU = &device_creator; -const device_type NETLIST_SOUND = &device_creator; +const device_type NETLIST_CORE = device_creator; +const device_type NETLIST_CPU = device_creator; +const device_type NETLIST_SOUND = device_creator; /* subdevices */ -const device_type NETLIST_ANALOG_INPUT = &device_creator; -const device_type NETLIST_INT_INPUT = &device_creator; -const device_type NETLIST_RAM_POINTER = &device_creator; -const device_type NETLIST_LOGIC_INPUT = &device_creator; -const device_type NETLIST_STREAM_INPUT = &device_creator; +const device_type NETLIST_ANALOG_INPUT = device_creator; +const device_type NETLIST_INT_INPUT = device_creator; +const device_type NETLIST_RAM_POINTER = device_creator; +const device_type NETLIST_LOGIC_INPUT = device_creator; +const device_type NETLIST_STREAM_INPUT = device_creator; -const device_type NETLIST_LOGIC_OUTPUT = &device_creator; -const device_type NETLIST_ANALOG_OUTPUT = &device_creator; -const device_type NETLIST_STREAM_OUTPUT = &device_creator; +const device_type NETLIST_LOGIC_OUTPUT = device_creator; +const device_type NETLIST_ANALOG_OUTPUT = device_creator; +const device_type NETLIST_STREAM_OUTPUT = device_creator; // ---------------------------------------------------------------------------------------- // Special netlist extension devices .... diff --git a/src/devices/machine/nmc9306.cpp b/src/devices/machine/nmc9306.cpp index aa495a7791e..95ebedd10c7 100644 --- a/src/devices/machine/nmc9306.cpp +++ b/src/devices/machine/nmc9306.cpp @@ -56,7 +56,7 @@ enum //************************************************************************** // device type definition -const device_type NMC9306 = &device_creator; +const device_type NMC9306 = device_creator; //------------------------------------------------- // nmc9306_device - constructor diff --git a/src/devices/machine/nsc810.cpp b/src/devices/machine/nsc810.cpp index 6f6753955c6..a5314ecc3ab 100644 --- a/src/devices/machine/nsc810.cpp +++ b/src/devices/machine/nsc810.cpp @@ -21,7 +21,7 @@ #define LOG (1) -const device_type NSC810 = &device_creator; +const device_type NSC810 = device_creator; nsc810_device::nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NSC810, "National Semiconductor NSC810", tag, owner, clock, "nsc810", __FILE__), m_portA_latch(0), m_portB_latch(0), m_portC_latch(0), diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp index b06e892f58d..819290ea904 100644 --- a/src/devices/machine/nscsi_bus.cpp +++ b/src/devices/machine/nscsi_bus.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "nscsi_bus.h" -const device_type NSCSI_BUS = &device_creator; -const device_type NSCSI_CONNECTOR = &device_creator; +const device_type NSCSI_BUS = device_creator; +const device_type NSCSI_CONNECTOR = device_creator; nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NSCSI_BUS, "NSCSI Bus", tag, owner, clock, "nscsi_bus", __FILE__), data(0), ctrl(0) diff --git a/src/devices/machine/nscsi_cb.cpp b/src/devices/machine/nscsi_cb.cpp index aecf59d00b9..71e83f9a807 100644 --- a/src/devices/machine/nscsi_cb.cpp +++ b/src/devices/machine/nscsi_cb.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "nscsi_cb.h" -const device_type NSCSI_CB = &device_creator; +const device_type NSCSI_CB = device_creator; nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nscsi_device(mconfig, NSCSI_CB, "SCSI callback (new)", tag, owner, clock, "nscsi_cb", __FILE__), diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/machine/nscsi_cd.cpp index d17e3f1e09b..8488907ee64 100644 --- a/src/devices/machine/nscsi_cd.cpp +++ b/src/devices/machine/nscsi_cd.cpp @@ -4,7 +4,7 @@ #include "machine/nscsi_cd.h" #include "imagedev/chd_cd.h" -const device_type NSCSI_CDROM = &device_creator; +const device_type NSCSI_CDROM = device_creator; nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nscsi_full_device(mconfig, NSCSI_CDROM, "SCSI CDROM", tag, owner, clock, "scsi_cdrom", __FILE__), cdrom(nullptr), bytes_per_sector(0), lba(0), cur_lba(0), blocks(0) diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp index 3a493c08550..e45f78036d1 100644 --- a/src/devices/machine/nscsi_hd.cpp +++ b/src/devices/machine/nscsi_hd.cpp @@ -4,7 +4,7 @@ #include "machine/nscsi_hd.h" #include "imagedev/harddriv.h" -const device_type NSCSI_HARDDISK = &device_creator; +const device_type NSCSI_HARDDISK = device_creator; nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nscsi_full_device(mconfig, NSCSI_HARDDISK, "SCSI HARDDISK", tag, owner, clock, "scsi_harddisk", __FILE__), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0) diff --git a/src/devices/machine/nscsi_s1410.cpp b/src/devices/machine/nscsi_s1410.cpp index 554ba24a11d..f35d30976ff 100644 --- a/src/devices/machine/nscsi_s1410.cpp +++ b/src/devices/machine/nscsi_s1410.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "machine/nscsi_s1410.h" -const device_type NSCSI_S1410 = &device_creator; +const device_type NSCSI_S1410 = device_creator; nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nscsi_harddisk_device(mconfig, NSCSI_S1410, "S1410", tag, owner, clock, "scsi_s1410", __FILE__) diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp index b265bad4831..d18709234e4 100644 --- a/src/devices/machine/nvram.cpp +++ b/src/devices/machine/nvram.cpp @@ -16,7 +16,7 @@ //************************************************************************** // device type definition -const device_type NVRAM = &device_creator; +const device_type NVRAM = device_creator; //------------------------------------------------- // nvram_device - constructor diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp index 9806abf6903..2698b43e06c 100644 --- a/src/devices/machine/pc_fdc.cpp +++ b/src/devices/machine/pc_fdc.cpp @@ -16,8 +16,8 @@ #include "emu.h" #include "machine/pc_fdc.h" -const device_type PC_FDC_XT = &device_creator; -const device_type PC_FDC_AT = &device_creator; +const device_type PC_FDC_XT = device_creator; +const device_type PC_FDC_AT = device_creator; static MACHINE_CONFIG_FRAGMENT( cfg ) MCFG_UPD765A_ADD("upd765", false, false) diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp index 93652755d84..d1676fc1232 100644 --- a/src/devices/machine/pc_lpt.cpp +++ b/src/devices/machine/pc_lpt.cpp @@ -10,7 +10,7 @@ #include "pc_lpt.h" -const device_type PC_LPT = &device_creator; +const device_type PC_LPT = device_creator; pc_lpt_device::pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PC_LPT, "PC-LPT", tag, owner, clock, "pc_lpt", __FILE__), diff --git a/src/devices/machine/pccard.cpp b/src/devices/machine/pccard.cpp index a5ba5bd7235..dbbec3ce98f 100644 --- a/src/devices/machine/pccard.cpp +++ b/src/devices/machine/pccard.cpp @@ -25,7 +25,7 @@ WRITE16_MEMBER( pccard_interface::write_reg ) //printf("unhandled register write %08x %04x %04x\n", offset, data, mem_mask); } -const device_type PCCARD_SLOT = &device_creator; +const device_type PCCARD_SLOT = device_creator; pccard_slot_device::pccard_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__), diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp index 77527bf4621..5acab4ec7dc 100644 --- a/src/devices/machine/pcf8593.cpp +++ b/src/devices/machine/pcf8593.cpp @@ -40,7 +40,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PCF8593 = &device_creator; +const device_type PCF8593 = device_creator; //------------------------------------------------- diff --git a/src/devices/machine/pci-apic.cpp b/src/devices/machine/pci-apic.cpp index 2595289d0d1..26246eb675c 100644 --- a/src/devices/machine/pci-apic.cpp +++ b/src/devices/machine/pci-apic.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "pci-apic.h" -const device_type APIC = &device_creator; +const device_type APIC = device_creator; apic_device::apic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, APIC, "I/O Advanced Programmable Interrupt Controller", tag, owner, clock, "apic", __FILE__) diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp index 9c533e62655..3030cbb08f7 100644 --- a/src/devices/machine/pci-ide.cpp +++ b/src/devices/machine/pci-ide.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "pci-ide.h" -const device_type IDE_PCI = &device_creator; +const device_type IDE_PCI = device_creator; ide_pci_device::ide_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, IDE_PCI, "IDE PCI interface", tag, owner, clock, "ide_pci", __FILE__), diff --git a/src/devices/machine/pci-sata.cpp b/src/devices/machine/pci-sata.cpp index a77bd4ada49..178bc4b12ce 100644 --- a/src/devices/machine/pci-sata.cpp +++ b/src/devices/machine/pci-sata.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "pci-sata.h" -const device_type SATA = &device_creator; +const device_type SATA = device_creator; sata_device::sata_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, SATA, "SATA AHCI interface", tag, owner, clock, "sata", __FILE__) diff --git a/src/devices/machine/pci-smbus.cpp b/src/devices/machine/pci-smbus.cpp index f1cc7a98976..36d9cf1be93 100644 --- a/src/devices/machine/pci-smbus.cpp +++ b/src/devices/machine/pci-smbus.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "pci-smbus.h" -const device_type SMBUS = &device_creator; +const device_type SMBUS = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, smbus_device) AM_RANGE(0x00, 0x03) AM_READWRITE8 (hst_sts_r, hst_sts_w, 0x000000ff) diff --git a/src/devices/machine/pci-usb.cpp b/src/devices/machine/pci-usb.cpp index f44d2a6ce5b..f2f714e4612 100644 --- a/src/devices/machine/pci-usb.cpp +++ b/src/devices/machine/pci-usb.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "pci-usb.h" -const device_type USB_UHCI = &device_creator; -const device_type USB_EHCI = &device_creator; +const device_type USB_UHCI = device_creator; +const device_type USB_EHCI = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, usb_uhci_device) ADDRESS_MAP_END diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp index caaef7bcdb2..42c830d19f6 100644 --- a/src/devices/machine/pci.cpp +++ b/src/devices/machine/pci.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "pci.h" -const device_type PCI_ROOT = &device_creator; -const device_type PCI_BRIDGE = &device_creator; +const device_type PCI_ROOT = device_creator; +const device_type PCI_BRIDGE = device_creator; DEVICE_ADDRESS_MAP_START(config_map, 32, pci_device) AM_RANGE(0x00, 0x03) AM_READ16 (vendor_r, 0x0000ffff) diff --git a/src/devices/machine/pci9050.cpp b/src/devices/machine/pci9050.cpp index da70aab3a22..fe624ffefc8 100644 --- a/src/devices/machine/pci9050.cpp +++ b/src/devices/machine/pci9050.cpp @@ -24,7 +24,7 @@ #include "emu.h" #include "pci9050.h" -const device_type PCI9050 = &device_creator; +const device_type PCI9050 = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, pci9050_device) AM_RANGE(0x00, 0x0f) AM_READWRITE(lasrr_r, lasrr_w ) diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp index 4b6e7713dcd..76ace041e78 100644 --- a/src/devices/machine/pckeybrd.cpp +++ b/src/devices/machine/pckeybrd.cpp @@ -275,8 +275,8 @@ const at_keyboard_device::extended_keyboard_code at_keyboard_device::m_extended_ }; -const device_type PC_KEYB = &device_creator; -const device_type AT_KEYB = &device_creator; +const device_type PC_KEYB = device_creator; +const device_type AT_KEYB = device_creator; pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PC_KEYB, "PC Keyboard", tag, owner, clock, "pc_keyb", __FILE__), diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp index e050c78e5eb..f13a810f96a 100644 --- a/src/devices/machine/pdc.cpp +++ b/src/devices/machine/pdc.cpp @@ -113,7 +113,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PDC = &device_creator; +const device_type PDC = device_creator; //------------------------------------------------- // ROM( PDC ) diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp index 18166c068cc..3d0015f4648 100644 --- a/src/devices/machine/phi.cpp +++ b/src/devices/machine/phi.cpp @@ -167,7 +167,7 @@ enum { #define CONTROLLER_ADDR 0x1e // PHI always has this address when it's a controller // Device type definition -const device_type PHI = &device_creator; +const device_type PHI = device_creator; // Constructors phi_device::phi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname) diff --git a/src/devices/machine/pic8259.cpp b/src/devices/machine/pic8259.cpp index ec2dbb67165..ecd15713912 100644 --- a/src/devices/machine/pic8259.cpp +++ b/src/devices/machine/pic8259.cpp @@ -428,7 +428,7 @@ void pic8259_device::device_reset() m_master = m_sp_en_func(); } -const device_type PIC8259 = &device_creator; +const device_type PIC8259 = device_creator; pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PIC8259, "8259 PIC", tag, owner, clock, "pit8259", __FILE__) diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index 87f669b2b3e..32cae233483 100644 --- a/src/devices/machine/pit8253.cpp +++ b/src/devices/machine/pit8253.cpp @@ -43,7 +43,7 @@ enum #define LOG2(msg) do { if (VERBOSE >= 2) logerror msg; } while (0) -const device_type PIT8253 = &device_creator; +const device_type PIT8253 = device_creator; pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : @@ -69,7 +69,7 @@ pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, } -const device_type PIT8254 = &device_creator; +const device_type PIT8254 = device_creator; pit8254_device::pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pit8253_device(mconfig, PIT8254, "8254 PIT", tag, owner, clock, "pit8254", __FILE__) diff --git a/src/devices/machine/pla.cpp b/src/devices/machine/pla.cpp index 0686dd878fe..2c9b844b57d 100644 --- a/src/devices/machine/pla.cpp +++ b/src/devices/machine/pla.cpp @@ -12,7 +12,7 @@ #include "plaparse.h" -const device_type PLA = &device_creator; +const device_type PLA = device_creator; //------------------------------------------------- // pla_device - constructor diff --git a/src/devices/machine/r10696.cpp b/src/devices/machine/r10696.cpp index e04484fa32e..f3a353b7ec0 100644 --- a/src/devices/machine/r10696.cpp +++ b/src/devices/machine/r10696.cpp @@ -45,7 +45,7 @@ * *************************************/ -const device_type R10696 = &device_creator; +const device_type R10696 = device_creator; r10696_device::r10696_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, R10696, "Rockwell 10696", tag, owner, clock, "r10696", __FILE__), diff --git a/src/devices/machine/r10788.cpp b/src/devices/machine/r10788.cpp index f3efa531930..75a486c1915 100644 --- a/src/devices/machine/r10788.cpp +++ b/src/devices/machine/r10788.cpp @@ -52,7 +52,7 @@ * *************************************/ -const device_type R10788 = &device_creator; +const device_type R10788 = device_creator; r10788_device::r10788_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, R10788, "Rockwell 10788", tag, owner, clock, "r10788", __FILE__), diff --git a/src/devices/machine/ra17xx.cpp b/src/devices/machine/ra17xx.cpp index ae948c4e903..6324a70c9d7 100644 --- a/src/devices/machine/ra17xx.cpp +++ b/src/devices/machine/ra17xx.cpp @@ -53,7 +53,7 @@ * *************************************/ -const device_type RA17XX = &device_creator; +const device_type RA17XX = device_creator; ra17xx_device::ra17xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RA17XX, "Rockwell A17XX", tag, owner, clock, "ra17xx", __FILE__), diff --git a/src/devices/machine/ram.cpp b/src/devices/machine/ram.cpp index 2872499ca31..49ff027ed0f 100644 --- a/src/devices/machine/ram.cpp +++ b/src/devices/machine/ram.cpp @@ -21,7 +21,7 @@ *****************************************************************************/ // device type definition -const device_type RAM = &device_creator; +const device_type RAM = device_creator; template class device_finder; template class device_finder; diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h index 30f2e289b9c..86a85c341a6 100644 --- a/src/devices/machine/ram.h +++ b/src/devices/machine/ram.h @@ -90,7 +90,7 @@ private: extern const device_type RAM; // device iterator -typedef device_type_iterator<&device_creator, ram_device> ram_device_iterator; +typedef device_type_iterator ram_device_iterator; extern template class device_finder; extern template class device_finder; diff --git a/src/devices/machine/rf5c296.cpp b/src/devices/machine/rf5c296.cpp index 4c6ce622f3a..abb0884b9e2 100644 --- a/src/devices/machine/rf5c296.cpp +++ b/src/devices/machine/rf5c296.cpp @@ -5,7 +5,7 @@ // rf5c296 is very inaccurate at that point, it hardcodes the gnet config -const device_type RF5C296 = &device_creator; +const device_type RF5C296 = device_creator; rf5c296_device::rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__), m_rf5c296_reg(0), m_pccard(nullptr), m_pccard_name(nullptr) diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp index 009e5109bbc..3be5f16a2a1 100644 --- a/src/devices/machine/roc10937.cpp +++ b/src/devices/machine/roc10937.cpp @@ -244,7 +244,7 @@ void rocvfd_t::shift_clock(int state) } /////////////////////////////////////////////////////////////////////////// -const device_type ROC10937 = &device_creator; +const device_type ROC10937 = device_creator; roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : rocvfd_t(mconfig, ROC10937, "Rockwell 10937 VFD controller and compatible", tag, owner, clock, "roc10937", __FILE__) @@ -252,7 +252,7 @@ roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t m_port_val=0; } -const device_type MSC1937 = &device_creator; +const device_type MSC1937 = device_creator; msc1937_t::msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : rocvfd_t(mconfig, MSC1937, "OKI MSC1937 VFD controller", tag, owner, clock, "msc1937", __FILE__) @@ -260,7 +260,7 @@ msc1937_t::msc1937_t(const machine_config &mconfig, const char *tag, device_t *o m_port_val=0; } -const device_type MIC10937 = &device_creator; +const device_type MIC10937 = device_creator; mic10937_t::mic10937_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : rocvfd_t(mconfig, MIC10937, "Micrel MIC10937 VFD controller", tag, owner, clock, "mic10937", __FILE__) @@ -268,7 +268,7 @@ mic10937_t::mic10937_t(const machine_config &mconfig, const char *tag, device_t m_port_val=0; } -const device_type S16LF01 = &device_creator; +const device_type S16LF01 = device_creator; s16lf01_t::s16lf01_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : rocvfd_t(mconfig, S16LF01, "Samsung 16LF01 Series VFD controller and compatible", tag, owner, clock, "s16lf01", __FILE__) @@ -327,7 +327,7 @@ void rocvfd_t::write_char(int data) } } -const device_type ROC10957 = &device_creator; +const device_type ROC10957 = device_creator; roc10957_t::roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : rocvfd_t(mconfig, ROC10957, "Rockwell 10957 VFD controller and compatible", tag, owner, clock, "roc10957", __FILE__) diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp index c07b5353c3c..a7b9a3ec067 100644 --- a/src/devices/machine/rp5c01.cpp +++ b/src/devices/machine/rp5c01.cpp @@ -21,7 +21,7 @@ // device type definition -const device_type RP5C01 = &device_creator; +const device_type RP5C01 = device_creator; //************************************************************************** diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp index 944d13302e9..4c5d73c044c 100644 --- a/src/devices/machine/rp5c15.cpp +++ b/src/devices/machine/rp5c15.cpp @@ -106,7 +106,7 @@ enum //************************************************************************** // devices -const device_type RP5C15 = &device_creator; +const device_type RP5C15 = device_creator; diff --git a/src/devices/machine/rp5h01.cpp b/src/devices/machine/rp5h01.cpp index debc6e32094..2bf8dbdc6ee 100644 --- a/src/devices/machine/rp5h01.cpp +++ b/src/devices/machine/rp5h01.cpp @@ -30,7 +30,7 @@ uint8_t const rp5h01_device::s_initial_data[0x10] = // rp5h01_device - constructor //------------------------------------------------- -const device_type RP5H01 = &device_creator; +const device_type RP5H01 = device_creator; rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RP5H01, "RP5H01 6/7-bit Counter", tag, owner, clock, "rp5h01", __FILE__) diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp index 725329fb988..761f1c0246b 100644 --- a/src/devices/machine/rtc4543.cpp +++ b/src/devices/machine/rtc4543.cpp @@ -40,7 +40,7 @@ const char *rtc4543_device::s_reg_names[7] = //************************************************************************** // device type definition -const device_type RTC4543 = &device_creator; +const device_type RTC4543 = device_creator; //------------------------------------------------- @@ -347,7 +347,7 @@ void rtc4543_device::update_effective() //************************************************************************** // device type definition -const device_type JRC6355E = &device_creator; +const device_type JRC6355E = device_creator; //------------------------------------------------- diff --git a/src/devices/machine/rtc65271.cpp b/src/devices/machine/rtc65271.cpp index edcb44880ba..f45091efbc6 100644 --- a/src/devices/machine/rtc65271.cpp +++ b/src/devices/machine/rtc65271.cpp @@ -646,7 +646,7 @@ TIMER_CALLBACK_MEMBER(rtc65271_device::rtc_end_update_cb) } // device type definition -const device_type RTC65271 = &device_creator; +const device_type RTC65271 = device_creator; //------------------------------------------------- // rtc65271_device - constructor diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp index 8a2bbc8915e..7d3b8b5867a 100644 --- a/src/devices/machine/rtc9701.cpp +++ b/src/devices/machine/rtc9701.cpp @@ -23,7 +23,7 @@ ALLOW_SAVE_TYPE(rtc9701_state_t); //************************************************************************** // device type definition -const device_type rtc9701 = &device_creator; +const device_type rtc9701 = device_creator; //************************************************************************** diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp index 569f9d12599..3302a9b92c5 100644 --- a/src/devices/machine/s2636.cpp +++ b/src/devices/machine/s2636.cpp @@ -121,6 +121,8 @@ #include "emu.h" #include "machine/s2636.h" +#include "screen.h" + int const s2636_device::OFFS_OBJ[s2636_device::OBJ_COUNT] = { 0x000, 0x010, 0x020, 0x040 }; @@ -153,7 +155,7 @@ uint16_t const s2636_device::SCORE_FONT[16][5] = * *************************************/ -const device_type S2636 = &device_creator; +const device_type S2636 = device_creator; s2636_device::s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S2636, "Signetics 2636", tag, owner, clock, "s2636", __FILE__) diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp index f0f80d4c7fa..d1e0235dcb7 100644 --- a/src/devices/machine/s3520cf.cpp +++ b/src/devices/machine/s3520cf.cpp @@ -24,7 +24,7 @@ TODO: //************************************************************************** // device type definition -const device_type S3520CF = &device_creator; +const device_type S3520CF = device_creator; //************************************************************************** diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp index 361410acf5c..f844585dc45 100644 --- a/src/devices/machine/s3c2400.cpp +++ b/src/devices/machine/s3c2400.cpp @@ -9,9 +9,12 @@ *******************************************************************************/ #include "emu.h" +#include "machine/s3c2400.h" + #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#include "machine/s3c2400.h" +#include "screen.h" + #define VERBOSE_LEVEL ( 0 ) @@ -38,7 +41,7 @@ uint32_t s3c2400_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm return s3c24xx_video_update(screen, bitmap, cliprect); } -const device_type S3C2400 = &device_creator; +const device_type S3C2400 = device_creator; s3c2400_device::s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S3C2400, "Samsung S3C2400", tag, owner, clock, "s3c2400", __FILE__), diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp index 0b1f00be67a..ff4fbbd060c 100644 --- a/src/devices/machine/s3c2410.cpp +++ b/src/devices/machine/s3c2410.cpp @@ -9,9 +9,12 @@ *******************************************************************************/ #include "emu.h" +#include "machine/s3c2410.h" + #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#include "machine/s3c2410.h" +#include "screen.h" + #define VERBOSE_LEVEL ( 0 ) @@ -38,7 +41,7 @@ uint32_t s3c2410_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm return s3c24xx_video_update(screen, bitmap, cliprect); } -const device_type S3C2410 = &device_creator; +const device_type S3C2410 = device_creator; s3c2410_device::s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S3C2410, "S3C2410 MCU", tag, owner, clock, "s3c2410", __FILE__), diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp index f55686203ab..43c145bf544 100644 --- a/src/devices/machine/s3c2440.cpp +++ b/src/devices/machine/s3c2440.cpp @@ -9,9 +9,12 @@ *******************************************************************************/ #include "emu.h" +#include "machine/s3c2440.h" + #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#include "machine/s3c2440.h" +#include "screen.h" + #define VERBOSE_LEVEL ( 0 ) @@ -21,10 +24,10 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c { va_list v; char buf[32768]; - va_start( v, s_fmt); - vsprintf( buf, s_fmt, v); - va_end( v); - device.logerror( "%s: %s", device.machine().describe_context( ), buf); + va_start(v, s_fmt); + vsprintf(buf, s_fmt, v); + va_end(v); + device.logerror("%s: %s", device.machine().describe_context( ), buf); } } @@ -38,7 +41,7 @@ uint32_t s3c2440_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm return s3c24xx_video_update( screen, bitmap, cliprect); } -const device_type S3C2440 = &device_creator; +const device_type S3C2440 = device_creator; s3c2440_device::s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S3C2440, "Samsung S3C2440", tag, owner, clock, "s3c2440", __FILE__), diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp index 826a94ae600..ae5f9b0a4f2 100644 --- a/src/devices/machine/s3c44b0.cpp +++ b/src/devices/machine/s3c44b0.cpp @@ -9,11 +9,15 @@ *******************************************************************************/ #include "emu.h" +#include "machine/s3c44b0.h" + #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#include "machine/s3c44b0.h" +#include "screen.h" + #include "coreutil.h" + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...) @@ -29,7 +33,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c } } -const device_type S3C44B0 = &device_creator; +const device_type S3C44B0 = device_creator; s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S3C44B0, "Samsung S3C44B0", tag, owner, clock, "s3c44b0", __FILE__), m_cpu(nullptr), diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp index c7ce9cbac0b..576ab8e312e 100644 --- a/src/devices/machine/scnxx562.cpp +++ b/src/devices/machine/scnxx562.cpp @@ -115,12 +115,12 @@ DONE (x) (p=partly) NMOS CMOS // DEVICE DEFINITIONS //************************************************************************** // device type definition -const device_type DUSCC = &device_creator; -const device_type DUSCC_CHANNEL = &device_creator; -const device_type DUSCC26562 = &device_creator; -const device_type DUSCC26C562 = &device_creator; -const device_type DUSCC68562 = &device_creator; -const device_type DUSCC68C562 = &device_creator; +const device_type DUSCC = device_creator; +const device_type DUSCC_CHANNEL = device_creator; +const device_type DUSCC26562 = device_creator; +const device_type DUSCC26C562 = device_creator; +const device_type DUSCC68562 = device_creator; +const device_type DUSCC68C562 = device_creator; //------------------------------------------------- // device_mconfig_additions - diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp index 8ba5cf91ad4..37248396495 100644 --- a/src/devices/machine/serflash.cpp +++ b/src/devices/machine/serflash.cpp @@ -16,7 +16,7 @@ ALLOW_SAVE_TYPE(flash_state_t); //************************************************************************** // device type definition -const device_type SERFLASH = &device_creator; +const device_type SERFLASH = device_creator; //------------------------------------------------- // serflash_device - constructor diff --git a/src/devices/machine/smartmed.cpp b/src/devices/machine/smartmed.cpp index 202a0bc5e68..b8e8014d415 100644 --- a/src/devices/machine/smartmed.cpp +++ b/src/devices/machine/smartmed.cpp @@ -70,7 +70,7 @@ enum }; -const device_type NAND = &device_creator; +const device_type NAND = device_creator; nand_device::nand_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAND, "NAND Flash Memory", tag, owner, clock, "nand", __FILE__), @@ -777,7 +777,7 @@ void nand_device::device_reset() } -const device_type SMARTMEDIA = &device_creator; +const device_type SMARTMEDIA = device_creator; smartmedia_image_device::smartmedia_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nand_device(mconfig, SMARTMEDIA, "SmartMedia Flash ROM", tag, owner, clock, "smartmedia", __FILE__), diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp index 3ac4bed1312..1a44d1ad74b 100644 --- a/src/devices/machine/smc91c9x.cpp +++ b/src/devices/machine/smc91c9x.cpp @@ -181,7 +181,7 @@ void smc91c9x_device::device_reset() } -const device_type SMC91C94 = &device_creator; +const device_type SMC91C94 = device_creator; smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : smc91c9x_device(mconfig, SMC91C94, "SMC91C94 Ethernet Controller", tag, owner, clock, "smc91c94", __FILE__) @@ -189,7 +189,7 @@ smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag, } -const device_type SMC91C96 = &device_creator; +const device_type SMC91C96 = device_creator; smc91c96_device::smc91c96_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : smc91c9x_device(mconfig, SMC91C96, "SMC91C96", tag, owner, clock, "smc91c96", __FILE__) diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp index 749f5bc8f8b..f854566e57d 100644 --- a/src/devices/machine/smpc.cpp +++ b/src/devices/machine/smpc.cpp @@ -149,10 +149,14 @@ TODO: */ #include "emu.h" -#include "coreutil.h" -#include "includes/saturn.h" #include "machine/smpc.h" +#include "includes/saturn.h" // FIXME: this is a dependency from devices on MAME + #include "machine/eepromser.h" +#include "screen.h" + +#include "coreutil.h" + #define LOG_SMPC 0 #define LOG_PAD_CMD 0 diff --git a/src/devices/machine/sonydriv.cpp b/src/devices/machine/sonydriv.cpp index 8bede7912a0..64b09eebe90 100644 --- a/src/devices/machine/sonydriv.cpp +++ b/src/devices/machine/sonydriv.cpp @@ -525,7 +525,7 @@ void sony_set_speed(int speed) } // device type definition -const device_type FLOPPY_SONY = &device_creator; +const device_type FLOPPY_SONY = device_creator; //------------------------------------------------- // sonydriv_floppy_image_device - constructor diff --git a/src/devices/machine/spchrom.cpp b/src/devices/machine/spchrom.cpp index 10e5ea2fc1e..60396aca84e 100644 --- a/src/devices/machine/spchrom.cpp +++ b/src/devices/machine/spchrom.cpp @@ -23,7 +23,7 @@ #define TMS5220_ADDRESS_MASK 0x3FFFFUL /* 18-bit mask for tms5220 address */ // device type definition -const device_type SPEECHROM = &device_creator; +const device_type SPEECHROM = device_creator; speechrom_device::speechrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SPEECHROM, "SPEECHROM", tag, owner, clock, "speechrom", __FILE__), m_speechrom_data(nullptr), m_speechROMlen(0), diff --git a/src/devices/machine/steppers.cpp b/src/devices/machine/steppers.cpp index 8164e3706fd..20a33cb27c9 100644 --- a/src/devices/machine/steppers.cpp +++ b/src/devices/machine/steppers.cpp @@ -41,7 +41,7 @@ #include "emu.h" #include "steppers.h" -const device_type STEPPER = &device_creator; +const device_type STEPPER = device_creator; stepper_device::stepper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, STEPPER, "Stepper Motor", tag, owner, clock, "stepper", __FILE__), diff --git a/src/devices/machine/strata.cpp b/src/devices/machine/strata.cpp index 8736f75c3db..7b729614028 100644 --- a/src/devices/machine/strata.cpp +++ b/src/devices/machine/strata.cpp @@ -44,7 +44,7 @@ #define SET_BLOCKLOCK(block) (m_blocklock[(block) >> 3] |= 1 << ((block) & 7)) #define CLEAR_BLOCKLOCK(block) (m_blocklock[(block) >> 3] &= ~(1 << ((block) & 7))) -const device_type STRATAFLASH = &device_creator; +const device_type STRATAFLASH = device_creator; strataflash_device::strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, STRATAFLASH, "Intel 28F640J5", tag, owner, clock, "strataflash", __FILE__), diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp index 1bd2f989cc1..f8c289fa4d1 100644 --- a/src/devices/machine/tc009xlvc.cpp +++ b/src/devices/machine/tc009xlvc.cpp @@ -14,7 +14,10 @@ #include "emu.h" #include "machine/tc009xlvc.h" -const device_type TC0091LVC = &device_creator; +#include "screen.h" + + +const device_type TC0091LVC = device_creator; READ8_MEMBER(tc0091lvc_device::tc0091lvc_paletteram_r) diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index c5c291c21c9..5a34a04a304 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -2,6 +2,8 @@ // copyright-holders:Miodrag Milanovic #include "emu.h" #include "machine/terminal.h" +#include "screen.h" +#include "speaker.h" #define KEYBOARD_TAG "keyboard" @@ -444,4 +446,4 @@ ioport_constructor generic_terminal_device::device_input_ports() const return INPUT_PORTS_NAME(generic_terminal); } -const device_type GENERIC_TERMINAL = &device_creator; +const device_type GENERIC_TERMINAL = device_creator; diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index 3cbef2330d4..d63b6984609 100644 --- a/src/devices/machine/timekpr.cpp +++ b/src/devices/machine/timekpr.cpp @@ -19,12 +19,12 @@ #include "machine/timehelp.h" // device type definition -const device_type M48T02 = &device_creator; -const device_type M48T35 = &device_creator; -const device_type M48T37 = &device_creator; -const device_type M48T58 = &device_creator; -const device_type MK48T08 = &device_creator; -const device_type MK48T12 = &device_creator; +const device_type M48T02 = device_creator; +const device_type M48T35 = device_creator; +const device_type M48T37 = device_creator; +const device_type M48T58 = device_creator; +const device_type MK48T08 = device_creator; +const device_type MK48T12 = device_creator; /*************************************************************************** diff --git a/src/devices/machine/tmc0430.cpp b/src/devices/machine/tmc0430.cpp index d2547467abe..d3adcb1a5b1 100644 --- a/src/devices/machine/tmc0430.cpp +++ b/src/devices/machine/tmc0430.cpp @@ -363,4 +363,4 @@ int tmc0430_device::debug_get_address() return m_address; } -const device_type TMC0430 = &device_creator; +const device_type TMC0430 = device_creator; diff --git a/src/devices/machine/tmp68301.cpp b/src/devices/machine/tmp68301.cpp index bd5326a08e6..3a4f5e47ebf 100644 --- a/src/devices/machine/tmp68301.cpp +++ b/src/devices/machine/tmp68301.cpp @@ -19,7 +19,7 @@ #include "emu.h" #include "machine/tmp68301.h" -const device_type TMP68301 = &device_creator; +const device_type TMP68301 = device_creator; static ADDRESS_MAP_START( tmp68301_regs, AS_0, 16, tmp68301_device ) // AM_RANGE(0x000,0x3ff) AM_RAM diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp index e0f98ef00df..7dc30c4437a 100644 --- a/src/devices/machine/tms1024.cpp +++ b/src/devices/machine/tms1024.cpp @@ -18,8 +18,8 @@ #include "machine/tms1024.h" -const device_type TMS1024 = &device_creator; -const device_type TMS1025 = &device_creator; +const device_type TMS1024 = device_creator; +const device_type TMS1025 = device_creator; //------------------------------------------------- // constructor diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp index 868ba213e1b..70e9ab0ebb8 100644 --- a/src/devices/machine/tms5501.cpp +++ b/src/devices/machine/tms5501.cpp @@ -27,7 +27,7 @@ const uint8_t tms5501_device::rst_vector[] = { 0xc7, 0xcf, 0xd7, 0xdf, 0xe7, 0xe //************************************************************************** // device type definition -const device_type TMS5501 = &device_creator; +const device_type TMS5501 = device_creator; // I/O address map diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp index eade390ffee..2ffc32d1638 100644 --- a/src/devices/machine/tms6100.cpp +++ b/src/devices/machine/tms6100.cpp @@ -26,7 +26,7 @@ // device definitions -const device_type TMS6100 = &device_creator; +const device_type TMS6100 = device_creator; tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), @@ -44,7 +44,7 @@ tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, d { } -const device_type M58819 = &device_creator; +const device_type M58819 = device_creator; m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : tms6100_device(mconfig, M58819, "M58819S", tag, owner, clock, "m58819s", __FILE__) diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp index a00b12693e4..c27d790d375 100644 --- a/src/devices/machine/tms9901.cpp +++ b/src/devices/machine/tms9901.cpp @@ -670,4 +670,4 @@ void tms9901_device::device_start(void) save_item(NAME(m_clock_read_register)); } -const device_type TMS9901 = &device_creator; +const device_type TMS9901 = device_creator; diff --git a/src/devices/machine/tms9902.cpp b/src/devices/machine/tms9902.cpp index 96f64376769..7e2db622d31 100644 --- a/src/devices/machine/tms9902.cpp +++ b/src/devices/machine/tms9902.cpp @@ -853,4 +853,4 @@ void tms9902_device::device_start() m_sendtimer = timer_alloc(SENDTIMER); } -const device_type TMS9902 = &device_creator; +const device_type TMS9902 = device_creator; diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp index c64f9f5a871..7a71e318380 100644 --- a/src/devices/machine/upd1990a.cpp +++ b/src/devices/machine/upd1990a.cpp @@ -32,8 +32,8 @@ //************************************************************************** // device type definition -const device_type UPD1990A = &device_creator; -const device_type UPD4990A = &device_creator; +const device_type UPD1990A = device_creator; +const device_type UPD4990A = device_creator; diff --git a/src/devices/machine/upd4701.cpp b/src/devices/machine/upd4701.cpp index bc3f4656908..9fd7b6de7b7 100644 --- a/src/devices/machine/upd4701.cpp +++ b/src/devices/machine/upd4701.cpp @@ -16,7 +16,7 @@ #define MASK_SWITCHES ( 7 ) #define MASK_COUNTER ( 0xfff ) -const device_type UPD4701 = &device_creator; +const device_type UPD4701 = device_creator; upd4701_device::upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, UPD4701, "uPD4701 Encoder", tag, owner, clock, "upd4701", __FILE__), m_cs(0), m_xy(0), m_ul(0), m_resetx(0), m_resety(0), m_latchx(0), m_latchy(0), diff --git a/src/devices/machine/upd4992.cpp b/src/devices/machine/upd4992.cpp index 2e87bd63ecb..95e76c5cdc1 100644 --- a/src/devices/machine/upd4992.cpp +++ b/src/devices/machine/upd4992.cpp @@ -22,7 +22,7 @@ //************************************************************************** // device type definition -const device_type UPD4992 = &device_creator; +const device_type UPD4992 = device_creator; //************************************************************************** diff --git a/src/devices/machine/upd7002.cpp b/src/devices/machine/upd7002.cpp index ba7d2e36ade..17335ddde26 100644 --- a/src/devices/machine/upd7002.cpp +++ b/src/devices/machine/upd7002.cpp @@ -16,7 +16,7 @@ /* Device Interface */ -const device_type UPD7002 = &device_creator; +const device_type UPD7002 = device_creator; upd7002_device::upd7002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, UPD7002, "uPD7002", tag, owner, clock, "upd7002", __FILE__), m_status(0), m_data1(0), m_data0(0), m_digitalvalue(0), m_conversion_counter(0) diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp index 9dd7ef3affa..fadebc5cb83 100644 --- a/src/devices/machine/upd71071.cpp +++ b/src/devices/machine/upd71071.cpp @@ -90,7 +90,7 @@ #include "machine/upd71071.h" -const device_type UPD71071 = &device_creator; +const device_type UPD71071 = device_creator; upd71071_device::upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, UPD71071, "NEC uPD71071", tag, owner, clock, "upd71071", __FILE__), diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index f287929ceb3..9cde0a8515c 100644 --- a/src/devices/machine/upd765.cpp +++ b/src/devices/machine/upd765.cpp @@ -7,18 +7,18 @@ #define LOG 0 -const device_type UPD765A = &device_creator; -const device_type UPD765B = &device_creator; -const device_type I8272A = &device_creator; -const device_type UPD72065 = &device_creator; -const device_type SMC37C78 = &device_creator; -const device_type N82077AA = &device_creator; -const device_type PC_FDC_SUPERIO = &device_creator; -const device_type DP8473 = &device_creator; -const device_type PC8477A = &device_creator; -const device_type WD37C65C = &device_creator; -const device_type MCS3201 = &device_creator; -const device_type TC8566AF = &device_creator; +const device_type UPD765A = device_creator; +const device_type UPD765B = device_creator; +const device_type I8272A = device_creator; +const device_type UPD72065 = device_creator; +const device_type SMC37C78 = device_creator; +const device_type N82077AA = device_creator; +const device_type PC_FDC_SUPERIO = device_creator; +const device_type DP8473 = device_creator; +const device_type PC8477A = device_creator; +const device_type WD37C65C = device_creator; +const device_type MCS3201 = device_creator; +const device_type TC8566AF = device_creator; DEVICE_ADDRESS_MAP_START(map, 8, upd765a_device) AM_RANGE(0x0, 0x0) AM_READ(msr_r) diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp index 73f984fd67c..c448ac3a4ea 100644 --- a/src/devices/machine/v3021.cpp +++ b/src/devices/machine/v3021.cpp @@ -22,7 +22,7 @@ //************************************************************************** // device type definition -const device_type v3021 = &device_creator; +const device_type v3021 = device_creator; //************************************************************************** diff --git a/src/devices/machine/vrc4373.cpp b/src/devices/machine/vrc4373.cpp index d3ec703aaa8..e542b0223ed 100644 --- a/src/devices/machine/vrc4373.cpp +++ b/src/devices/machine/vrc4373.cpp @@ -7,7 +7,7 @@ #define LOG_NILE_MASTER (0) #define LOG_NILE_TARGET (0) -const device_type VRC4373 = &device_creator; +const device_type VRC4373 = device_creator; DEVICE_ADDRESS_MAP_START(config_map, 32, vrc4373_device) AM_RANGE(0x40, 0x43) AM_READWRITE (pcictrl_r, pcictrl_w) diff --git a/src/devices/machine/vt82c496.cpp b/src/devices/machine/vt82c496.cpp index 5449b91a8e4..2abaac5a449 100644 --- a/src/devices/machine/vt82c496.cpp +++ b/src/devices/machine/vt82c496.cpp @@ -13,7 +13,7 @@ IMPLEMENTATION ***************************************************************************/ -const device_type VT82C496 = &device_creator; +const device_type VT82C496 = device_creator; vt82c496_device::vt82c496_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/machine/vt83c461.cpp b/src/devices/machine/vt83c461.cpp index d93e98c08e9..781fc34b9ca 100644 --- a/src/devices/machine/vt83c461.cpp +++ b/src/devices/machine/vt83c461.cpp @@ -17,7 +17,7 @@ #define VT83C461_CONFIG_DATA 3 -const device_type VT83C461 = &device_creator; +const device_type VT83C461 = device_creator; vt83c461_device::vt83c461_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ide_controller_32_device(mconfig, VT83C461, "VIA VT83C461", tag, owner, clock, "vt83c461", __FILE__), diff --git a/src/devices/machine/watchdog.cpp b/src/devices/machine/watchdog.cpp index 74f0083df72..9c4d05de71d 100644 --- a/src/devices/machine/watchdog.cpp +++ b/src/devices/machine/watchdog.cpp @@ -9,15 +9,17 @@ ***************************************************************************/ #include "emu.h" -#include "emuopts.h" #include "watchdog.h" +#include "emuopts.h" +#include "screen.h" + //************************************************************************** // WATCHDOG TIMER DEVICE //************************************************************************** -const device_type WATCHDOG_TIMER = &device_creator; +const device_type WATCHDOG_TIMER = device_creator; //------------------------------------------------- // watchdog_timer_device - constructor diff --git a/src/devices/machine/wd11c00_17.cpp b/src/devices/machine/wd11c00_17.cpp index 694dab86c2b..d6b21f43330 100644 --- a/src/devices/machine/wd11c00_17.cpp +++ b/src/devices/machine/wd11c00_17.cpp @@ -37,7 +37,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type WD11C00_17 = &device_creator; +const device_type WD11C00_17 = device_creator; //************************************************************************** diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp index 6bd76a488e7..8ed394f5b60 100644 --- a/src/devices/machine/wd2010.cpp +++ b/src/devices/machine/wd2010.cpp @@ -132,7 +132,7 @@ static const int SECTOR_SIZES[4] = { 256, 512, 1024, 128 }; // DEVICE DEFINITIONS //************************************************************************** -const device_type WD2010 = &device_creator; +const device_type WD2010 = device_creator; //************************************************************************** diff --git a/src/devices/machine/wd33c93.cpp b/src/devices/machine/wd33c93.cpp index 9489bea0485..ba20d5c324a 100644 --- a/src/devices/machine/wd33c93.cpp +++ b/src/devices/machine/wd33c93.cpp @@ -804,4 +804,4 @@ int wd33c93_device::get_dma_count() return get_xfer_count(); } -const device_type WD33C93 = &device_creator; +const device_type WD33C93 = device_creator; diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp index 8fbdb4f469a..436079e6374 100644 --- a/src/devices/machine/wd7600.cpp +++ b/src/devices/machine/wd7600.cpp @@ -15,7 +15,7 @@ #include "emu.h" #include "machine/wd7600.h" -const device_type WD7600 = &device_creator; +const device_type WD7600 = device_creator; #define LOG (1) diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp index f54fb564c39..f64c1117ed4 100644 --- a/src/devices/machine/wd_fdc.cpp +++ b/src/devices/machine/wd_fdc.cpp @@ -5,29 +5,29 @@ #include "debugger.h" -const device_type FD1771 = &device_creator; -const device_type FD1781 = &device_creator; -const device_type FD1791 = &device_creator; -const device_type FD1792 = &device_creator; -const device_type FD1793 = &device_creator; -const device_type KR1818VG93 = &device_creator; -const device_type FD1794 = &device_creator; -const device_type FD1795 = &device_creator; -const device_type FD1797 = &device_creator; -const device_type MB8866 = &device_creator; -const device_type MB8876 = &device_creator; -const device_type MB8877 = &device_creator; -const device_type FD1761 = &device_creator; -const device_type FD1763 = &device_creator; -const device_type FD1765 = &device_creator; -const device_type FD1767 = &device_creator; -const device_type WD2791 = &device_creator; -const device_type WD2793 = &device_creator; -const device_type WD2795 = &device_creator; -const device_type WD2797 = &device_creator; -const device_type WD1770 = &device_creator; -const device_type WD1772 = &device_creator; -const device_type WD1773 = &device_creator; +const device_type FD1771 = device_creator; +const device_type FD1781 = device_creator; +const device_type FD1791 = device_creator; +const device_type FD1792 = device_creator; +const device_type FD1793 = device_creator; +const device_type KR1818VG93 = device_creator; +const device_type FD1794 = device_creator; +const device_type FD1795 = device_creator; +const device_type FD1797 = device_creator; +const device_type MB8866 = device_creator; +const device_type MB8876 = device_creator; +const device_type MB8877 = device_creator; +const device_type FD1761 = device_creator; +const device_type FD1763 = device_creator; +const device_type FD1765 = device_creator; +const device_type FD1767 = device_creator; +const device_type WD2791 = device_creator; +const device_type WD2793 = device_creator; +const device_type WD2795 = device_creator; +const device_type WD2797 = device_creator; +const device_type WD1770 = device_creator; +const device_type WD1772 = device_creator; +const device_type WD1773 = device_creator; /* Debugging flags. Set to 0 or 1. diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp index 22a76b941fe..0c40cbc55d2 100644 --- a/src/devices/machine/wozfdc.cpp +++ b/src/devices/machine/wozfdc.cpp @@ -21,8 +21,8 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type DISKII_FDC = &device_creator; -const device_type APPLEIII_FDC = &device_creator; +const device_type DISKII_FDC = device_creator; +const device_type APPLEIII_FDC = device_creator; #define DISKII_P6_REGION "diskii_rom_p6" diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp index cb8cbe013d4..abd92ad1b7e 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -31,8 +31,8 @@ ADDRESS_MAP_END //************************************************************************** // device type definition -const device_type X2212 = &device_creator; -const device_type X2210 = &device_creator; +const device_type X2212 = device_creator; +const device_type X2210 = device_creator; //------------------------------------------------- // x2212_device - constructor diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp index 682ecaff8de..e0a1280aff7 100644 --- a/src/devices/machine/x76f041.cpp +++ b/src/devices/machine/x76f041.cpp @@ -32,7 +32,7 @@ inline void ATTR_PRINTF( 3, 4 ) x76f041_device::verboselog( int n_level, const c } // device type definition -const device_type X76F041 = &device_creator; +const device_type X76F041 = device_creator; x76f041_device::x76f041_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t( mconfig, X76F041, "X76F041 Flash", tag, owner, clock, "x76f041", __FILE__ ), diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp index 7a03bf7bed1..4ff06be9f84 100644 --- a/src/devices/machine/x76f100.cpp +++ b/src/devices/machine/x76f100.cpp @@ -30,7 +30,7 @@ inline void ATTR_PRINTF( 3, 4 ) x76f100_device::verboselog( int n_level, const c } // device type definition -const device_type X76F100 = &device_creator; +const device_type X76F100 = device_creator; x76f100_device::x76f100_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t( mconfig, X76F100, "X76F100 Flash", tag, owner, clock, "x76f100", __FILE__ ), diff --git a/src/devices/machine/ym2148.cpp b/src/devices/machine/ym2148.cpp index 4f2e5d696ae..c36ad7b2bf3 100644 --- a/src/devices/machine/ym2148.cpp +++ b/src/devices/machine/ym2148.cpp @@ -13,7 +13,7 @@ TODO: #include "ym2148.h" -const device_type YM2148 = &device_creator; +const device_type YM2148 = device_creator; ym2148_device::ym2148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp index d70afe55281..302572e9a90 100644 --- a/src/devices/machine/z80ctc.cpp +++ b/src/devices/machine/z80ctc.cpp @@ -72,7 +72,7 @@ const int WAITING_FOR_TRIG = 0x100; //************************************************************************** // device type definition -const device_type Z80CTC = &device_creator; +const device_type Z80CTC = device_creator; //------------------------------------------------- // z80ctc_device - constructor diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp index 20c6ef31008..56613998b12 100644 --- a/src/devices/machine/z80dart.cpp +++ b/src/devices/machine/z80dart.cpp @@ -52,15 +52,15 @@ //************************************************************************** // device type definition -const device_type Z80DART = &device_creator; -const device_type Z80DART_CHANNEL = &device_creator; -const device_type Z80SIO0 = &device_creator; -const device_type Z80SIO1 = &device_creator; -const device_type Z80SIO2 = &device_creator; -const device_type Z80SIO3 = &device_creator; -const device_type Z80SIO4 = &device_creator; -const device_type I8274 = &device_creator; -const device_type UPD7201 = &device_creator; +const device_type Z80DART = device_creator; +const device_type Z80DART_CHANNEL = device_creator; +const device_type Z80SIO0 = device_creator; +const device_type Z80SIO1 = device_creator; +const device_type Z80SIO2 = device_creator; +const device_type Z80SIO3 = device_creator; +const device_type Z80SIO4 = device_creator; +const device_type I8274 = device_creator; +const device_type UPD7201 = device_creator; //------------------------------------------------- diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp index 58eb6587cfa..782f7d75ee7 100644 --- a/src/devices/machine/z80dma.cpp +++ b/src/devices/machine/z80dma.cpp @@ -140,7 +140,7 @@ const int TM_SEARCH_TRANSFER = 0x03; //************************************************************************** // device type definition -const device_type Z80DMA = &device_creator; +const device_type Z80DMA = device_creator; //------------------------------------------------- // z80dma_device - constructor diff --git a/src/devices/machine/z80pio.cpp b/src/devices/machine/z80pio.cpp index f7e8927f181..bfa58c80f84 100644 --- a/src/devices/machine/z80pio.cpp +++ b/src/devices/machine/z80pio.cpp @@ -32,7 +32,7 @@ //************************************************************************** // device type definition -const device_type Z80PIO = &device_creator; +const device_type Z80PIO = device_creator; //------------------------------------------------- // z80pio_device - constructor diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index fc50eb65024..06ccfbe3812 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -134,16 +134,16 @@ DONE (x) (p=partly) NMOS CMOS ESCC EMSCC // DEVICE DEFINITIONS //************************************************************************** // device type definition -const device_type Z80SCC = &device_creator; -const device_type Z80SCC_CHANNEL = &device_creator; -const device_type SCC8030 = &device_creator; -const device_type SCC80C30 = &device_creator; -const device_type SCC80230 = &device_creator; -const device_type SCC8530N = &device_creator; // remove trailing N when 8530scc.c is fully replaced and removed -const device_type SCC85C30 = &device_creator; -const device_type SCC85230 = &device_creator; -const device_type SCC85233 = &device_creator; -const device_type SCC8523L = &device_creator; +const device_type Z80SCC = device_creator; +const device_type Z80SCC_CHANNEL = device_creator; +const device_type SCC8030 = device_creator; +const device_type SCC80C30 = device_creator; +const device_type SCC80230 = device_creator; +const device_type SCC8530N = device_creator; // remove trailing N when 8530scc.c is fully replaced and removed +const device_type SCC85C30 = device_creator; +const device_type SCC85230 = device_creator; +const device_type SCC85233 = device_creator; +const device_type SCC8523L = device_creator; //------------------------------------------------- // device_mconfig_additions - diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index 3d7d262c7fc..a7972eeec15 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -96,9 +96,9 @@ //************************************************************************** // device type definition -const device_type Z80SIO = &device_creator; -const device_type Z80SIO_CHANNEL = &device_creator; -const device_type UPD7201N = &device_creator; // Remove trailing N when z80dart.cpp's 7201 implementation is fully replaced +const device_type Z80SIO = device_creator; +const device_type Z80SIO_CHANNEL = device_creator; +const device_type UPD7201N = device_creator; // Remove trailing N when z80dart.cpp's 7201 implementation is fully replaced //------------------------------------------------- // device_mconfig_additions - diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp index fb0e42fd725..c86cb6d659e 100644 --- a/src/devices/machine/z80sti.cpp +++ b/src/devices/machine/z80sti.cpp @@ -24,7 +24,7 @@ // device type definition -const device_type Z80STI = &device_creator; +const device_type Z80STI = device_creator; diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp index 4c36ab242ec..d4240605c5e 100644 --- a/src/devices/machine/z8536.cpp +++ b/src/devices/machine/z8536.cpp @@ -26,7 +26,7 @@ // device type definition -const device_type Z8536 = &device_creator; +const device_type Z8536 = device_creator; //************************************************************************** diff --git a/src/devices/sound/2203intf.cpp b/src/devices/sound/2203intf.cpp index 04bdd980c6e..56db3d8da38 100644 --- a/src/devices/sound/2203intf.cpp +++ b/src/devices/sound/2203intf.cpp @@ -202,7 +202,7 @@ WRITE8_MEMBER( ym2203_device::write_port_w ) write(space, 1, data); } -const device_type YM2203 = &device_creator; +const device_type YM2203 = device_creator; ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, YM2203, "YM2203", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2203", __FILE__), diff --git a/src/devices/sound/2608intf.cpp b/src/devices/sound/2608intf.cpp index fd409f77cd3..a5471151aa0 100644 --- a/src/devices/sound/2608intf.cpp +++ b/src/devices/sound/2608intf.cpp @@ -184,7 +184,7 @@ WRITE8_MEMBER( ym2608_device::write ) ym2608_write(m_chip, offset & 3, data); } -const device_type YM2608 = &device_creator; +const device_type YM2608 = device_creator; ym2608_device::ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, YM2608, "YM2608", tag, owner, clock, PSG_TYPE_YM, 1, 2, "ym2608", __FILE__), diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp index 813079d6cb2..8660056c828 100644 --- a/src/devices/sound/2610intf.cpp +++ b/src/devices/sound/2610intf.cpp @@ -208,7 +208,7 @@ WRITE8_MEMBER( ym2610_device::write ) } -const device_type YM2610 = &device_creator; +const device_type YM2610 = device_creator; ym2610_device::ym2610_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, YM2610, "YM2610", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ym2610", __FILE__) @@ -224,7 +224,7 @@ ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, co { } -const device_type YM2610B = &device_creator; +const device_type YM2610B = device_creator; ym2610b_device::ym2610b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ym2610_device(mconfig, YM2610B, "YM2610B", tag, owner, clock, "ym2610b", __FILE__) diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp index 650c9a35041..b6a1d42b398 100644 --- a/src/devices/sound/2612intf.cpp +++ b/src/devices/sound/2612intf.cpp @@ -164,7 +164,7 @@ WRITE8_MEMBER( ym2612_device::write ) } -const device_type YM2612 = &device_creator; +const device_type YM2612 = device_creator; ym2612_device::ym2612_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YM2612, "YM2612", tag, owner, clock, "ym2612", __FILE__), @@ -181,7 +181,7 @@ ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, co } -const device_type YM3438 = &device_creator; +const device_type YM3438 = device_creator; ym3438_device::ym3438_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ym2612_device(mconfig, YM3438, "YM3438", tag, owner, clock, "ym3438", __FILE__) diff --git a/src/devices/sound/262intf.cpp b/src/devices/sound/262intf.cpp index 51c7f5100b2..4c027e5c2a3 100644 --- a/src/devices/sound/262intf.cpp +++ b/src/devices/sound/262intf.cpp @@ -135,7 +135,7 @@ WRITE8_MEMBER( ymf262_device::write ) ymf262_write(m_chip, offset & 3, data); } -const device_type YMF262 = &device_creator; +const device_type YMF262 = device_creator; ymf262_device::ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YMF262, "YMF262", tag, owner, clock, "ymf262", __FILE__), diff --git a/src/devices/sound/315-5641.cpp b/src/devices/sound/315-5641.cpp index 7ee0f108ca9..5d13ee0dbb2 100644 --- a/src/devices/sound/315-5641.cpp +++ b/src/devices/sound/315-5641.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "315-5641.h" -const device_type SEGA_315_5641_PCM = &device_creator; +const device_type SEGA_315_5641_PCM = device_creator; sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : upd7759_device(mconfig, SEGA_315_5641_PCM, "315-5641 PCM", tag, owner, clock, "315-5641_pcm", __FILE__), m_fifo_read(0), m_fifo_write(0) diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp index dc967d21e80..f59a60f114e 100644 --- a/src/devices/sound/3526intf.cpp +++ b/src/devices/sound/3526intf.cpp @@ -170,7 +170,7 @@ WRITE8_MEMBER( ym3526_device::control_port_w ) { write(space, 0, data); } WRITE8_MEMBER( ym3526_device::write_port_w ) { write(space, 1, data); } -const device_type YM3526 = &device_creator; +const device_type YM3526 = device_creator; ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YM3526, "YM3526", tag, owner, clock, "ym3526", __FILE__), diff --git a/src/devices/sound/3812intf.cpp b/src/devices/sound/3812intf.cpp index 85aacfa29ff..e9d42a0723b 100644 --- a/src/devices/sound/3812intf.cpp +++ b/src/devices/sound/3812intf.cpp @@ -166,7 +166,7 @@ WRITE8_MEMBER( ym3812_device::control_port_w ) { write(space, 0, data); } WRITE8_MEMBER( ym3812_device::write_port_w ) { write( space, 1, data); } -const device_type YM3812 = &device_creator; +const device_type YM3812 = device_creator; ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YM3812, "YM3812", tag, owner, clock, "ym3812", __FILE__), diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp index 7aecbd64b04..3b6b32eca20 100644 --- a/src/devices/sound/8950intf.cpp +++ b/src/devices/sound/8950intf.cpp @@ -202,7 +202,7 @@ WRITE8_MEMBER( y8950_device::control_port_w ) { write(space, 0, data); } WRITE8_MEMBER( y8950_device::write_port_w ) { write(space, 1, data); } -const device_type Y8950 = &device_creator; +const device_type Y8950 = device_creator; y8950_device::y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, Y8950, "Y8950", tag, owner, clock, "y8950", __FILE__), diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp index 79ba429c619..e3489c653c2 100644 --- a/src/devices/sound/ad1848.cpp +++ b/src/devices/sound/ad1848.cpp @@ -5,7 +5,10 @@ #include "emu.h" #include "sound/ad1848.h" + #include "sound/volt_reg.h" +#include "speaker.h" + const device_type AD1848 = device_creator; diff --git a/src/devices/sound/aica.cpp b/src/devices/sound/aica.cpp index c6b5aa9b020..b0708e4f135 100644 --- a/src/devices/sound/aica.cpp +++ b/src/devices/sound/aica.cpp @@ -1468,7 +1468,7 @@ READ16_MEMBER( aica_device::midi_out_r ) return val; } -const device_type AICA = &device_creator; +const device_type AICA = device_creator; aica_device::aica_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, AICA, "AICA", tag, owner, clock, "aica", __FILE__), diff --git a/src/devices/sound/asc.cpp b/src/devices/sound/asc.cpp index 1b780d5fba9..7cce59b579f 100644 --- a/src/devices/sound/asc.cpp +++ b/src/devices/sound/asc.cpp @@ -35,7 +35,7 @@ #include "asc.h" // device type definition -const device_type ASC = &device_creator; +const device_type ASC = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/astrocde.cpp b/src/devices/sound/astrocde.cpp index 2dd01fe0c52..b5d23dcb751 100644 --- a/src/devices/sound/astrocde.cpp +++ b/src/devices/sound/astrocde.cpp @@ -46,7 +46,7 @@ // device type definition -const device_type ASTROCADE = &device_creator; +const device_type ASTROCADE = device_creator; //************************************************************************** diff --git a/src/devices/sound/awacs.cpp b/src/devices/sound/awacs.cpp index 1685a37f370..b2d405668ea 100644 --- a/src/devices/sound/awacs.cpp +++ b/src/devices/sound/awacs.cpp @@ -14,7 +14,7 @@ #include "awacs.h" // device type definition -const device_type AWACS = &device_creator; +const device_type AWACS = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp index f3a5fd4dc5d..a3979b70bf6 100644 --- a/src/devices/sound/ay8910.cpp +++ b/src/devices/sound/ay8910.cpp @@ -1142,7 +1142,7 @@ WRITE8_MEMBER( ay8914_device::write ) -const device_type AY8910 = &device_creator; +const device_type AY8910 = device_creator; ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, AY8910, "AY-3-8910A", tag, owner, clock, "ay8910", __FILE__), @@ -1252,7 +1252,7 @@ void ay8910_device::set_type(psg_type_t psg_type) } } -const device_type AY8912 = &device_creator; +const device_type AY8912 = device_creator; ay8912_device::ay8912_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, AY8912, "AY-3-8912A", tag, owner, clock, PSG_TYPE_AY, 3, 1, "ay8912", __FILE__) @@ -1260,7 +1260,7 @@ ay8912_device::ay8912_device(const machine_config &mconfig, const char *tag, dev } -const device_type AY8913 = &device_creator; +const device_type AY8913 = device_creator; ay8913_device::ay8913_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, AY8913, "AY-3-8913A", tag, owner, clock, PSG_TYPE_AY, 3, 0, "ay8913", __FILE__) @@ -1268,7 +1268,7 @@ ay8913_device::ay8913_device(const machine_config &mconfig, const char *tag, dev } -const device_type AY8914 = &device_creator; +const device_type AY8914 = device_creator; ay8914_device::ay8914_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, AY8914, "AY-3-8914", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8914", __FILE__) @@ -1276,7 +1276,7 @@ ay8914_device::ay8914_device(const machine_config &mconfig, const char *tag, dev } -const device_type AY8930 = &device_creator; +const device_type AY8930 = device_creator; ay8930_device::ay8930_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, AY8930, "AY8930", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8930", __FILE__) @@ -1284,7 +1284,7 @@ ay8930_device::ay8930_device(const machine_config &mconfig, const char *tag, dev } -const device_type YM2149 = &device_creator; +const device_type YM2149 = device_creator; ym2149_device::ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, YM2149, "YM2149", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2149", __FILE__) @@ -1292,7 +1292,7 @@ ym2149_device::ym2149_device(const machine_config &mconfig, const char *tag, dev } -const device_type YM3439 = &device_creator; +const device_type YM3439 = device_creator; ym3439_device::ym3439_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, YM3439, "YM3439", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym3429", __FILE__) @@ -1300,7 +1300,7 @@ ym3439_device::ym3439_device(const machine_config &mconfig, const char *tag, dev } -const device_type YMZ284 = &device_creator; +const device_type YMZ284 = device_creator; ymz284_device::ymz284_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, YMZ284, "YMZ284", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz284", __FILE__) @@ -1308,7 +1308,7 @@ ymz284_device::ymz284_device(const machine_config &mconfig, const char *tag, dev } -const device_type YMZ294 = &device_creator; +const device_type YMZ294 = device_creator; ymz294_device::ymz294_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ay8910_device(mconfig, YMZ294, "YMZ294", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz294", __FILE__) diff --git a/src/devices/sound/beep.cpp b/src/devices/sound/beep.cpp index 0b343cbd0f7..1b986fa6c61 100644 --- a/src/devices/sound/beep.cpp +++ b/src/devices/sound/beep.cpp @@ -20,7 +20,7 @@ // device type definition -const device_type BEEP = &device_creator; +const device_type BEEP = device_creator; //************************************************************************** diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp index 0c975d105e5..b45a2e40f3f 100644 --- a/src/devices/sound/bsmt2000.cpp +++ b/src/devices/sound/bsmt2000.cpp @@ -18,7 +18,7 @@ // device type definition -const device_type BSMT2000 = &device_creator; +const device_type BSMT2000 = device_creator; //************************************************************************** diff --git a/src/devices/sound/c140.cpp b/src/devices/sound/c140.cpp index b296dc2d57f..42bebcf452d 100644 --- a/src/devices/sound/c140.cpp +++ b/src/devices/sound/c140.cpp @@ -67,7 +67,7 @@ struct voice_registers // device type definition -const device_type C140 = &device_creator; +const device_type C140 = device_creator; //************************************************************************** diff --git a/src/devices/sound/c352.cpp b/src/devices/sound/c352.cpp index ae47740c8db..d8e6dc03c63 100644 --- a/src/devices/sound/c352.cpp +++ b/src/devices/sound/c352.cpp @@ -23,7 +23,7 @@ #define LOG(x) do { if (VERBOSE) logerror x; } while (0) // device type definition -const device_type C352 = &device_creator; +const device_type C352 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/c6280.cpp b/src/devices/sound/c6280.cpp index 276a1962447..5e41873054d 100644 --- a/src/devices/sound/c6280.cpp +++ b/src/devices/sound/c6280.cpp @@ -229,7 +229,7 @@ WRITE8_MEMBER( c6280_device::c6280_w ) } } -const device_type C6280 = &device_creator; +const device_type C6280 = device_creator; c6280_device::c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, C6280, "HuC6280", tag, owner, clock, "c6280", __FILE__) diff --git a/src/devices/sound/cdda.cpp b/src/devices/sound/cdda.cpp index 24c2e326e85..2e4ec409a26 100644 --- a/src/devices/sound/cdda.cpp +++ b/src/devices/sound/cdda.cpp @@ -231,7 +231,7 @@ int16_t cdda_device::get_channel_volume(int channel) return m_audio_volume[channel]; } -const device_type CDDA = &device_creator; +const device_type CDDA = device_creator; cdda_device::cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CDDA, "CD/DA", tag, owner, clock, "cdda", __FILE__), diff --git a/src/devices/sound/cdp1863.cpp b/src/devices/sound/cdp1863.cpp index 51a52ca286d..2b6396084dd 100644 --- a/src/devices/sound/cdp1863.cpp +++ b/src/devices/sound/cdp1863.cpp @@ -35,7 +35,7 @@ //************************************************************************** // devices -const device_type CDP1863 = &device_creator; +const device_type CDP1863 = device_creator; diff --git a/src/devices/sound/cdp1864.cpp b/src/devices/sound/cdp1864.cpp index 78e3fbfbd7d..a42300aca00 100644 --- a/src/devices/sound/cdp1864.cpp +++ b/src/devices/sound/cdp1864.cpp @@ -45,7 +45,7 @@ const int cdp1864_device::bckgnd[] = { 2, 0, 4, 1 }; //************************************************************************** // devices -const device_type CDP1864 = &device_creator; +const device_type CDP1864 = device_creator; diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h index 34f1c0be117..d27d817f605 100644 --- a/src/devices/sound/cdp1864.h +++ b/src/devices/sound/cdp1864.h @@ -32,14 +32,16 @@ **********************************************************************/ -#pragma once +#ifndef MAME_DEVICES_SOUND_CDP1864_H +#define MAME_DEVICES_SOUND_CDP1864_H -#ifndef __CDP1864__ -#define __CDP1864__ +#pragma once #include "machine/rescap.h" #include "video/resnet.h" +#include "screen.h" + //************************************************************************** @@ -202,6 +204,4 @@ private: // device type definition extern const device_type CDP1864; - - -#endif +#endif // MAME_DEVICES_SOUND_CDP1864_H diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp index 7a76ed6d3d0..b9dae5d4884 100644 --- a/src/devices/sound/cdp1869.cpp +++ b/src/devices/sound/cdp1869.cpp @@ -56,7 +56,7 @@ enum //************************************************************************** // device type definition -const device_type CDP1869 = &device_creator; +const device_type CDP1869 = device_creator; // I/O map DEVICE_ADDRESS_MAP_START( io_map, 8, cdp1869_device ) diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h index 035631e12e3..b2125c89caf 100644 --- a/src/devices/sound/cdp1869.h +++ b/src/devices/sound/cdp1869.h @@ -73,11 +73,12 @@ **********************************************************************/ -#pragma once +#ifndef MAME_DEVICES_SOUND_CDP1869_H +#define MAME_DEVICES_SOUND_CDP1869_H -#ifndef __CDP1869__ -#define __CDP1869__ +#pragma once +#include "screen.h" @@ -298,4 +299,4 @@ extern const device_type CDP1869; -#endif +#endif // MAME_DEVICES_SOUND_CDP1869_H diff --git a/src/devices/sound/cem3394.cpp b/src/devices/sound/cem3394.cpp index 4e264f5be1b..d4b1e9ef501 100644 --- a/src/devices/sound/cem3394.cpp +++ b/src/devices/sound/cem3394.cpp @@ -105,7 +105,7 @@ // device type definition -const device_type CEM3394 = &device_creator; +const device_type CEM3394 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp index fc413390107..dd0e24b6829 100644 --- a/src/devices/sound/dac.cpp +++ b/src/devices/sound/dac.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #define DAC_GENERATOR_EPILOG(_dac_type, _dac_class) \ -const device_type _dac_type = &device_creator<_dac_class>; +const device_type _dac_type = device_creator<_dac_class>; #include "emu.h" #include "dac.h" diff --git a/src/devices/sound/dac76.cpp b/src/devices/sound/dac76.cpp index 0aa8dc93798..53739e1c254 100644 --- a/src/devices/sound/dac76.cpp +++ b/src/devices/sound/dac76.cpp @@ -23,7 +23,7 @@ constexpr int dac76_device::m_level[]; // DEVICE DEFINITIONS //************************************************************************** -const device_type DAC76 = &device_creator; +const device_type DAC76 = device_creator; //************************************************************************** diff --git a/src/devices/sound/dave.cpp b/src/devices/sound/dave.cpp index 573bc010e99..342ba571aaf 100644 --- a/src/devices/sound/dave.cpp +++ b/src/devices/sound/dave.cpp @@ -25,7 +25,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type DAVE = &device_creator; +const device_type DAVE = device_creator; DEVICE_ADDRESS_MAP_START( z80_program_map, 8, dave_device ) diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h index 1c22369a62e..10e9fb26905 100644 --- a/src/devices/sound/dave.h +++ b/src/devices/sound/dave.h @@ -6,12 +6,10 @@ **********************************************************************/ -#pragma once - -#ifndef __DAVE__ -#define __DAVE__ - +#ifndef MAME_DEVICES_SOUND_DAVE_H +#define MAME_DEVICES_SOUND_DAVE_H +#pragma once ///************************************************************************* @@ -150,6 +148,4 @@ private: // device type definition extern const device_type DAVE; - - -#endif +#endif // MAME_DEVICES_SOUND_DAVE_H diff --git a/src/devices/sound/digitalk.cpp b/src/devices/sound/digitalk.cpp index 8d8f40bf694..329eb1c1e7f 100644 --- a/src/devices/sound/digitalk.cpp +++ b/src/devices/sound/digitalk.cpp @@ -261,7 +261,7 @@ static const int pitch_vals[32] = { }; -const device_type DIGITALKER = &device_creator; +const device_type DIGITALKER = device_creator; digitalker_device::digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DIGITALKER, "Digitalker", tag, owner, clock, "digitalker", __FILE__), diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp index aebd59f13b6..62c8707067a 100644 --- a/src/devices/sound/discrete.cpp +++ b/src/devices/sound/discrete.cpp @@ -45,7 +45,7 @@ #define for_each(_T, _e, _l) for (_T _e = (_l)->begin_ptr() ; _e <= (_l)->end_ptr(); _e++) // device type definition -const device_type DISCRETE = &device_creator; +const device_type DISCRETE = device_creator; /************************************* * diff --git a/src/devices/sound/dmadac.cpp b/src/devices/sound/dmadac.cpp index 4ee9523ef7b..fc8f3a3b8fe 100644 --- a/src/devices/sound/dmadac.cpp +++ b/src/devices/sound/dmadac.cpp @@ -196,7 +196,7 @@ void dmadac_sound_device::set_volume(uint16_t volume) m_volume = volume; } -const device_type DMADAC = &device_creator; +const device_type DMADAC = device_creator; dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DMADAC, "DMA-driven DAC", tag, owner, clock, "dmadac", __FILE__), diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp index 5f6a14e63c5..61ef546d5c5 100644 --- a/src/devices/sound/es1373.cpp +++ b/src/devices/sound/es1373.cpp @@ -3,9 +3,12 @@ #include "emu.h" #include "es1373.h" +#include "speaker.h" + + #define LOG_ES (0) #define LOG_ES_REG (0) -#define LOG_ES_FILE (0) +#define LOG_ES_FILE (0) static MACHINE_CONFIG_FRAGMENT( es1373 ) @@ -17,7 +20,7 @@ machine_config_constructor es1373_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( es1373 ); } -const device_type ES1373 = &device_creator; +const device_type ES1373 = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, es1373_device) AM_RANGE(0x00, 0x3f) AM_READWRITE (reg_r, reg_w) diff --git a/src/devices/sound/es5503.cpp b/src/devices/sound/es5503.cpp index 591e72827ca..39b57df0b3e 100644 --- a/src/devices/sound/es5503.cpp +++ b/src/devices/sound/es5503.cpp @@ -36,7 +36,7 @@ #include "es5503.h" // device type definition -const device_type ES5503 = &device_creator; +const device_type ES5503 = device_creator; // useful constants static const uint16_t wavesizes[8] = { 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 }; diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp index 5611857e83b..d5205a6996b 100644 --- a/src/devices/sound/es5506.cpp +++ b/src/devices/sound/es5506.cpp @@ -163,7 +163,7 @@ es550x_device::es550x_device(const machine_config &mconfig, device_type type, co } } -const device_type ES5506 = &device_creator; +const device_type ES5506 = device_creator; es5506_device::es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : es550x_device(mconfig, ES5506, "ES5506", tag, owner, clock, "es5506", __FILE__) @@ -337,7 +337,7 @@ void es550x_device::device_stop() #endif } -const device_type ES5505 = &device_creator; +const device_type ES5505 = device_creator; es5505_device::es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : es550x_device(mconfig, ES5505, "ES5505", tag, owner, clock, "es5505", __FILE__) diff --git a/src/devices/sound/es8712.cpp b/src/devices/sound/es8712.cpp index 4cba75e0d10..fe1e94fb01e 100644 --- a/src/devices/sound/es8712.cpp +++ b/src/devices/sound/es8712.cpp @@ -33,7 +33,7 @@ static int diff_lookup[49*16]; // device type definition -const device_type ES8712 = &device_creator; +const device_type ES8712 = device_creator; //************************************************************************** diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp index 988aaa7f9d5..a6a5cbb3c2b 100644 --- a/src/devices/sound/esqpump.cpp +++ b/src/devices/sound/esqpump.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "sound/esqpump.h" -const device_type ESQ_5505_5510_PUMP = &device_creator; +const device_type ESQ_5505_5510_PUMP = device_creator; esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ESQ_5505_5510_PUMP, "ESQ_5505_5510_PUMP", tag, owner, clock, "esq_5505_5510_pump", __FILE__), diff --git a/src/devices/sound/flt_rc.cpp b/src/devices/sound/flt_rc.cpp index 1f53ee8581e..56585593721 100644 --- a/src/devices/sound/flt_rc.cpp +++ b/src/devices/sound/flt_rc.cpp @@ -5,7 +5,7 @@ // device type definition -const device_type FILTER_RC = &device_creator; +const device_type FILTER_RC = device_creator; //************************************************************************** diff --git a/src/devices/sound/flt_vol.cpp b/src/devices/sound/flt_vol.cpp index e92aec24532..f6c4ea1564e 100644 --- a/src/devices/sound/flt_vol.cpp +++ b/src/devices/sound/flt_vol.cpp @@ -5,7 +5,7 @@ // device type definition -const device_type FILTER_VOLUME = &device_creator; +const device_type FILTER_VOLUME = device_creator; //------------------------------------------------- // filter_volume_device - constructor diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp index a86fa265ffd..b1b1d111788 100644 --- a/src/devices/sound/gaelco.cpp +++ b/src/devices/sound/gaelco.cpp @@ -54,7 +54,7 @@ static wav_file* wavraw; // Raw waveform Gaelco GAE1 sound device ============================================================================*/ -const device_type GAELCO_GAE1 = &device_creator; +const device_type GAELCO_GAE1 = device_creator; gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : gaelco_gae1_device(mconfig, GAELCO_GAE1, "Gaelco GAE1", tag, owner, clock, "gaelco_gae1", __FILE__) @@ -264,7 +264,7 @@ void gaelco_gae1_device::device_stop() Gaelco CG-1V sound device ============================================================================*/ -const device_type GAELCO_CG1V = &device_creator; +const device_type GAELCO_CG1V = device_creator; gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : gaelco_gae1_device(mconfig, GAELCO_CG1V, "Gaelco CG1V", tag, owner, clock, "gaelco_cg1v", __FILE__) diff --git a/src/devices/sound/gb.cpp b/src/devices/sound/gb.cpp index 163ce8e1879..ef06c7a84da 100644 --- a/src/devices/sound/gb.cpp +++ b/src/devices/sound/gb.cpp @@ -71,10 +71,10 @@ const int gameboy_sound_device::wave_duty_table[4][8] = }; // device type definitions -const device_type DMG_APU = &device_creator; -//const device_type CGB02_APU = &device_creator; -const device_type CGB04_APU = &device_creator; -//const device_type CGB05_APU = &device_creator; +const device_type DMG_APU = device_creator; +//const device_type CGB02_APU = device_creator; +const device_type CGB04_APU = device_creator; +//const device_type CGB05_APU = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp index 704fedbd011..59a248e6b7f 100644 --- a/src/devices/sound/hc55516.cpp +++ b/src/devices/sound/hc55516.cpp @@ -23,7 +23,7 @@ -const device_type HC55516 = &device_creator; +const device_type HC55516 = device_creator; hc55516_device::hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, HC55516, "HC-55516", tag, owner, clock, "hc55516", __FILE__), @@ -84,7 +84,7 @@ void hc55516_device::device_reset() m_last_clock_state = 0; } -const device_type MC3417 = &device_creator; +const device_type MC3417 = device_creator; mc3417_device::mc3417_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : hc55516_device(mconfig, MC3417, "MC3417", tag, owner, clock, "mc3417", __FILE__) @@ -101,7 +101,7 @@ void mc3417_device::device_start() } -const device_type MC3418 = &device_creator; +const device_type MC3418 = device_creator; mc3418_device::mc3418_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : hc55516_device(mconfig, MC3418, "MC3418", tag, owner, clock, "mc3418", __FILE__) diff --git a/src/devices/sound/i5000.cpp b/src/devices/sound/i5000.cpp index f8719923be5..d1532929ff5 100644 --- a/src/devices/sound/i5000.cpp +++ b/src/devices/sound/i5000.cpp @@ -21,7 +21,7 @@ // device type definition -const device_type I5000_SND = &device_creator; +const device_type I5000_SND = device_creator; i5000snd_device::i5000snd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, I5000_SND, "I5000", tag, owner, clock, "i5000snd", __FILE__), diff --git a/src/devices/sound/ics2115.cpp b/src/devices/sound/ics2115.cpp index 523fe4e2bbc..0b0db0768fe 100644 --- a/src/devices/sound/ics2115.cpp +++ b/src/devices/sound/ics2115.cpp @@ -15,7 +15,7 @@ //#define ICS2115_ISOLATE 6 // device type definition -const device_type ICS2115 = &device_creator; +const device_type ICS2115 = device_creator; ics2115_device::ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ICS2115, "ICS2115", tag, owner, clock, "ics2115", __FILE__), diff --git a/src/devices/sound/iremga20.cpp b/src/devices/sound/iremga20.cpp index 2a9e1433e81..f05944a4123 100644 --- a/src/devices/sound/iremga20.cpp +++ b/src/devices/sound/iremga20.cpp @@ -35,7 +35,7 @@ Revisions: // device type definition -const device_type IREMGA20 = &device_creator; +const device_type IREMGA20 = device_creator; //************************************************************************** diff --git a/src/devices/sound/k005289.cpp b/src/devices/sound/k005289.cpp index 0a0f004417f..91075735ae8 100644 --- a/src/devices/sound/k005289.cpp +++ b/src/devices/sound/k005289.cpp @@ -42,7 +42,7 @@ #define CLOCK_DIVIDER 32 // device type definition -const device_type K005289 = &device_creator; +const device_type K005289 = device_creator; //************************************************************************** diff --git a/src/devices/sound/k007232.cpp b/src/devices/sound/k007232.cpp index 81e4f19eec7..ec9cbeb53a4 100644 --- a/src/devices/sound/k007232.cpp +++ b/src/devices/sound/k007232.cpp @@ -145,7 +145,7 @@ static const float kdaca_fn[][2] = { /*************************************************************/ -const device_type K007232 = &device_creator; +const device_type K007232 = device_creator; k007232_device::k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K007232, "K007232 PCM Controller", tag, owner, clock, "k007232", __FILE__), diff --git a/src/devices/sound/k051649.cpp b/src/devices/sound/k051649.cpp index 7877d949a9c..599686f0622 100644 --- a/src/devices/sound/k051649.cpp +++ b/src/devices/sound/k051649.cpp @@ -32,7 +32,7 @@ // device type definition -const device_type K051649 = &device_creator; +const device_type K051649 = device_creator; //************************************************************************** diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp index 992912f46f2..313c9d9b3a8 100644 --- a/src/devices/sound/k053260.cpp +++ b/src/devices/sound/k053260.cpp @@ -62,7 +62,7 @@ // device type definition -const device_type K053260 = &device_creator; +const device_type K053260 = device_creator; //************************************************************************** diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp index 78b6d08b291..5674e0b84e2 100644 --- a/src/devices/sound/k054539.cpp +++ b/src/devices/sound/k054539.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "k054539.h" -const device_type K054539 = &device_creator; +const device_type K054539 = device_creator; #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) diff --git a/src/devices/sound/k056800.cpp b/src/devices/sound/k056800.cpp index fe42ed0b1bb..5ee7a6c9ad9 100644 --- a/src/devices/sound/k056800.cpp +++ b/src/devices/sound/k056800.cpp @@ -12,7 +12,7 @@ -const device_type K056800 = &device_creator; +const device_type K056800 = device_creator; diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.cpp b/src/devices/sound/l7a1045_l6028_dsp_a.cpp index 1b3f2ced640..a1378a80a01 100644 --- a/src/devices/sound/l7a1045_l6028_dsp_a.cpp +++ b/src/devices/sound/l7a1045_l6028_dsp_a.cpp @@ -89,7 +89,7 @@ // device type definition -const device_type L7A1045 = &device_creator; +const device_type L7A1045 = device_creator; //************************************************************************** diff --git a/src/devices/sound/lmc1992.cpp b/src/devices/sound/lmc1992.cpp index 96cb91b094d..469b98ec307 100644 --- a/src/devices/sound/lmc1992.cpp +++ b/src/devices/sound/lmc1992.cpp @@ -64,7 +64,7 @@ enum //************************************************************************** // devices -const device_type LMC1992 = &device_creator; +const device_type LMC1992 = device_creator; diff --git a/src/devices/sound/mas3507d.cpp b/src/devices/sound/mas3507d.cpp index ecf54a5b9f4..358badd121f 100644 --- a/src/devices/sound/mas3507d.cpp +++ b/src/devices/sound/mas3507d.cpp @@ -8,7 +8,7 @@ #include "mas3507d.h" // device type definition -const device_type MAS3507D = &device_creator; +const device_type MAS3507D = device_creator; mas3507d_device::mas3507d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MAS3507D, "MAS3507D", tag, owner, clock, "mas3507d", __FILE__), diff --git a/src/devices/sound/mea8000.cpp b/src/devices/sound/mea8000.cpp index c3fd263aaba..d800adebfa4 100644 --- a/src/devices/sound/mea8000.cpp +++ b/src/devices/sound/mea8000.cpp @@ -111,7 +111,7 @@ static const int pi_table[32] = -const device_type MEA8000 = &device_creator; +const device_type MEA8000 = device_creator; mea8000_device::mea8000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/sound/mm5837.cpp b/src/devices/sound/mm5837.cpp index 9ab3dd70141..7a8626eaf77 100644 --- a/src/devices/sound/mm5837.cpp +++ b/src/devices/sound/mm5837.cpp @@ -23,7 +23,7 @@ constexpr int mm5837_device::m_frequency[]; // DEVICE DEFINITIONS //************************************************************************** -const device_type MM5837 = &device_creator; +const device_type MM5837 = device_creator; //************************************************************************** diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp index 6d35f6bc9f1..126064c37db 100644 --- a/src/devices/sound/mos6560.cpp +++ b/src/devices/sound/mos6560.cpp @@ -675,9 +675,9 @@ void mos6560_device::sound_start() } -const device_type MOS6560 = &device_creator; -const device_type MOS6561 = &device_creator; -const device_type MOS656X_ATTACK_UFO = &device_creator; +const device_type MOS6560 = device_creator; +const device_type MOS6561 = device_creator; +const device_type MOS656X_ATTACK_UFO = device_creator; // default address maps static ADDRESS_MAP_START( mos6560_videoram_map, AS_0, 8, mos6560_device ) diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h index 849ff00d87d..77a715fd67a 100644 --- a/src/devices/sound/mos6560.h +++ b/src/devices/sound/mos6560.h @@ -29,12 +29,12 @@ ***************************************************************************/ -#pragma once - -#ifndef __MOS6560__ -#define __MOS6560__ +#ifndef MAME_DEVICES_SOUND_MOS6560_H +#define MAME_DEVICES_SOUND_MOS6560_H +#pragma once +#include "screen.h" //*************************************************************************** @@ -256,4 +256,4 @@ extern const device_type MOS656X_ATTACK_UFO; -#endif +#endif // MAME_DEVICES_SOUND_MOS6560_H diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp index 7854021a72d..635605736d9 100644 --- a/src/devices/sound/mos6581.cpp +++ b/src/devices/sound/mos6581.cpp @@ -25,8 +25,8 @@ //************************************************************************** // device type definition -const device_type MOS6581 = &device_creator; -const device_type MOS8580 = &device_creator; +const device_type MOS6581 = device_creator; +const device_type MOS8580 = device_creator; diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp index ca70ad888ea..6d178e77753 100644 --- a/src/devices/sound/mos7360.cpp +++ b/src/devices/sound/mos7360.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "mos7360.h" +#include "screen.h" + //************************************************************************** @@ -158,7 +160,7 @@ static const rgb_t PALETTE_MOS[] = //************************************************************************** // device type definition -const device_type MOS7360 = &device_creator; +const device_type MOS7360 = device_creator; // default address maps diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp index 9d84cae1dd4..c182787594a 100644 --- a/src/devices/sound/msm5205.cpp +++ b/src/devices/sound/msm5205.cpp @@ -56,8 +56,8 @@ */ -const device_type MSM5205 = &device_creator; -const device_type MSM6585 = &device_creator; +const device_type MSM5205 = device_creator; +const device_type MSM6585 = device_creator; msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) diff --git a/src/devices/sound/msm5232.cpp b/src/devices/sound/msm5232.cpp index 7ffd927c055..772bdbd01b4 100644 --- a/src/devices/sound/msm5232.cpp +++ b/src/devices/sound/msm5232.cpp @@ -11,7 +11,7 @@ 8 channel tone generator */ -const device_type MSM5232 = &device_creator; +const device_type MSM5232 = device_creator; msm5232_device::msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MSM5232, "MSM5232", tag, owner, clock, "msm5232", __FILE__), diff --git a/src/devices/sound/multipcm.cpp b/src/devices/sound/multipcm.cpp index f4a885413ce..31ffb2705d8 100644 --- a/src/devices/sound/multipcm.cpp +++ b/src/devices/sound/multipcm.cpp @@ -464,7 +464,7 @@ void multipcm_device::set_bank(uint32_t leftoffs, uint32_t rightoffs) printf("%08x, %08x\n", leftoffs, rightoffs); } -const device_type MULTIPCM = &device_creator; +const device_type MULTIPCM = device_creator; multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MULTIPCM, "Sega/Yamaha 315-5560", tag, owner, clock, "multipcm", __FILE__), diff --git a/src/devices/sound/n63701x.cpp b/src/devices/sound/n63701x.cpp index 0d9cd66134b..dda616698d3 100644 --- a/src/devices/sound/n63701x.cpp +++ b/src/devices/sound/n63701x.cpp @@ -29,7 +29,7 @@ static const int vol_table[4] = { 26, 84, 200, 258 }; // device type definition -const device_type NAMCO_63701X = &device_creator; +const device_type NAMCO_63701X = device_creator; namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_63701X, "Namco 63701X", tag, owner, clock, "namco_63701x", __FILE__), diff --git a/src/devices/sound/namco.cpp b/src/devices/sound/namco.cpp index ba55f89d0c9..cd2ab748555 100644 --- a/src/devices/sound/namco.cpp +++ b/src/devices/sound/namco.cpp @@ -43,9 +43,9 @@ /* a position of waveform sample */ #define WAVEFORM_POSITION(n) (((n) >> m_f_fracbits) & 0x1f) -const device_type NAMCO = &device_creator; -const device_type NAMCO_15XX = &device_creator; -const device_type NAMCO_CUS30 = &device_creator; +const device_type NAMCO = device_creator; +const device_type NAMCO_15XX = device_creator; +const device_type NAMCO_CUS30 = device_creator; namco_audio_device::namco_audio_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, __FILE__) diff --git a/src/devices/sound/nes_apu.cpp b/src/devices/sound/nes_apu.cpp index 39d8d32613d..d2b6a98b900 100644 --- a/src/devices/sound/nes_apu.cpp +++ b/src/devices/sound/nes_apu.cpp @@ -48,7 +48,9 @@ #include "emu.h" #include "nes_apu.h" + #include "cpu/m6502/n2a03.h" +#include "screen.h" @@ -101,7 +103,7 @@ static void create_noise(uint8 *buf, const int bits, int size) } } -const device_type NES_APU = &device_creator; +const device_type NES_APU = device_creator; nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NES_APU, "N2A03 APU", tag, owner, clock, "nesapu", __FILE__), diff --git a/src/devices/sound/nile.cpp b/src/devices/sound/nile.cpp index 09a8d02ce21..34b907fe686 100644 --- a/src/devices/sound/nile.cpp +++ b/src/devices/sound/nile.cpp @@ -50,7 +50,7 @@ enum }; -const device_type NILE = &device_creator; +const device_type NILE = device_creator; nile_device::nile_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NILE, "NiLe", tag, owner, clock, "nile", __FILE__), diff --git a/src/devices/sound/okim6258.cpp b/src/devices/sound/okim6258.cpp index 57a87dd71fa..e67a6bcb12e 100644 --- a/src/devices/sound/okim6258.cpp +++ b/src/devices/sound/okim6258.cpp @@ -35,7 +35,7 @@ static int tables_computed = 0; // device type definition -const device_type OKIM6258 = &device_creator; +const device_type OKIM6258 = device_creator; //************************************************************************** diff --git a/src/devices/sound/okim6295.cpp b/src/devices/sound/okim6295.cpp index d1aa03c9c41..c7c49abf7b3 100644 --- a/src/devices/sound/okim6295.cpp +++ b/src/devices/sound/okim6295.cpp @@ -46,7 +46,7 @@ //************************************************************************** // device type definition -const device_type OKIM6295 = &device_creator; +const device_type OKIM6295 = device_creator; // volume lookup table. The manual lists only 9 steps, ~3dB per step. Given the dB values, // that seems to map to a 5-bit volume control. Any volume parameter beyond the 9th index diff --git a/src/devices/sound/okim6376.cpp b/src/devices/sound/okim6376.cpp index 51baee59ada..1a852599529 100644 --- a/src/devices/sound/okim6376.cpp +++ b/src/devices/sound/okim6376.cpp @@ -110,7 +110,7 @@ static void reset_adpcm(struct ADPCMVoice *voice) } -const device_type OKIM6376 = &device_creator; +const device_type OKIM6376 = device_creator; okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, OKIM6376, "OKI6376", tag, owner, clock, "okim6376", __FILE__), diff --git a/src/devices/sound/okim9810.cpp b/src/devices/sound/okim9810.cpp index 1e687b4be9d..35ce795d877 100644 --- a/src/devices/sound/okim9810.cpp +++ b/src/devices/sound/okim9810.cpp @@ -17,7 +17,7 @@ //************************************************************************** // device type definition -const device_type OKIM9810 = &device_creator; +const device_type OKIM9810 = device_creator; // volume lookup table. The manual lists a full 16 steps, 2dB per step. // Given the dB values, that seems to map to a 7-bit volume control. diff --git a/src/devices/sound/pcd3311.cpp b/src/devices/sound/pcd3311.cpp index 50a017da863..b2ab6fc8130 100644 --- a/src/devices/sound/pcd3311.cpp +++ b/src/devices/sound/pcd3311.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PCD3311 = &device_creator; +const device_type PCD3311 = device_creator; diff --git a/src/devices/sound/pci-ac97.cpp b/src/devices/sound/pci-ac97.cpp index 8f6afc300bd..b263c50b803 100644 --- a/src/devices/sound/pci-ac97.cpp +++ b/src/devices/sound/pci-ac97.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "pci-ac97.h" -const device_type AC97 = &device_creator; +const device_type AC97 = device_creator; DEVICE_ADDRESS_MAP_START(native_audio_mixer_map, 32, ac97_device) ADDRESS_MAP_END diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp index bbbe51707d8..61cd505a28e 100644 --- a/src/devices/sound/pokey.cpp +++ b/src/devices/sound/pokey.cpp @@ -167,7 +167,7 @@ static const int clock_divisors[3] = {1, DIV_64, DIV_15}; // device type definition -const device_type POKEY = &device_creator; +const device_type POKEY = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp index a85bc8fa707..c34171e39c6 100644 --- a/src/devices/sound/qs1000.cpp +++ b/src/devices/sound/qs1000.cpp @@ -131,7 +131,7 @@ // device type definition -const device_type QS1000 = &device_creator; +const device_type QS1000 = device_creator; //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp index ddc94045d36..6b69f69e9aa 100644 --- a/src/devices/sound/qsound.cpp +++ b/src/devices/sound/qsound.cpp @@ -27,7 +27,7 @@ #include "qsound.h" // device type definition -const device_type QSOUND = &device_creator; +const device_type QSOUND = device_creator; // program map for the DSP (points to internal 4096 words of internal ROM) diff --git a/src/devices/sound/rf5c400.cpp b/src/devices/sound/rf5c400.cpp index 2399acdcd04..df355b5a03c 100644 --- a/src/devices/sound/rf5c400.cpp +++ b/src/devices/sound/rf5c400.cpp @@ -54,7 +54,7 @@ enum // device type definition -const device_type RF5C400 = &device_creator; +const device_type RF5C400 = device_creator; //************************************************************************** diff --git a/src/devices/sound/rf5c68.cpp b/src/devices/sound/rf5c68.cpp index 7faedb54398..532e3dcaf26 100644 --- a/src/devices/sound/rf5c68.cpp +++ b/src/devices/sound/rf5c68.cpp @@ -9,7 +9,7 @@ // device type definition -const device_type RF5C68 = &device_creator; +const device_type RF5C68 = device_creator; //************************************************************************** diff --git a/src/devices/sound/s14001a.cpp b/src/devices/sound/s14001a.cpp index 3eea3dee24d..9bc112232f2 100644 --- a/src/devices/sound/s14001a.cpp +++ b/src/devices/sound/s14001a.cpp @@ -107,7 +107,7 @@ and off as it normally does during speech). Once START has gone low-high-low, th #include "s14001a.h" // device definition -const device_type S14001A = &device_creator; +const device_type S14001A = device_creator; s14001a_device::s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, S14001A, "S14001A", tag, owner, clock, "s14001a", __FILE__), diff --git a/src/devices/sound/saa1099.cpp b/src/devices/sound/saa1099.cpp index 62d232a394f..c1ce05f5a2a 100644 --- a/src/devices/sound/saa1099.cpp +++ b/src/devices/sound/saa1099.cpp @@ -123,7 +123,7 @@ static const uint8_t envelope[8][64] = { // device type definition -const device_type SAA1099 = &device_creator; +const device_type SAA1099 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp index 1d0c3c8c179..3363d8ad026 100644 --- a/src/devices/sound/samples.cpp +++ b/src/devices/sound/samples.cpp @@ -33,7 +33,7 @@ //************************************************************************** // device type definition -const device_type SAMPLES = &device_creator; +const device_type SAMPLES = device_creator; diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h index 288d46f4d51..5393d6843f0 100644 --- a/src/devices/sound/samples.h +++ b/src/devices/sound/samples.h @@ -123,7 +123,7 @@ protected: }; // iterator, since lots of people are interested in these devices -typedef device_type_iterator<&device_creator, samples_device> samples_device_iterator; +typedef device_type_iterator, samples_device> samples_device_iterator; // ======================> samples_iterator diff --git a/src/devices/sound/sb0400.cpp b/src/devices/sound/sb0400.cpp index 20bdac1331e..6fbbf0a2f85 100644 --- a/src/devices/sound/sb0400.cpp +++ b/src/devices/sound/sb0400.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "sb0400.h" -const device_type SB0400 = &device_creator; +const device_type SB0400 = device_creator; DEVICE_ADDRESS_MAP_START(map, 32, sb0400_device) ADDRESS_MAP_END diff --git a/src/devices/sound/scsp.cpp b/src/devices/sound/scsp.cpp index faf02ccf6a1..41bcaf13c8d 100644 --- a/src/devices/sound/scsp.cpp +++ b/src/devices/sound/scsp.cpp @@ -141,7 +141,7 @@ static const double DRTimes[64]={100000/*infinity*/,100000/*infinity*/,118200.0, static const float SDLT[8]={-1000000.0f,-36.0f,-30.0f,-24.0f,-18.0f,-12.0f,-6.0f,0.0f}; -const device_type SCSP = &device_creator; +const device_type SCSP = device_creator; scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SCSP, "SCSP", tag, owner, clock, "scsp", __FILE__), diff --git a/src/devices/sound/segapcm.cpp b/src/devices/sound/segapcm.cpp index a8be5c3a351..9068dd262d0 100644 --- a/src/devices/sound/segapcm.cpp +++ b/src/devices/sound/segapcm.cpp @@ -9,7 +9,7 @@ // device type definition -const device_type SEGAPCM = &device_creator; +const device_type SEGAPCM = device_creator; //------------------------------------------------- diff --git a/src/devices/sound/sn76477.cpp b/src/devices/sound/sn76477.cpp index d6a9ebbe35e..c7c1e0596b2 100644 --- a/src/devices/sound/sn76477.cpp +++ b/src/devices/sound/sn76477.cpp @@ -140,7 +140,7 @@ static const double out_neg_gain[] = }; -const device_type SN76477 = &device_creator; +const device_type SN76477 = device_creator; sn76477_device::sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SN76477, "SN76477", tag, owner, clock, "sn76477", __FILE__), diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp index 59b63f7e7ec..c60b587f3a5 100644 --- a/src/devices/sound/sn76496.cpp +++ b/src/devices/sound/sn76496.cpp @@ -434,13 +434,13 @@ void sn76496_base_device::register_for_save_states() // save_item(NAME(m_sega_style_psg)); } -const device_type SN76496 = &device_creator; -const device_type U8106 = &device_creator; -const device_type Y2404 = &device_creator; -const device_type SN76489 = &device_creator; -const device_type SN76489A = &device_creator; -const device_type SN76494 = &device_creator; -const device_type SN94624 = &device_creator; -const device_type NCR7496 = &device_creator; -const device_type GAMEGEAR = &device_creator; -const device_type SEGAPSG = &device_creator; +const device_type SN76496 = device_creator; +const device_type U8106 = device_creator; +const device_type Y2404 = device_creator; +const device_type SN76489 = device_creator; +const device_type SN76489A = device_creator; +const device_type SN76494 = device_creator; +const device_type SN94624 = device_creator; +const device_type NCR7496 = device_creator; +const device_type GAMEGEAR = device_creator; +const device_type SEGAPSG = device_creator; diff --git a/src/devices/sound/snkwave.cpp b/src/devices/sound/snkwave.cpp index a682dbe2bbd..c7b4ff4ef5a 100644 --- a/src/devices/sound/snkwave.cpp +++ b/src/devices/sound/snkwave.cpp @@ -15,7 +15,7 @@ #define CLOCK_SHIFT 8 -const device_type SNKWAVE = &device_creator; +const device_type SNKWAVE = device_creator; //------------------------------------------------- // snkwave_device - constructor diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp index 6f33d6bdfa0..e4dcd28249d 100644 --- a/src/devices/sound/sp0250.cpp +++ b/src/devices/sound/sp0250.cpp @@ -34,7 +34,7 @@ should be 312, but 312 = 39*8 so it doesn't look right because a divider by 39 i */ #define CLOCK_DIVIDER (7*6*8) -const device_type SP0250 = &device_creator; +const device_type SP0250 = device_creator; sp0250_device::sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SP0250, "SP0250", tag, owner, clock, "sp0250", __FILE__), diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp index c735fafaa3b..5e8777e8de2 100644 --- a/src/devices/sound/sp0256.cpp +++ b/src/devices/sound/sp0256.cpp @@ -75,7 +75,7 @@ static const int16_t qtbl[128] = // device type definition -const device_type SP0256 = &device_creator; +const device_type SP0256 = device_creator; //************************************************************************** diff --git a/src/devices/sound/speaker.cpp b/src/devices/sound/speaker.cpp deleted file mode 100644 index e69e168ea0d..00000000000 --- a/src/devices/sound/speaker.cpp +++ /dev/null @@ -1,413 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria -/*************************************************************************** - - speaker.c - - Sound driver to emulate a simple speaker, - driven by one or more output bits - - Original author: (unsigned) - Filtering: Anders Hallstr?m -****************************************************************************/ - -/* Discussion of oversampling and anti-alias filtering: (Anders Hallstr?m) - * - * This driver is for machines that directly control - * one or more simple digital-to-analog converters (DAC) - * connected to one or more audio outputs (such as analog amp + speaker). - * Currently only 1-bit DAC is supported via the interface to this module. - * - * Frequently such machines would oversample the DAC - * in order to overcome the limited DAC resolution. - * For faithful reproduction of the sound, this must be carefully handled - * with anti-alias filtering when converting a high-rate low-resolution signal - * to a moderate-rate high-resolution signal suitable for the DAC in the emulator's sound card. - * (Originally, removal of any redundant high frequency content occurred on the analog side - * with no aliasing effects.) - * - * The most straightforward, naive way to handle this is to use two streams; - * stream 1 modeling the native audio, with a sampling rate that allows for - * accurate representation of over-sampling, i.e. the sampling rate should match - * the clock frequency of the audio generating device (such as the CPU). - * Stream 1 is connected to stream 2, which is concerned with feeding the sound card. - * The stream system has features to handle rate conversion from stream 1 to 2. - * - * I tried it out of curiosity; it works fine conceptually, but - * - it puts an unnecessary burden on system resources - * - sound quality is still not satisfactory, though better than without anti-alias - * - "stream 1" properties are machine specific and so should be configured - * individually in each machine driver using this approach. - * This can also be seen as an advantage for flexibility, though. - * - * Instead, dedicated filtering is implemented in this module, - * in a machine-neutral way (based on machine time and external -samplerate only). - * - * The basic average filter has the advantage that it can be used without - * explicitly generating all samples in "stream 1". However, - * it is poor for anti-alias filtering. - * Therefore, average filtering is combined with windowed sinc. - * - * Virtual stream 1: Samples in true machine time. - * Any sampling rate up to attotime resolution is implicitly supported. - * -> average filtering over each stream 2 sample -> - * Virtual stream 2: Intermediate representation. - * Sample rate = RATE_MULTIPLIER * stream 3 sample rate. - * If effective rate of stream 1 exceeds rate of stream 2, - * some aliasing distorsion is introduced in this step because the average filtering is a compromise. - * The distorsion is however mostly in the higher frequencies. - * -> low-pass anti-alias filtering with kernel ampl[] -> - * -> down-sampling -> - * Actual stream 3: channel output generated by speaker_sound_update(). - * Sample rate = device sample rate = configured "-samplerate". - * - * In the speaker_state data structure, - * "intermediate samples" refers to "stream 2" - * "channel samples" refers to "stream 3" - */ - -/* IMPROVEMENTS POSSIBLE: - * - Make filter length a run-time configurable parameter. min=1 max=1000 or something - * - Optimize cutoff freq automatically after filter length, or configurable too - * - Generalise this approach to other DAC-based sound types if susceptible to aliasing - */ - -#include "emu.h" -#include "sound/speaker.h" - -static const int16_t default_levels[2] = {0, 32767}; - -// Internal oversampling factor (interm. samples vs stream samples) -static const int RATE_MULTIPLIER = 4; - - -const device_type SPEAKER_SOUND = &device_creator; - -template class device_finder; -template class device_finder; - - -speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker_sound", __FILE__), - device_sound_interface(mconfig, *this), - m_num_levels(2), - m_levels(default_levels) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void speaker_sound_device::device_start() -{ - int i; - double x; - - m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate()); - - m_level = 0; - for (i = 0; i < FILTER_LENGTH; i++) - m_composed_volume[i] = 0; - - m_composed_sample_index = 0; - m_last_update_time = machine().time(); - m_channel_sample_period = HZ_TO_ATTOSECONDS(machine().sample_rate()); - m_channel_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_channel_sample_period); - m_interm_sample_period = m_channel_sample_period / RATE_MULTIPLIER; - m_interm_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_interm_sample_period); - m_channel_last_sample_time = m_channel->sample_time(); - m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); - m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); - m_interm_sample_index = 0; - m_prevx = m_prevy = 0.0; - - /* Note: To avoid time drift due to floating point inaccuracies, - * it is good if the speaker time synchronizes itself with the stream timing regularly. - */ - - /* Compute filter kernel; */ - /* (Done for each device though the data is shared... - * No problem really, but should be done as part of system init if I knew how) - */ -#if 1 - /* This is an approximated sinc (a perfect sinc makes an ideal low-pass filter). - * FILTER_STEP determines the cutoff frequency, - * which should be below the Nyquist freq, i.e. half the sample rate. - * Smaller step => kernel extends in time domain => lower cutoff freq - * In this case, with sinc, filter step PI corresponds to the Nyq. freq. - * Since we do not get a perfect filter => must lower the cutoff freq some more. - * For example, step PI/(2*RATE_MULTIPLIER) corresponds to cutoff freq = sample rate / 4; - * With -samplerate 48000, cutoff freq is ca 12kHz while the Nyq. freq is 24kHz. - * With -samplerate 96000, cutoff freq is ca 24kHz while the Nyq. freq is 48kHz. - * For a steeper, more efficient filter, increase FILTER_LENGTH at the expense of CPU usage. - */ -#define FILTER_STEP (M_PI / 2 / RATE_MULTIPLIER) - /* Distribute symmetrically on x axis; center has x=0 if length is odd */ - for (i = 0, x = (0.5 - FILTER_LENGTH / 2.) * FILTER_STEP; - i < FILTER_LENGTH; - i++, x += FILTER_STEP) - { - if (x == 0) - m_ampl[i] = 1; - else - m_ampl[i] = sin(x) / x; - } -#else - /* Trivial average filter with poor frequency cutoff properties; - * First zero (frequency where amplification=0) = sample rate / filter length - * Cutoff frequency approx <= first zero / 2 - */ - for (i = 0, i < FILTER_LENGTH; i++) - m_ampl[i] = 1; -#endif - - save_item(NAME(m_level)); - save_item(NAME(m_composed_volume)); - save_item(NAME(m_composed_sample_index)); - save_item(NAME(m_channel_last_sample_time)); - save_item(NAME(m_interm_sample_index)); - save_item(NAME(m_last_update_time)); - save_item(NAME(m_prevx)); - save_item(NAME(m_prevy)); - - machine().save().register_postload(save_prepost_delegate(FUNC(speaker_sound_device::speaker_postload), this)); -} - -void speaker_sound_device::device_reset() -{ - int i; - - m_level = 0; - for (i = 0; i < FILTER_LENGTH; i++) - m_composed_volume[i] = 0; - - m_composed_sample_index = 0; - m_last_update_time = machine().time(); - m_channel_sample_period = HZ_TO_ATTOSECONDS(machine().sample_rate()); - m_channel_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_channel_sample_period); - m_interm_sample_period = m_channel_sample_period / RATE_MULTIPLIER; - m_interm_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_interm_sample_period); - m_channel_last_sample_time = m_channel->sample_time(); - m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); - m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); - m_interm_sample_index = 0; - m_prevx = m_prevy = 0.0; -} - -void speaker_sound_device::speaker_postload() -{ - m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); - m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); -} - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -// This can be triggered by the core (based on emulated time) or via level_w(). -void speaker_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) -{ - stream_sample_t *buffer = outputs[0]; - int volume = m_levels[m_level]; - double filtered_volume; - attotime sampled_time = attotime::zero; - - if (samples > 0) - { - /* Prepare to update time state */ - sampled_time = attotime(0, m_channel_sample_period); - if (samples > 1) - sampled_time *= samples; - - /* Note: since the stream is in the process of being updated, - * stream->sample_time() will return the time before the update! (MAME 0.130) - * Avoid using it here in order to avoid a subtle dependence on the stream implementation. - */ - } - - if (samples-- > 0) - { - /* Note that first interm. sample may be composed... */ - filtered_volume = update_interm_samples_get_filtered_volume(volume); - - /* Composite volume is now quantized to the stream resolution */ - *buffer++ = (stream_sample_t)filtered_volume; - - /* Any additional samples will be homogeneous, however may need filtering across samples: */ - while (samples-- > 0) - { - filtered_volume = update_interm_samples_get_filtered_volume(volume); - *buffer++ = (stream_sample_t)filtered_volume; - } - - /* Update the time state */ - m_channel_last_sample_time += sampled_time; - m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); - m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); - m_last_update_time = m_channel_last_sample_time; - } -} - - - -void speaker_sound_device::level_w(int new_level) -{ - int volume; - attotime time; - - if (new_level == m_level) - return; - - if (new_level < 0) - new_level = 0; - else - if (new_level >= m_num_levels) - new_level = m_num_levels - 1; - - volume = m_levels[m_level]; - time = machine().time(); - - if (time < m_channel_next_sample_time) - { - /* Stream sample is yet unfinished, but we may have one or more interm. samples */ - update_interm_samples(time, volume); - - /* Do not forget to update speaker state before returning! */ - m_level = new_level; - return; - } - /* Reaching here means such time has passed since last stream update - * that we can add at least one complete sample to the stream. - * The details have to be handled by speaker_sound_update() - */ - - /* Force streams.c to update sound until this point in time now */ - m_channel->update(); - - /* This is redundant because time update has to be done within speaker_sound_update() anyway, - * however this ensures synchronization between the speaker and stream timing: - */ - m_channel_last_sample_time = m_channel->sample_time(); - m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); - m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); - m_last_update_time = m_channel_last_sample_time; - - /* Assertion: time - last_update_time < channel_sample_period, i.e. time < channel_next_sample_time */ - - /* The overshooting fraction of time will make zero, one or more interm. samples: */ - update_interm_samples(time, volume); - - /* Finally update speaker state before returning */ - m_level = new_level; - -} - - -void speaker_sound_device::update_interm_samples(const attotime &time, int volume) -{ - double fraction; - - /* We may have completed zero, one or more interm. samples: */ - while (time >= m_next_interm_sample_time) - { - /* First interm. sample may be composed, subsequent samples will be homogeneous. */ - /* Treat all the same general way. */ - finalize_interm_sample(volume); - init_next_interm_sample(); - } - /* Depending on status above: - * a) Add latest fraction to unfinished composed sample - * b) The overshooting fraction of time will start a new composed sample - */ - fraction = make_fraction(time, m_last_update_time, m_interm_sample_period_secfrac); - m_composed_volume[m_composed_sample_index] += volume * fraction; - m_last_update_time = time; -} - - -double speaker_sound_device::update_interm_samples_get_filtered_volume(int volume) -{ - double filtered_volume, tempx; - - /* We may have one or more interm. samples to go */ - if (m_interm_sample_index < RATE_MULTIPLIER) - { - /* First interm. sample may be composed. */ - finalize_interm_sample(volume); - - /* Subsequent interm. samples will be homogeneous. */ - while (m_interm_sample_index + 1 < RATE_MULTIPLIER) - { - init_next_interm_sample(); - m_composed_volume[m_composed_sample_index] = volume; - } - } - /* Important: next interm. sample not initialised yet, so that no data is destroyed before filtering... */ - filtered_volume = get_filtered_volume(); - init_next_interm_sample(); - /* Reset counter to next stream sample: */ - m_interm_sample_index = 0; - - /* simple DC blocker filter */ - tempx = filtered_volume; - filtered_volume = tempx - m_prevx + 0.995 * m_prevy; - m_prevx = tempx; - m_prevy = filtered_volume; - - return filtered_volume; -} - - -void speaker_sound_device::finalize_interm_sample(int volume) -{ - double fraction; - - /* Fill the composed sample up if it was incomplete */ - fraction = make_fraction(m_next_interm_sample_time, m_last_update_time, m_interm_sample_period_secfrac); - m_composed_volume[m_composed_sample_index] += volume * fraction; - /* Update time state */ - m_last_update_time = m_next_interm_sample_time; - m_next_interm_sample_time += attotime(0, m_interm_sample_period); - - /* For compatibility with filtering, do not incr. index and initialise next sample yet. */ -} - - -void speaker_sound_device::init_next_interm_sample() -{ - /* Move the index and initialize next composed sample */ - m_composed_sample_index++; - if (m_composed_sample_index >= FILTER_LENGTH) - m_composed_sample_index = 0; - m_composed_volume[m_composed_sample_index] = 0; - - m_interm_sample_index++; - /* No limit check on interm_sample_index here - to be handled by caller */ -} - - -inline double speaker_sound_device::make_fraction(const attotime &a, const attotime &b, double timediv) -{ - /* fraction = (a - b) / timediv */ - return (a - b).as_double() / timediv; -} - - -double speaker_sound_device::get_filtered_volume() -{ - double filtered_volume = 0; - double ampsum = 0; - int i, c; - - /* Filter over composed samples (each composed sample is already average filtered) */ - for (i = m_composed_sample_index + 1, c = 0; c < FILTER_LENGTH; i++, c++) - { - if (i >= FILTER_LENGTH) i = 0; - filtered_volume += m_composed_volume[i] * m_ampl[c]; - ampsum += m_ampl[c]; - } - filtered_volume /= ampsum; - - return filtered_volume; -} diff --git a/src/devices/sound/speaker.h b/src/devices/sound/speaker.h deleted file mode 100644 index 279cfd74e01..00000000000 --- a/src/devices/sound/speaker.h +++ /dev/null @@ -1,95 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria -/********************************************************************** - - speaker.h - Sound driver to emulate a simple speaker, - driven by one or more output bits - -**********************************************************************/ -#ifndef MAME_DEVICES_SOUND_SPEAKER_H -#define MAME_DEVICES_SOUND_SPEAKER_H - -#pragma once - - -// Length of anti-aliasing filter kernel, measured in number of intermediate samples -enum -{ - FILTER_LENGTH = 64 -}; - -#define MCFG_SPEAKER_LEVELS(_num, _levels) \ - speaker_sound_device::static_set_levels(*device, _num, _levels); - -class speaker_sound_device : public device_t, - public device_sound_interface -{ -public: - speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - ~speaker_sound_device() {} - - // static configuration - static void static_set_levels(device_t &device, int num_levels, const int16_t *levels) { downcast(device).m_num_levels = num_levels; downcast(device).m_levels = levels;} - - void level_w(int new_level); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - -private: - // internal state - - // Updates the composed volume array according to time - void update_interm_samples(const attotime &time, int volume); - - // Updates the composed volume array and returns final filtered volume of next stream sample - double update_interm_samples_get_filtered_volume(int volume); - - void finalize_interm_sample(int volume); - void init_next_interm_sample(); - inline double make_fraction(const attotime &a, const attotime &b, double timediv); - double get_filtered_volume(); - - // Kernel (pulse response) for filtering across samples (while we avoid fancy filtering within samples) - double m_ampl[FILTER_LENGTH]; - - sound_stream *m_channel; - int m_level; - - /* The volume of a composed sample grows incrementally each time the speaker is over-sampled. - * That is in effect a basic average filter. - * Another filter can and will be applied to the array of composed samples. - */ - double m_composed_volume[FILTER_LENGTH]; /* integrator(s) */ - int m_composed_sample_index; /* array index for composed_volume */ - attoseconds_t m_channel_sample_period; /* in as */ - double m_channel_sample_period_secfrac; /* in fraction of second */ - attotime m_channel_last_sample_time; - attotime m_channel_next_sample_time; - attoseconds_t m_interm_sample_period; - double m_interm_sample_period_secfrac; - attotime m_next_interm_sample_time; - int m_interm_sample_index; /* counts interm. samples between stream samples */ - attotime m_last_update_time; /* internal timestamp */ - - void speaker_postload(); - - // DC blocker state - double m_prevx, m_prevy; - - int m_num_levels; /* optional: number of levels (if not two) */ - const int16_t *m_levels; /* optional: pointer to level lookup table */ -}; - -extern const device_type SPEAKER_SOUND; - -extern template class device_finder; -extern template class device_finder; - -#endif // MAME_DEVICES_SOUND_SPEAKER_H diff --git a/src/devices/sound/spkrdev.cpp b/src/devices/sound/spkrdev.cpp new file mode 100644 index 00000000000..4af44791921 --- /dev/null +++ b/src/devices/sound/spkrdev.cpp @@ -0,0 +1,414 @@ +// license:BSD-3-Clause +// copyright-holders:Nicola Salmoria +/*************************************************************************** + + speaker.c + + Sound driver to emulate a simple speaker, + driven by one or more output bits + + Original author: (unsigned) + Filtering: Anders Hallstr?m +****************************************************************************/ + +/* Discussion of oversampling and anti-alias filtering: (Anders Hallstr?m) + * + * This driver is for machines that directly control + * one or more simple digital-to-analog converters (DAC) + * connected to one or more audio outputs (such as analog amp + speaker). + * Currently only 1-bit DAC is supported via the interface to this module. + * + * Frequently such machines would oversample the DAC + * in order to overcome the limited DAC resolution. + * For faithful reproduction of the sound, this must be carefully handled + * with anti-alias filtering when converting a high-rate low-resolution signal + * to a moderate-rate high-resolution signal suitable for the DAC in the emulator's sound card. + * (Originally, removal of any redundant high frequency content occurred on the analog side + * with no aliasing effects.) + * + * The most straightforward, naive way to handle this is to use two streams; + * stream 1 modeling the native audio, with a sampling rate that allows for + * accurate representation of over-sampling, i.e. the sampling rate should match + * the clock frequency of the audio generating device (such as the CPU). + * Stream 1 is connected to stream 2, which is concerned with feeding the sound card. + * The stream system has features to handle rate conversion from stream 1 to 2. + * + * I tried it out of curiosity; it works fine conceptually, but + * - it puts an unnecessary burden on system resources + * - sound quality is still not satisfactory, though better than without anti-alias + * - "stream 1" properties are machine specific and so should be configured + * individually in each machine driver using this approach. + * This can also be seen as an advantage for flexibility, though. + * + * Instead, dedicated filtering is implemented in this module, + * in a machine-neutral way (based on machine time and external -samplerate only). + * + * The basic average filter has the advantage that it can be used without + * explicitly generating all samples in "stream 1". However, + * it is poor for anti-alias filtering. + * Therefore, average filtering is combined with windowed sinc. + * + * Virtual stream 1: Samples in true machine time. + * Any sampling rate up to attotime resolution is implicitly supported. + * -> average filtering over each stream 2 sample -> + * Virtual stream 2: Intermediate representation. + * Sample rate = RATE_MULTIPLIER * stream 3 sample rate. + * If effective rate of stream 1 exceeds rate of stream 2, + * some aliasing distorsion is introduced in this step because the average filtering is a compromise. + * The distorsion is however mostly in the higher frequencies. + * -> low-pass anti-alias filtering with kernel ampl[] -> + * -> down-sampling -> + * Actual stream 3: channel output generated by speaker_sound_update(). + * Sample rate = device sample rate = configured "-samplerate". + * + * In the speaker_state data structure, + * "intermediate samples" refers to "stream 2" + * "channel samples" refers to "stream 3" + */ + +/* IMPROVEMENTS POSSIBLE: + * - Make filter length a run-time configurable parameter. min=1 max=1000 or something + * - Optimize cutoff freq automatically after filter length, or configurable too + * - Generalise this approach to other DAC-based sound types if susceptible to aliasing + */ + +#include "emu.h" +#include "sound/spkrdev.h" + + +static const int16_t default_levels[2] = {0, 32767}; + +// Internal oversampling factor (interm. samples vs stream samples) +static const int RATE_MULTIPLIER = 4; + + +const device_type SPEAKER_SOUND = device_creator; + +template class device_finder; +template class device_finder; + + +speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker_sound", __FILE__) + , device_sound_interface(mconfig, *this) + , m_num_levels(2) + , m_levels(default_levels) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void speaker_sound_device::device_start() +{ + int i; + double x; + + m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate()); + + m_level = 0; + for (i = 0; i < FILTER_LENGTH; i++) + m_composed_volume[i] = 0; + + m_composed_sample_index = 0; + m_last_update_time = machine().time(); + m_channel_sample_period = HZ_TO_ATTOSECONDS(machine().sample_rate()); + m_channel_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_channel_sample_period); + m_interm_sample_period = m_channel_sample_period / RATE_MULTIPLIER; + m_interm_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_interm_sample_period); + m_channel_last_sample_time = m_channel->sample_time(); + m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); + m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); + m_interm_sample_index = 0; + m_prevx = m_prevy = 0.0; + + /* Note: To avoid time drift due to floating point inaccuracies, + * it is good if the speaker time synchronizes itself with the stream timing regularly. + */ + + /* Compute filter kernel; */ + /* (Done for each device though the data is shared... + * No problem really, but should be done as part of system init if I knew how) + */ +#if 1 + /* This is an approximated sinc (a perfect sinc makes an ideal low-pass filter). + * FILTER_STEP determines the cutoff frequency, + * which should be below the Nyquist freq, i.e. half the sample rate. + * Smaller step => kernel extends in time domain => lower cutoff freq + * In this case, with sinc, filter step PI corresponds to the Nyq. freq. + * Since we do not get a perfect filter => must lower the cutoff freq some more. + * For example, step PI/(2*RATE_MULTIPLIER) corresponds to cutoff freq = sample rate / 4; + * With -samplerate 48000, cutoff freq is ca 12kHz while the Nyq. freq is 24kHz. + * With -samplerate 96000, cutoff freq is ca 24kHz while the Nyq. freq is 48kHz. + * For a steeper, more efficient filter, increase FILTER_LENGTH at the expense of CPU usage. + */ +#define FILTER_STEP (M_PI / 2 / RATE_MULTIPLIER) + /* Distribute symmetrically on x axis; center has x=0 if length is odd */ + for (i = 0, x = (0.5 - FILTER_LENGTH / 2.) * FILTER_STEP; + i < FILTER_LENGTH; + i++, x += FILTER_STEP) + { + if (x == 0) + m_ampl[i] = 1; + else + m_ampl[i] = sin(x) / x; + } +#else + /* Trivial average filter with poor frequency cutoff properties; + * First zero (frequency where amplification=0) = sample rate / filter length + * Cutoff frequency approx <= first zero / 2 + */ + for (i = 0, i < FILTER_LENGTH; i++) + m_ampl[i] = 1; +#endif + + save_item(NAME(m_level)); + save_item(NAME(m_composed_volume)); + save_item(NAME(m_composed_sample_index)); + save_item(NAME(m_channel_last_sample_time)); + save_item(NAME(m_interm_sample_index)); + save_item(NAME(m_last_update_time)); + save_item(NAME(m_prevx)); + save_item(NAME(m_prevy)); + + machine().save().register_postload(save_prepost_delegate(FUNC(speaker_sound_device::speaker_postload), this)); +} + +void speaker_sound_device::device_reset() +{ + int i; + + m_level = 0; + for (i = 0; i < FILTER_LENGTH; i++) + m_composed_volume[i] = 0; + + m_composed_sample_index = 0; + m_last_update_time = machine().time(); + m_channel_sample_period = HZ_TO_ATTOSECONDS(machine().sample_rate()); + m_channel_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_channel_sample_period); + m_interm_sample_period = m_channel_sample_period / RATE_MULTIPLIER; + m_interm_sample_period_secfrac = ATTOSECONDS_TO_DOUBLE(m_interm_sample_period); + m_channel_last_sample_time = m_channel->sample_time(); + m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); + m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); + m_interm_sample_index = 0; + m_prevx = m_prevy = 0.0; +} + +void speaker_sound_device::speaker_postload() +{ + m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); + m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); +} + +//------------------------------------------------- +// sound_stream_update - handle a stream update +//------------------------------------------------- + +// This can be triggered by the core (based on emulated time) or via level_w(). +void speaker_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) +{ + stream_sample_t *buffer = outputs[0]; + int volume = m_levels[m_level]; + double filtered_volume; + attotime sampled_time = attotime::zero; + + if (samples > 0) + { + /* Prepare to update time state */ + sampled_time = attotime(0, m_channel_sample_period); + if (samples > 1) + sampled_time *= samples; + + /* Note: since the stream is in the process of being updated, + * stream->sample_time() will return the time before the update! (MAME 0.130) + * Avoid using it here in order to avoid a subtle dependence on the stream implementation. + */ + } + + if (samples-- > 0) + { + /* Note that first interm. sample may be composed... */ + filtered_volume = update_interm_samples_get_filtered_volume(volume); + + /* Composite volume is now quantized to the stream resolution */ + *buffer++ = (stream_sample_t)filtered_volume; + + /* Any additional samples will be homogeneous, however may need filtering across samples: */ + while (samples-- > 0) + { + filtered_volume = update_interm_samples_get_filtered_volume(volume); + *buffer++ = (stream_sample_t)filtered_volume; + } + + /* Update the time state */ + m_channel_last_sample_time += sampled_time; + m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); + m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); + m_last_update_time = m_channel_last_sample_time; + } +} + + + +void speaker_sound_device::level_w(int new_level) +{ + int volume; + attotime time; + + if (new_level == m_level) + return; + + if (new_level < 0) + new_level = 0; + else + if (new_level >= m_num_levels) + new_level = m_num_levels - 1; + + volume = m_levels[m_level]; + time = machine().time(); + + if (time < m_channel_next_sample_time) + { + /* Stream sample is yet unfinished, but we may have one or more interm. samples */ + update_interm_samples(time, volume); + + /* Do not forget to update speaker state before returning! */ + m_level = new_level; + return; + } + /* Reaching here means such time has passed since last stream update + * that we can add at least one complete sample to the stream. + * The details have to be handled by speaker_sound_update() + */ + + /* Force streams.c to update sound until this point in time now */ + m_channel->update(); + + /* This is redundant because time update has to be done within speaker_sound_update() anyway, + * however this ensures synchronization between the speaker and stream timing: + */ + m_channel_last_sample_time = m_channel->sample_time(); + m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); + m_next_interm_sample_time = m_channel_last_sample_time + attotime(0, m_interm_sample_period); + m_last_update_time = m_channel_last_sample_time; + + /* Assertion: time - last_update_time < channel_sample_period, i.e. time < channel_next_sample_time */ + + /* The overshooting fraction of time will make zero, one or more interm. samples: */ + update_interm_samples(time, volume); + + /* Finally update speaker state before returning */ + m_level = new_level; + +} + + +void speaker_sound_device::update_interm_samples(const attotime &time, int volume) +{ + double fraction; + + /* We may have completed zero, one or more interm. samples: */ + while (time >= m_next_interm_sample_time) + { + /* First interm. sample may be composed, subsequent samples will be homogeneous. */ + /* Treat all the same general way. */ + finalize_interm_sample(volume); + init_next_interm_sample(); + } + /* Depending on status above: + * a) Add latest fraction to unfinished composed sample + * b) The overshooting fraction of time will start a new composed sample + */ + fraction = make_fraction(time, m_last_update_time, m_interm_sample_period_secfrac); + m_composed_volume[m_composed_sample_index] += volume * fraction; + m_last_update_time = time; +} + + +double speaker_sound_device::update_interm_samples_get_filtered_volume(int volume) +{ + double filtered_volume, tempx; + + /* We may have one or more interm. samples to go */ + if (m_interm_sample_index < RATE_MULTIPLIER) + { + /* First interm. sample may be composed. */ + finalize_interm_sample(volume); + + /* Subsequent interm. samples will be homogeneous. */ + while (m_interm_sample_index + 1 < RATE_MULTIPLIER) + { + init_next_interm_sample(); + m_composed_volume[m_composed_sample_index] = volume; + } + } + /* Important: next interm. sample not initialised yet, so that no data is destroyed before filtering... */ + filtered_volume = get_filtered_volume(); + init_next_interm_sample(); + /* Reset counter to next stream sample: */ + m_interm_sample_index = 0; + + /* simple DC blocker filter */ + tempx = filtered_volume; + filtered_volume = tempx - m_prevx + 0.995 * m_prevy; + m_prevx = tempx; + m_prevy = filtered_volume; + + return filtered_volume; +} + + +void speaker_sound_device::finalize_interm_sample(int volume) +{ + double fraction; + + /* Fill the composed sample up if it was incomplete */ + fraction = make_fraction(m_next_interm_sample_time, m_last_update_time, m_interm_sample_period_secfrac); + m_composed_volume[m_composed_sample_index] += volume * fraction; + /* Update time state */ + m_last_update_time = m_next_interm_sample_time; + m_next_interm_sample_time += attotime(0, m_interm_sample_period); + + /* For compatibility with filtering, do not incr. index and initialise next sample yet. */ +} + + +void speaker_sound_device::init_next_interm_sample() +{ + /* Move the index and initialize next composed sample */ + m_composed_sample_index++; + if (m_composed_sample_index >= FILTER_LENGTH) + m_composed_sample_index = 0; + m_composed_volume[m_composed_sample_index] = 0; + + m_interm_sample_index++; + /* No limit check on interm_sample_index here - to be handled by caller */ +} + + +inline double speaker_sound_device::make_fraction(const attotime &a, const attotime &b, double timediv) +{ + /* fraction = (a - b) / timediv */ + return (a - b).as_double() / timediv; +} + + +double speaker_sound_device::get_filtered_volume() +{ + double filtered_volume = 0; + double ampsum = 0; + int i, c; + + /* Filter over composed samples (each composed sample is already average filtered) */ + for (i = m_composed_sample_index + 1, c = 0; c < FILTER_LENGTH; i++, c++) + { + if (i >= FILTER_LENGTH) i = 0; + filtered_volume += m_composed_volume[i] * m_ampl[c]; + ampsum += m_ampl[c]; + } + filtered_volume /= ampsum; + + return filtered_volume; +} diff --git a/src/devices/sound/spkrdev.h b/src/devices/sound/spkrdev.h new file mode 100644 index 00000000000..4fdb0a92ff6 --- /dev/null +++ b/src/devices/sound/spkrdev.h @@ -0,0 +1,95 @@ +// license:BSD-3-Clause +// copyright-holders:Nicola Salmoria +/********************************************************************** + + speaker.h + Sound driver to emulate a simple speaker, + driven by one or more output bits + +**********************************************************************/ +#ifndef MAME_DEVICES_SOUND_SPKRDEV_H +#define MAME_DEVICES_SOUND_SPKRDEV_H + +#pragma once + + +// Length of anti-aliasing filter kernel, measured in number of intermediate samples +enum +{ + FILTER_LENGTH = 64 +}; + +#define MCFG_SPEAKER_LEVELS(_num, _levels) \ + speaker_sound_device::static_set_levels(*device, _num, _levels); + +class speaker_sound_device : public device_t, + public device_sound_interface +{ +public: + speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ~speaker_sound_device() {} + + // static configuration + static void static_set_levels(device_t &device, int num_levels, const int16_t *levels) { downcast(device).m_num_levels = num_levels; downcast(device).m_levels = levels;} + + void level_w(int new_level); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // sound stream update overrides + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; + +private: + // internal state + + // Updates the composed volume array according to time + void update_interm_samples(const attotime &time, int volume); + + // Updates the composed volume array and returns final filtered volume of next stream sample + double update_interm_samples_get_filtered_volume(int volume); + + void finalize_interm_sample(int volume); + void init_next_interm_sample(); + inline double make_fraction(const attotime &a, const attotime &b, double timediv); + double get_filtered_volume(); + + // Kernel (pulse response) for filtering across samples (while we avoid fancy filtering within samples) + double m_ampl[FILTER_LENGTH]; + + sound_stream *m_channel; + int m_level; + + /* The volume of a composed sample grows incrementally each time the speaker is over-sampled. + * That is in effect a basic average filter. + * Another filter can and will be applied to the array of composed samples. + */ + double m_composed_volume[FILTER_LENGTH]; /* integrator(s) */ + int m_composed_sample_index; /* array index for composed_volume */ + attoseconds_t m_channel_sample_period; /* in as */ + double m_channel_sample_period_secfrac; /* in fraction of second */ + attotime m_channel_last_sample_time; + attotime m_channel_next_sample_time; + attoseconds_t m_interm_sample_period; + double m_interm_sample_period_secfrac; + attotime m_next_interm_sample_time; + int m_interm_sample_index; /* counts interm. samples between stream samples */ + attotime m_last_update_time; /* internal timestamp */ + + void speaker_postload(); + + // DC blocker state + double m_prevx, m_prevy; + + int m_num_levels; /* optional: number of levels (if not two) */ + const int16_t *m_levels; /* optional: pointer to level lookup table */ +}; + +extern const device_type SPEAKER_SOUND; + +extern template class device_finder; +extern template class device_finder; + +#endif // MAME_DEVICES_SOUND_SPKRDEV_H diff --git a/src/devices/sound/spu.cpp b/src/devices/sound/spu.cpp index a222a5626de..755717f1fc9 100644 --- a/src/devices/sound/spu.cpp +++ b/src/devices/sound/spu.cpp @@ -34,7 +34,7 @@ #endif // device type definition -const device_type SPU = &device_creator; +const device_type SPU = device_creator; // // diff --git a/src/devices/sound/st0016.cpp b/src/devices/sound/st0016.cpp index e4bfdadd959..9f186fa03e0 100644 --- a/src/devices/sound/st0016.cpp +++ b/src/devices/sound/st0016.cpp @@ -13,7 +13,7 @@ // device type definition -const device_type ST0016 = &device_creator; +const device_type ST0016 = device_creator; //************************************************************************** diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp index 2eb5cd313d3..4cf3d2914c2 100644 --- a/src/devices/sound/t6721a.cpp +++ b/src/devices/sound/t6721a.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -const device_type T6721A = &device_creator; +const device_type T6721A = device_creator; diff --git a/src/devices/sound/t6w28.cpp b/src/devices/sound/t6w28.cpp index 4dc7174b99a..ffc966d0720 100644 --- a/src/devices/sound/t6w28.cpp +++ b/src/devices/sound/t6w28.cpp @@ -347,7 +347,7 @@ void t6w28_device::set_enable(bool enable) m_enabled = enable; } -const device_type T6W28 = &device_creator; +const device_type T6W28 = device_creator; t6w28_device::t6w28_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, T6W28, "T6W28", tag, owner, clock, "t6w28", __FILE__), diff --git a/src/devices/sound/tc8830f.cpp b/src/devices/sound/tc8830f.cpp index 2c862824d29..7a997d9d19f 100644 --- a/src/devices/sound/tc8830f.cpp +++ b/src/devices/sound/tc8830f.cpp @@ -22,7 +22,7 @@ // device type definition -const device_type TC8830F = &device_creator; +const device_type TC8830F = device_creator; tc8830f_device::tc8830f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC8830F, "TC8830F", tag, owner, clock, "tc8830f", __FILE__), diff --git a/src/devices/sound/tiaintf.cpp b/src/devices/sound/tiaintf.cpp index f2158d8941b..ea473c535c0 100644 --- a/src/devices/sound/tiaintf.cpp +++ b/src/devices/sound/tiaintf.cpp @@ -5,7 +5,7 @@ #include "tiasound.h" // device type definition -const device_type TIA = &device_creator; +const device_type TIA = device_creator; //************************************************************************** diff --git a/src/devices/sound/tms3615.cpp b/src/devices/sound/tms3615.cpp index ae39d751db6..5d9eac4e41e 100644 --- a/src/devices/sound/tms3615.cpp +++ b/src/devices/sound/tms3615.cpp @@ -10,7 +10,7 @@ static const int divisor[TMS3615_TONES] = { 478, 451, 426, 402, 379, 358, 338, 3 // device type definition -const device_type TMS3615 = &device_creator; +const device_type TMS3615 = device_creator; //************************************************************************** diff --git a/src/devices/sound/tms36xx.cpp b/src/devices/sound/tms36xx.cpp index 5f1a8db2def..5375117b444 100644 --- a/src/devices/sound/tms36xx.cpp +++ b/src/devices/sound/tms36xx.cpp @@ -309,7 +309,7 @@ static const int *const tunes[] = {nullptr,tune1,tune2,tune3,tune4}; // device type definition -const device_type TMS36XX = &device_creator; +const device_type TMS36XX = device_creator; //************************************************************************** diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp index 84e36322477..74ba519d649 100644 --- a/src/devices/sound/tms5110.cpp +++ b/src/devices/sound/tms5110.cpp @@ -1521,7 +1521,7 @@ WRITE_LINE_MEMBER( tmsprom_device::enable_w ) TMS 5110 device definition -------------------------------------------------*/ -const device_type TMS5110 = &device_creator; +const device_type TMS5110 = device_creator; tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, TMS5110, "TMS5110", tag, owner, clock, "tms5110", __FILE__) @@ -1541,56 +1541,56 @@ tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, } -const device_type TMS5100 = &device_creator; +const device_type TMS5100 = device_creator; tms5100_device::tms5100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, TMS5100, "TMS5100", tag, owner, clock, "tms5100", __FILE__) { } -const device_type TMC0281 = &device_creator; +const device_type TMC0281 = device_creator; tmc0281_device::tmc0281_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, TMC0281, "TMC0281", tag, owner, clock, "tmc0281", __FILE__) { } -const device_type TMS5100A = &device_creator; +const device_type TMS5100A = device_creator; tms5100a_device::tms5100a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, TMS5100A, "TMS5100A", tag, owner, clock, "tms5100a", __FILE__) { } -const device_type TMC0281D = &device_creator; +const device_type TMC0281D = device_creator; tmc0281d_device::tmc0281d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, TMC0281D, "TMC0281D", tag, owner, clock, "tmc0281d", __FILE__) { } -const device_type CD2801 = &device_creator; +const device_type CD2801 = device_creator; cd2801_device::cd2801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, CD2801, "CD2801", tag, owner, clock, "cd2801", __FILE__) { } -const device_type CD2802 = &device_creator; +const device_type CD2802 = device_creator; cd2802_device::cd2802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, CD2802, "CD2802", tag, owner, clock, "cd2802", __FILE__) { } -const device_type TMS5110A = &device_creator; +const device_type TMS5110A = device_creator; tms5110a_device::tms5110a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, TMS5110A, "TMS5110A", tag, owner, clock, "tms5110a", __FILE__) { } -const device_type M58817 = &device_creator; +const device_type M58817 = device_creator; m58817_device::m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5110_device(mconfig, M58817, "M58817", tag, owner, clock, "m58817", __FILE__) @@ -1598,7 +1598,7 @@ m58817_device::m58817_device(const machine_config &mconfig, const char *tag, dev } -const device_type TMSPROM = &device_creator; +const device_type TMSPROM = device_creator; tmsprom_device::tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TMSPROM, "TMSPROM", tag, owner, clock, "tmsprom", __FILE__), diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index f20b7c2f90b..bf9c782d1e9 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -2169,7 +2169,7 @@ void tms5220_device::set_frequency(int frequency) m_clock = frequency; } -const device_type TMS5220C = &device_creator; +const device_type TMS5220C = device_creator; tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5220_device(mconfig, TMS5220C, "TMS5220C", tag, owner, clock, "tms5220c", __FILE__) @@ -2177,7 +2177,7 @@ tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, } -const device_type TMS5220 = &device_creator; +const device_type TMS5220 = device_creator; tms5220_device::tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TMS5220, "TMS5220", tag, owner, clock, "tms5220", __FILE__), @@ -2208,7 +2208,7 @@ tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, } -const device_type CD2501E = &device_creator; +const device_type CD2501E = device_creator; cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5220_device(mconfig, CD2501E, "CD2501E", tag, owner, clock, "cd2501e", __FILE__) @@ -2216,7 +2216,7 @@ cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, d } -const device_type TMS5200 = &device_creator; +const device_type TMS5200 = device_creator; tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5220_device(mconfig, TMS5200, "TMS5200", tag, owner, clock, "tms5200", __FILE__) @@ -2224,7 +2224,7 @@ tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, d } -const device_type CD2501ECD = &device_creator; +const device_type CD2501ECD = device_creator; cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms5220_device(mconfig, CD2501ECD, "CD2501ECD", tag, owner, clock, "cd2501ecd", __FILE__) diff --git a/src/devices/sound/upd1771.cpp b/src/devices/sound/upd1771.cpp index 57aa4faa4dc..0e24aedbe26 100644 --- a/src/devices/sound/upd1771.cpp +++ b/src/devices/sound/upd1771.cpp @@ -230,7 +230,7 @@ static unsigned char noise_tbl[]= #define STATE_ADPCM 3 -const device_type UPD1771C = &device_creator; +const device_type UPD1771C = device_creator; upd1771c_device::upd1771c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/sound/upd7752.cpp b/src/devices/sound/upd7752.cpp index ccdb6c490d1..33554e5a1b8 100644 --- a/src/devices/sound/upd7752.cpp +++ b/src/devices/sound/upd7752.cpp @@ -18,7 +18,7 @@ skeleton device //************************************************************************** // device type definition -const device_type UPD7752 = &device_creator; +const device_type UPD7752 = device_creator; /* TODO: unknown exact size */ static ADDRESS_MAP_START( upd7752_ram, AS_0, 8, upd7752_device ) diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp index aedd8dd1331..e1b8dd88ad6 100644 --- a/src/devices/sound/upd7759.cpp +++ b/src/devices/sound/upd7759.cpp @@ -179,7 +179,7 @@ upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, { } -const device_type UPD7759 = &device_creator; +const device_type UPD7759 = device_creator; upd7759_device::upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : upd775x_device(mconfig, UPD7759, "uPD7759", tag, owner, clock, "upd7759", __FILE__) @@ -195,7 +195,7 @@ upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, } -const device_type UPD7756 = &device_creator; +const device_type UPD7756 = device_creator; upd7756_device::upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : upd775x_device(mconfig, UPD7756, "uPD7756", tag, owner, clock, "upd7756", __FILE__) diff --git a/src/devices/sound/vlm5030.cpp b/src/devices/sound/vlm5030.cpp index a982965186e..22628afeae3 100644 --- a/src/devices/sound/vlm5030.cpp +++ b/src/devices/sound/vlm5030.cpp @@ -157,7 +157,7 @@ static const int vlm5030_speed_table[8] = IP_SIZE_SLOW }; -const device_type VLM5030 = &device_creator; +const device_type VLM5030 = device_creator; vlm5030_device::vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VLM5030, "VLM5030", tag, owner, clock, "vlm5030", __FILE__), diff --git a/src/devices/sound/volt_reg.cpp b/src/devices/sound/volt_reg.cpp index 82065a72568..6e179599907 100644 --- a/src/devices/sound/volt_reg.cpp +++ b/src/devices/sound/volt_reg.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "volt_reg.h" -const device_type VOLTAGE_REGULATOR = &device_creator; +const device_type VOLTAGE_REGULATOR = device_creator; voltage_regulator_device::voltage_regulator_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VOLTAGE_REGULATOR, "Voltage Regulator", tag, owner, clock, "volt_reg", __FILE__), diff --git a/src/devices/sound/votrax.cpp b/src/devices/sound/votrax.cpp index bde5fbd6086..1068554aab3 100644 --- a/src/devices/sound/votrax.cpp +++ b/src/devices/sound/votrax.cpp @@ -26,7 +26,7 @@ tp1 = phi clock (tied to f2q rom access) #include "votrax.h" -const device_type VOTRAX_SC01 = &device_creator; +const device_type VOTRAX_SC01 = device_creator; // ROM definition for the Votrax phone ROM ROM_START( votrax_sc01 ) diff --git a/src/devices/sound/vrc6.cpp b/src/devices/sound/vrc6.cpp index 267477b751c..a377e736301 100644 --- a/src/devices/sound/vrc6.cpp +++ b/src/devices/sound/vrc6.cpp @@ -19,7 +19,7 @@ #define DISABLE_VRC6_SOUND // not ready yet // device type definition -const device_type VRC6 = &device_creator; +const device_type VRC6 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/sound/vrender0.cpp b/src/devices/sound/vrender0.cpp index 76f186e4b52..4968376dff5 100644 --- a/src/devices/sound/vrender0.cpp +++ b/src/devices/sound/vrender0.cpp @@ -77,7 +77,7 @@ static const unsigned short ULawTo16[]= // LIVE DEVICE //************************************************************************** -const device_type VRENDER0 = &device_creator; +const device_type VRENDER0 = device_creator; //------------------------------------------------- // vrender0_device - constructor diff --git a/src/devices/sound/wave.cpp b/src/devices/sound/wave.cpp index ac1d4036948..8515ec5237f 100644 --- a/src/devices/sound/wave.cpp +++ b/src/devices/sound/wave.cpp @@ -18,6 +18,9 @@ #include "emu.h" #include "wave.h" +#include "speaker.h" + + #define ALWAYS_PLAY_SOUND 0 @@ -28,7 +31,7 @@ void wave_device::static_set_cassette_tag(device_t &device, const char *cassette wave.m_cassette_tag = cassette_tag; } -const device_type WAVE = &device_creator; +const device_type WAVE = device_creator; wave_device::wave_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WAVE, "Wave", tag, owner, clock, "wave", __FILE__), diff --git a/src/devices/sound/x1_010.cpp b/src/devices/sound/x1_010.cpp index 377a229e0cb..bbaff50d15d 100644 --- a/src/devices/sound/x1_010.cpp +++ b/src/devices/sound/x1_010.cpp @@ -83,7 +83,7 @@ struct X1_010_CHANNEL { //static short *mixer_buffer = nullptr; -const device_type X1_010 = &device_creator; +const device_type X1_010 = device_creator; x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, X1_010, "X1-010", tag, owner, clock, "x1_010", __FILE__), diff --git a/src/devices/sound/ym2151.cpp b/src/devices/sound/ym2151.cpp index bc6e57cb7ea..b35787d0d1d 100644 --- a/src/devices/sound/ym2151.cpp +++ b/src/devices/sound/ym2151.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "ym2151.h" -const device_type YM2151 = &device_creator; +const device_type YM2151 = device_creator; #define FREQ_SH 16 /* 16.16 fixed point (frequency calculations) */ diff --git a/src/devices/sound/ym2413.cpp b/src/devices/sound/ym2413.cpp index aa3aba490cb..76fcb144df0 100644 --- a/src/devices/sound/ym2413.cpp +++ b/src/devices/sound/ym2413.cpp @@ -1675,7 +1675,7 @@ WRITE8_MEMBER( ym2413_device::data_port_w ) write_reg(address, data); } -const device_type YM2413 = &device_creator; +const device_type YM2413 = device_creator; ym2413_device::ym2413_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YM2413, "YM2413", tag, owner, clock, "ym2413", __FILE__), diff --git a/src/devices/sound/ymf271.cpp b/src/devices/sound/ymf271.cpp index 0062e429ee8..74ac30f0ca6 100644 --- a/src/devices/sound/ymf271.cpp +++ b/src/devices/sound/ymf271.cpp @@ -1744,7 +1744,7 @@ void ymf271_device::device_reset() m_irq_handler(0); } -const device_type YMF271 = &device_creator; +const device_type YMF271 = device_creator; ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__) diff --git a/src/devices/sound/ymf278b.cpp b/src/devices/sound/ymf278b.cpp index 57084565fb0..a57f006d06c 100644 --- a/src/devices/sound/ymf278b.cpp +++ b/src/devices/sound/ymf278b.cpp @@ -1025,7 +1025,7 @@ void ymf278b_device::device_start() } -const device_type YMF278B = &device_creator; +const device_type YMF278B = device_creator; ymf278b_device::ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YMF278B, "YMF278B", tag, owner, clock, "ymf278b", __FILE__), diff --git a/src/devices/sound/ymz280b.cpp b/src/devices/sound/ymz280b.cpp index 4dde3676fce..40e9578557f 100644 --- a/src/devices/sound/ymz280b.cpp +++ b/src/devices/sound/ymz280b.cpp @@ -940,7 +940,7 @@ WRITE8_MEMBER( ymz280b_device::write ) } -const device_type YMZ280B = &device_creator; +const device_type YMZ280B = device_creator; ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, YMZ280B, "YMZ280B", tag, owner, clock, "ymz280b", __FILE__), diff --git a/src/devices/sound/ymz770.cpp b/src/devices/sound/ymz770.cpp index b30c3c1c783..5bdb7e9a89d 100644 --- a/src/devices/sound/ymz770.cpp +++ b/src/devices/sound/ymz770.cpp @@ -24,7 +24,7 @@ TODO: #include "mpeg_audio.h" // device type definition -const device_type YMZ770 = &device_creator; +const device_type YMZ770 = device_creator; //------------------------------------------------- // ymz770_device - constructor diff --git a/src/devices/sound/zsg2.cpp b/src/devices/sound/zsg2.cpp index c767c6a042e..9cef9c598b3 100644 --- a/src/devices/sound/zsg2.cpp +++ b/src/devices/sound/zsg2.cpp @@ -59,7 +59,7 @@ TODO: // device type definition -const device_type ZSG2 = &device_creator; +const device_type ZSG2 = device_creator; //------------------------------------------------- // zsg2_device - constructor diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index eb6985203e2..82f8c038921 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -105,9 +105,9 @@ static const uint8_t pal_224[6] = { 3, 13, 38, 224, 32, 3 }; static const uint8_t pal_240[6] = { 3, 13, 30, 240, 24, 3 }; -const device_type SEGA315_5124 = &device_creator; -const device_type SEGA315_5246 = &device_creator; -const device_type SEGA315_5378 = &device_creator; +const device_type SEGA315_5124 = device_creator; +const device_type SEGA315_5246 = device_creator; +const device_type SEGA315_5378 = device_creator; PALETTE_INIT_MEMBER(sega315_5124_device, sega315_5124) diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h index 7cc8cdaf642..e3ab1f23559 100644 --- a/src/devices/video/315_5124.h +++ b/src/devices/video/315_5124.h @@ -8,8 +8,12 @@ **************************************************************************/ -#ifndef __SEGA315_5124_H__ -#define __SEGA315_5124_H__ +#ifndef MAME_DEVICES_VIDEO_315_5124_H +#define MAME_DEVICES_VIDEO_315_5124_H + +#pragma once + +#include "screen.h" /*************************************************************************** @@ -263,4 +267,4 @@ protected: devcb = &sega315_5378_device::set_pause_callback(*device, DEVCB_##_devcb); -#endif /* __SEGA315_5124_H__ */ +#endif // MAME_DEVICES_VIDEO_315_5124_H diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp index 520c2c45980..c6f9e28e456 100644 --- a/src/devices/video/315_5313.cpp +++ b/src/devices/video/315_5313.cpp @@ -12,7 +12,7 @@ #define MAX_HPOSITION 480 -const device_type SEGA315_5313 = &device_creator; +const device_type SEGA315_5313 = device_creator; sega315_5313_device::sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : sega315_5124_device(mconfig, SEGA315_5313, "Sega 315-5313 Megadrive VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5313", __FILE__), m_render_bitmap(nullptr), diff --git a/src/devices/video/bufsprite.cpp b/src/devices/video/bufsprite.cpp index bc9717d8ef7..4a3e4033d63 100644 --- a/src/devices/video/bufsprite.cpp +++ b/src/devices/video/bufsprite.cpp @@ -17,7 +17,7 @@ //************************************************************************** // device type definition -extern const device_type BUFFERED_SPRITERAM8 = &device_creator; -extern const device_type BUFFERED_SPRITERAM16 = &device_creator; -extern const device_type BUFFERED_SPRITERAM32 = &device_creator; -extern const device_type BUFFERED_SPRITERAM64 = &device_creator; +const device_type BUFFERED_SPRITERAM8 = device_creator; +const device_type BUFFERED_SPRITERAM16 = device_creator; +const device_type BUFFERED_SPRITERAM32 = device_creator; +const device_type BUFFERED_SPRITERAM64 = device_creator; diff --git a/src/devices/video/cdp1861.cpp b/src/devices/video/cdp1861.cpp index 804cabf87e4..9e3723bdfdd 100644 --- a/src/devices/video/cdp1861.cpp +++ b/src/devices/video/cdp1861.cpp @@ -26,7 +26,7 @@ //************************************************************************** // device type definition -const device_type CDP1861 = &device_creator; +const device_type CDP1861 = device_creator; diff --git a/src/devices/video/cdp1861.h b/src/devices/video/cdp1861.h index b72b47a3042..c925583d853 100644 --- a/src/devices/video/cdp1861.h +++ b/src/devices/video/cdp1861.h @@ -21,12 +21,12 @@ **********************************************************************/ -#pragma once - -#ifndef __CDP1861__ -#define __CDP1861__ +#ifndef MAME_DEVICES_VIDEO_CDP1861_H +#define MAME_DEVICES_VIDEO_CDP1861_H +#pragma once +#include "screen.h" //************************************************************************** @@ -140,5 +140,4 @@ private: extern const device_type CDP1861; - -#endif +#endif // MAME_DEVICES_VIDEO_CDP1861_H diff --git a/src/devices/video/cdp1862.cpp b/src/devices/video/cdp1862.cpp index ab79e3998dd..4d7525195c0 100644 --- a/src/devices/video/cdp1862.cpp +++ b/src/devices/video/cdp1862.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "cdp1862.h" +#include "screen.h" + //************************************************************************** @@ -24,7 +26,7 @@ static const int CDP1862_BACKGROUND_COLOR_SEQUENCE[] = { 2, 0, 1, 4 }; //************************************************************************** // device type definition -const device_type CDP1862 = &device_creator; +const device_type CDP1862 = device_creator; diff --git a/src/devices/video/cesblit.cpp b/src/devices/video/cesblit.cpp index fd7ad41ee25..330abce1b66 100644 --- a/src/devices/video/cesblit.cpp +++ b/src/devices/video/cesblit.cpp @@ -52,12 +52,15 @@ #include "emu.h" #include "cesblit.h" +#include "screen.h" + + /*************************************************************************** GLOBAL VARIABLES ***************************************************************************/ // device type definition -const device_type CESBLIT = &device_creator; +const device_type CESBLIT = device_creator; /*************************************************************************** LIVE DEVICE diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp index f03e418e8e7..e1e6060f7c0 100644 --- a/src/devices/video/clgd542x.cpp +++ b/src/devices/video/clgd542x.cpp @@ -9,6 +9,9 @@ #include "emu.h" #include "clgd542x.h" +#include "screen.h" + + #define LOG_REG 0 #define LOG_BLIT 1 @@ -38,12 +41,12 @@ #define TEXT_COPY_9COLUMN(ch) (((ch & 0xe0) == 0xc0)&&(vga.attribute.data[0x10]&4)) -const device_type CIRRUS_GD5428 = &device_creator; -const device_type CIRRUS_GD5430 = &device_creator; +const device_type CIRRUS_GD5428 = device_creator; +const device_type CIRRUS_GD5430 = device_creator; cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : svga_device(mconfig, CIRRUS_GD5428, "Cirrus Logic GD5428", tag, owner, clock, "clgd5428", __FILE__) + : cirrus_gd5428_device(mconfig, CIRRUS_GD5428, "Cirrus Logic GD5428", tag, owner, clock, "clgd5428", __FILE__) { } diff --git a/src/devices/video/crt9007.cpp b/src/devices/video/crt9007.cpp index 1992a369df9..90eb521ffc2 100644 --- a/src/devices/video/crt9007.cpp +++ b/src/devices/video/crt9007.cpp @@ -34,13 +34,15 @@ #include "emu.h" #include "crt9007.h" +#include "screen.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type CRT9007 = &device_creator; +const device_type CRT9007 = device_creator; diff --git a/src/devices/video/crt9021.cpp b/src/devices/video/crt9021.cpp index 17f379d560c..b34ed316bd4 100644 --- a/src/devices/video/crt9021.cpp +++ b/src/devices/video/crt9021.cpp @@ -36,12 +36,14 @@ #include "emu.h" #include "crt9021.h" +#include "screen.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type CRT9021 = &device_creator; +const device_type CRT9021 = device_creator; diff --git a/src/devices/video/crt9212.cpp b/src/devices/video/crt9212.cpp index 09c8cbb68aa..922826f37ff 100644 --- a/src/devices/video/crt9212.cpp +++ b/src/devices/video/crt9212.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CRT9212 = &device_creator; +const device_type CRT9212 = device_creator; diff --git a/src/devices/video/crtc_ega.cpp b/src/devices/video/crtc_ega.cpp index eab4c2c5bfe..f993d883047 100644 --- a/src/devices/video/crtc_ega.cpp +++ b/src/devices/video/crtc_ega.cpp @@ -11,27 +11,36 @@ #include "emu.h" #include "crtc_ega.h" +#include "screen.h" + #define LOG (1) -const device_type CRTC_EGA = &device_creator; +const device_type CRTC_EGA = device_creator; crtc_ega_device::crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock, "crtc_ega", __FILE__), - device_video_interface(mconfig, *this, false), - m_res_out_de_cb(*this), - m_res_out_hsync_cb(*this), - m_res_out_vsync_cb(*this), - m_res_out_vblank_cb(*this), m_horiz_char_total(0), m_horiz_disp(0), m_horiz_blank_start(0), m_horiz_blank_end(0), m_ena_vert_access(0), m_de_skew(0), m_horiz_retr_start(0), m_horiz_retr_end(0), - m_horiz_retr_skew(0), m_vert_total(0), m_preset_row_scan(0), m_byte_panning(0), m_max_ras_addr(0), m_scan_doubling(0), m_cursor_start_ras(0), m_cursor_disable(0), m_cursor_end_ras(0), m_cursor_skew(0), - m_disp_start_addr(0), m_cursor_addr(0), m_light_pen_addr(0), m_vert_retr_start(0), m_vert_retr_end(0), m_protect(0), m_bandwidth(0), m_vert_disp_end(0), m_offset(0), m_underline_loc(0), m_vert_blank_start(0), - m_vert_blank_end(0), m_mode_control(0), m_line_compare(0), m_register_address_latch(0), m_cursor_state(false), m_cursor_blink_count(0), - m_hpixels_per_column(0), m_cur(0), m_hsync(0), m_vsync(0), m_vblank(0), m_de(0), m_character_counter(0), m_hsync_width_counter(0), m_line_counter(0), m_raster_counter(0), m_vsync_width_counter(0), - m_line_enable_ff(false), m_vsync_ff(0), m_adjust_active(0), m_line_address(0), m_cursor_x(0), m_line_timer(nullptr), m_de_off_timer(nullptr), m_cur_on_timer(nullptr), m_cur_off_timer(nullptr), - m_hsync_on_timer(nullptr), m_hsync_off_timer(nullptr), m_light_pen_latch_timer(nullptr), m_horiz_pix_total(0), m_vert_pix_total(0), m_max_visible_x(0), m_max_visible_y(0), m_hsync_on_pos(0), - m_hsync_off_pos(0), m_vsync_on_pos(0), m_vsync_off_pos(0), m_current_disp_addr(0), m_light_pen_latched(0), m_has_valid_parameters(false) + : device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock, "crtc_ega", __FILE__), device_video_interface(mconfig, *this, false) + , m_res_out_de_cb(*this), m_res_out_hsync_cb(*this), m_res_out_vsync_cb(*this), m_res_out_vblank_cb(*this) + , m_horiz_char_total(0), m_horiz_disp(0), m_horiz_blank_start(0), m_horiz_blank_end(0) + , m_ena_vert_access(0), m_de_skew(0) + , m_horiz_retr_start(0), m_horiz_retr_end(0), m_horiz_retr_skew(0) + , m_vert_total(0), m_preset_row_scan(0), m_byte_panning(0), m_max_ras_addr(0), m_scan_doubling(0) + , m_cursor_start_ras(0), m_cursor_disable(0), m_cursor_end_ras(0), m_cursor_skew(0) + , m_disp_start_addr(0), m_cursor_addr(0), m_light_pen_addr(0) + , m_vert_retr_start(0), m_vert_retr_end(0) + , m_protect(0), m_bandwidth(0), m_vert_disp_end(0), m_offset(0), m_underline_loc(0) + , m_vert_blank_start(0), m_vert_blank_end(0) + , m_mode_control(0), m_line_compare(0), m_register_address_latch(0) + , m_cursor_state(false), m_cursor_blink_count(0) + , m_hpixels_per_column(0), m_cur(0), m_hsync(0), m_vsync(0), m_vblank(0), m_de(0) + , m_character_counter(0), m_hsync_width_counter(0), m_line_counter(0), m_raster_counter(0), m_vsync_width_counter(0) + , m_line_enable_ff(false), m_vsync_ff(0), m_adjust_active(0), m_line_address(0), m_cursor_x(0) + , m_line_timer(nullptr), m_de_off_timer(nullptr), m_cur_on_timer(nullptr), m_cur_off_timer(nullptr), m_hsync_on_timer(nullptr), m_hsync_off_timer(nullptr), m_light_pen_latch_timer(nullptr) + , m_horiz_pix_total(0), m_vert_pix_total(0), m_max_visible_x(0), m_max_visible_y(0) + , m_hsync_on_pos(0), m_hsync_off_pos(0), m_vsync_on_pos(0), m_vsync_off_pos(0) + , m_current_disp_addr(0), m_light_pen_latched(0), m_has_valid_parameters(false) { } diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp index 3925d9b9607..f79c33e9717 100644 --- a/src/devices/video/dl1416.cpp +++ b/src/devices/video/dl1416.cpp @@ -164,9 +164,9 @@ protected: DEVICE TYPE GLOBALS *****************************************************************************/ -device_type const DL1414T = &device_creator; -device_type const DL1416B = &device_creator; -device_type const DL1416T = &device_creator; +device_type const DL1414T = device_creator; +device_type const DL1416B = device_creator; +device_type const DL1416T = device_creator; diff --git a/src/devices/video/dm9368.cpp b/src/devices/video/dm9368.cpp index 4b27a12da7d..8b06f49f81d 100644 --- a/src/devices/video/dm9368.cpp +++ b/src/devices/video/dm9368.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITION //************************************************************************** -const device_type DM9368 = &device_creator; +const device_type DM9368 = device_creator; diff --git a/src/devices/video/ef9340_1.cpp b/src/devices/video/ef9340_1.cpp index c252e85aa46..8bc8838b592 100644 --- a/src/devices/video/ef9340_1.cpp +++ b/src/devices/video/ef9340_1.cpp @@ -13,9 +13,11 @@ #include "ef9340_1.h" #include "ef9341_chargen.h" +#include "screen.h" + // device type definition -const device_type EF9340_1 = &device_creator; +const device_type EF9340_1 = device_creator; static const uint8_t bgr2rgb[8] = diff --git a/src/devices/video/ef9345.cpp b/src/devices/video/ef9345.cpp index c8ff12252dd..ed3ec8adc3a 100644 --- a/src/devices/video/ef9345.cpp +++ b/src/devices/video/ef9345.cpp @@ -14,6 +14,9 @@ #include "emu.h" #include "ef9345.h" +#include "screen.h" + + #define MODE24x40 0 #define MODEVAR40 1 #define MODE8x80 2 @@ -25,7 +28,7 @@ //************************************************************************** // devices -const device_type EF9345 = &device_creator; +const device_type EF9345 = device_creator; // default address map static ADDRESS_MAP_START( ef9345, AS_0, 8, ef9345_device ) diff --git a/src/devices/video/ef9364.cpp b/src/devices/video/ef9364.cpp index a228bb2cbec..6957a57d676 100644 --- a/src/devices/video/ef9364.cpp +++ b/src/devices/video/ef9364.cpp @@ -24,8 +24,11 @@ #include "emu.h" #include "ef9364.h" +#include "screen.h" + + // devices -const device_type EF9364 = &device_creator; +const device_type EF9364 = device_creator; //------------------------------------------------- // default address map diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp index 90cc08e51fb..ee57644ccaa 100644 --- a/src/devices/video/ef9365.cpp +++ b/src/devices/video/ef9365.cpp @@ -67,6 +67,9 @@ #include "emu.h" #include "ef9365.h" +#include "screen.h" + + #ifdef DBGMODE //------------------------------------------------- // Some debug mode const strings @@ -122,7 +125,7 @@ const char * commands_names[]= #endif // devices -const device_type EF9365 = &device_creator; +const device_type EF9365 = device_creator; ROM_START( ef9365 ) ROM_REGION( 0x1E0, "ef9365", 0 ) diff --git a/src/devices/video/ef9369.cpp b/src/devices/video/ef9369.cpp index f6012ffe0f4..84d69c88117 100644 --- a/src/devices/video/ef9369.cpp +++ b/src/devices/video/ef9369.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EF9369 = &device_creator; +const device_type EF9369 = device_creator; //************************************************************************** diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp index bcf4e04ab18..68d1098abd5 100644 --- a/src/devices/video/epic12.cpp +++ b/src/devices/video/epic12.cpp @@ -7,7 +7,7 @@ -const device_type EPIC12 = &device_creator; +const device_type EPIC12 = device_creator; epic12_device::epic12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, EPIC12, "EP1C12 Blitter", tag, owner, clock, "epic12", __FILE__), diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp index 486b8e909e3..88875b8eb67 100644 --- a/src/devices/video/fixfreq.cpp +++ b/src/devices/video/fixfreq.cpp @@ -31,7 +31,7 @@ ***************************************************************************/ // device type definition -const device_type FIXFREQ = &device_creator; +const device_type FIXFREQ = device_creator; fixedfreq_device::fixedfreq_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), diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h index ed009275cae..080013ad1a6 100644 --- a/src/devices/video/fixfreq.h +++ b/src/devices/video/fixfreq.h @@ -11,10 +11,12 @@ ***************************************************************************/ -#ifndef FIXFREQ_H -#define FIXFREQ_H +#ifndef MAME_DEVICES_VIDEO_FIXFREQ_H +#define MAME_DEVICES_VIDEO_FIXFREQ_H #include "machine/netlist.h" +#include "screen.h" + #define FIXFREQ_INTERFACE(name) \ const fixedfreq_interface (name) = @@ -156,4 +158,4 @@ private: // device type definition extern const device_type FIXFREQ; -#endif /* FIXFREQ_H */ +#endif // MAME_DEVICES_VIDEO_FIXFREQ_H diff --git a/src/devices/video/gb_lcd.cpp b/src/devices/video/gb_lcd.cpp index 6be32fc7588..8439f33fc94 100644 --- a/src/devices/video/gb_lcd.cpp +++ b/src/devices/video/gb_lcd.cpp @@ -158,6 +158,9 @@ TODO: #include "emu.h" #include "video/gb_lcd.h" +#include "screen.h" + + #define ENABLE_LOGGING 0 #define LOG(x) do { if (ENABLE_LOGGING) logerror x; } while(0) @@ -309,10 +312,10 @@ static const uint8_t ags_oam_fingerprint[0x100] = { #endif -const device_type DMG_PPU = &device_creator; -const device_type MGB_PPU = &device_creator; -const device_type SGB_PPU = &device_creator; -const device_type CGB_PPU = &device_creator; +const device_type DMG_PPU = device_creator; +const device_type MGB_PPU = device_creator; +const device_type SGB_PPU = device_creator; +const device_type CGB_PPU = device_creator; diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp index 398c8542673..71d094ae8cf 100644 --- a/src/devices/video/gba_lcd.cpp +++ b/src/devices/video/gba_lcd.cpp @@ -11,9 +11,11 @@ ***************************************************************************/ #include "emu.h" +#include "gba_lcd.h" + #include "rendlay.h" +#include "screen.h" -#include "gba_lcd.h" /* LCD I/O Registers */ #define DISPCNT HWLO(0x000) /* 0x4000000 2 R/W LCD Control */ @@ -138,7 +140,7 @@ private: uint16_t m_attr2; }; -const device_type GBA_LCD = &device_creator; +const device_type GBA_LCD = device_creator; gba_lcd_device::gba_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, GBA_LCD, "GBA LCD", tag, owner, clock, "gba_lcd", __FILE__) diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp index dd13c73a2cb..6b539cf65a3 100644 --- a/src/devices/video/gf4500.cpp +++ b/src/devices/video/gf4500.cpp @@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c #define GF4500_FRAMEBUF_OFFSET 0x20000 -const device_type GF4500 = &device_creator; +const device_type GF4500 = device_creator; gf4500_device::gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/video/gf7600gs.cpp b/src/devices/video/gf7600gs.cpp index dfb16de1a1e..4b35d3a8f97 100644 --- a/src/devices/video/gf7600gs.cpp +++ b/src/devices/video/gf7600gs.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "gf7600gs.h" -const device_type GEFORCE_7600GS = &device_creator; +const device_type GEFORCE_7600GS = device_creator; DEVICE_ADDRESS_MAP_START(map1, 32, geforce_7600gs_device) ADDRESS_MAP_END diff --git a/src/devices/video/hd44102.cpp b/src/devices/video/hd44102.cpp index 6598cbceb10..00d2cf8d85d 100644 --- a/src/devices/video/hd44102.cpp +++ b/src/devices/video/hd44102.cpp @@ -34,7 +34,7 @@ // device type definition -const device_type HD44102 = &device_creator; +const device_type HD44102 = device_creator; //************************************************************************** diff --git a/src/devices/video/hd44352.cpp b/src/devices/video/hd44352.cpp index 381fab18967..55eef9b31a2 100644 --- a/src/devices/video/hd44352.cpp +++ b/src/devices/video/hd44352.cpp @@ -24,7 +24,7 @@ // devices -const device_type HD44352 = &device_creator; +const device_type HD44352 = device_creator; //************************************************************************** // live device diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp index 65aef6fc39a..41c05f3e5e4 100644 --- a/src/devices/video/hd44780.cpp +++ b/src/devices/video/hd44780.cpp @@ -19,8 +19,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type HD44780 = &device_creator; -const device_type KS0066_F05 = &device_creator; +const device_type HD44780 = device_creator; +const device_type KS0066_F05 = device_creator; //------------------------------------------------- diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp index de9c58b0928..432f886c59b 100644 --- a/src/devices/video/hd61830.cpp +++ b/src/devices/video/hd61830.cpp @@ -9,14 +9,16 @@ #include "emu.h" #include "hd61830.h" +#include "screen.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type HD61830 = &device_creator; -const device_type HD61830B = &device_creator; +const device_type HD61830 = device_creator; +const device_type HD61830B = device_creator; // default address map diff --git a/src/devices/video/hd63484.cpp b/src/devices/video/hd63484.cpp index fd37c54f702..06f7a1dc20c 100644 --- a/src/devices/video/hd63484.cpp +++ b/src/devices/video/hd63484.cpp @@ -12,6 +12,9 @@ #include "emu.h" #include "hd63484.h" +#include "screen.h" + + #define LOG 0 #define FIFO_LOG 0 #define CMD_LOG 0 @@ -328,7 +331,7 @@ enum -------------------------------------------------*/ // devices -const device_type HD63484 = &device_creator; +const device_type HD63484 = device_creator; ROM_START( hd63484 ) diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp index a3309276c0a..a19dc11c750 100644 --- a/src/devices/video/hd66421.cpp +++ b/src/devices/video/hd66421.cpp @@ -65,7 +65,7 @@ //************************************************************************** // devices -const device_type HD66421 = &device_creator; +const device_type HD66421 = device_creator; // default address map diff --git a/src/devices/video/hlcd0515.cpp b/src/devices/video/hlcd0515.cpp index 7394fc60518..04bf4f72e60 100644 --- a/src/devices/video/hlcd0515.cpp +++ b/src/devices/video/hlcd0515.cpp @@ -17,8 +17,8 @@ #include "video/hlcd0515.h" -const device_type HLCD0515 = &device_creator; -const device_type HLCD0569 = &device_creator; +const device_type HLCD0515 = device_creator; +const device_type HLCD0569 = device_creator; //------------------------------------------------- // constructor diff --git a/src/devices/video/huc6202.cpp b/src/devices/video/huc6202.cpp index 989875fd99d..e5a4d2438c1 100644 --- a/src/devices/video/huc6202.cpp +++ b/src/devices/video/huc6202.cpp @@ -11,7 +11,7 @@ #include "huc6202.h" -const device_type HUC6202 = &device_creator; +const device_type HUC6202 = device_creator; huc6202_device::huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp index 8a90b800bd9..1676924dee2 100644 --- a/src/devices/video/huc6260.cpp +++ b/src/devices/video/huc6260.cpp @@ -19,6 +19,9 @@ #include "emu.h" #include "huc6260.h" +#include "screen.h" + + #define LOG 0 #define HUC6260_HSYNC_LENGTH 237 @@ -42,7 +45,7 @@ PALETTE_INIT_MEMBER(huc6260_device, huc6260) } -const device_type HUC6260 = &device_creator; +const device_type HUC6260 = device_creator; huc6260_device::huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/video/huc6261.cpp b/src/devices/video/huc6261.cpp index 43b4eada457..e9ca25d236d 100644 --- a/src/devices/video/huc6261.cpp +++ b/src/devices/video/huc6261.cpp @@ -16,13 +16,16 @@ #include "emu.h" #include "huc6261.h" +#include "screen.h" + + #define LOG 0 #define HUC6261_HSYNC_LENGTH 237 #define HUC6261_HSYNC_START ( HUC6261_WPF - HUC6261_HSYNC_LENGTH ) -const device_type HUC6261 = &device_creator; +const device_type HUC6261 = device_creator; huc6261_device::huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp index a0ee56cf8e4..bf367eaa4eb 100644 --- a/src/devices/video/huc6270.cpp +++ b/src/devices/video/huc6270.cpp @@ -91,7 +91,7 @@ ALLOW_SAVE_TYPE(huc6270_device::huc6270_h_state); #define HUC6270_CR 0x01 /* Set when sprite #0 overlaps with another sprite */ -const device_type HUC6270 = &device_creator; +const device_type HUC6270 = device_creator; const uint8_t huc6270_device::vram_increments[4] = { 1, 32, 64, 128 }; diff --git a/src/devices/video/huc6271.cpp b/src/devices/video/huc6271.cpp index a383c0ac97a..b9379c9d6af 100644 --- a/src/devices/video/huc6271.cpp +++ b/src/devices/video/huc6271.cpp @@ -16,7 +16,7 @@ //************************************************************************** // device type definition -const device_type huc6271 = &device_creator; +const device_type huc6271 = device_creator; //************************************************************************** diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp index 5de6c67e2ec..af38859df0e 100644 --- a/src/devices/video/huc6272.cpp +++ b/src/devices/video/huc6272.cpp @@ -20,7 +20,7 @@ //************************************************************************** // device type definition -const device_type huc6272 = &device_creator; +const device_type huc6272 = device_creator; static ADDRESS_MAP_START( microprg_map, AS_PROGRAM, 16, huc6272_device ) AM_RANGE(0x00, 0x0f) AM_RAM AM_SHARE("microprg_ram") diff --git a/src/devices/video/i8244.cpp b/src/devices/video/i8244.cpp index 81cab914fb6..bf1de11dcbb 100644 --- a/src/devices/video/i8244.cpp +++ b/src/devices/video/i8244.cpp @@ -12,10 +12,13 @@ #include "emu.h" #include "i8244.h" +#include "screen.h" + + // device type definition -const device_type I8244 = &device_creator; -const device_type I8245 = &device_creator; +const device_type I8244 = device_creator; +const device_type I8245 = device_creator; // Kevtris verified that the data below matches a dump diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp index 1e2db782a01..296dc0ef2d4 100644 --- a/src/devices/video/i82730.cpp +++ b/src/devices/video/i82730.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "i82730.h" +#include "screen.h" + //************************************************************************** // CONSTANTS @@ -25,7 +27,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type I82730 = &device_creator; +const device_type I82730 = device_creator; const char *i82730_device::m_command_names[] = { diff --git a/src/devices/video/i8275.cpp b/src/devices/video/i8275.cpp index 0836fe74ea7..b2f7cfc8daf 100644 --- a/src/devices/video/i8275.cpp +++ b/src/devices/video/i8275.cpp @@ -17,6 +17,8 @@ #include "emu.h" #include "i8275.h" +#include "screen.h" + //************************************************************************** @@ -80,7 +82,7 @@ const int i8275_device::character_attribute[3][16] = //************************************************************************** // device type definition -const device_type I8275 = &device_creator; +const device_type I8275 = device_creator; diff --git a/src/devices/video/jangou_blitter.cpp b/src/devices/video/jangou_blitter.cpp index 914c6b0e7ad..d7d446fb813 100644 --- a/src/devices/video/jangou_blitter.cpp +++ b/src/devices/video/jangou_blitter.cpp @@ -23,7 +23,7 @@ //************************************************************************** // device type definition -const device_type JANGOU_BLITTER = &device_creator; +const device_type JANGOU_BLITTER = device_creator; //************************************************************************** diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp index 44f92f0fd51..b8fa3984599 100644 --- a/src/devices/video/m50458.cpp +++ b/src/devices/video/m50458.cpp @@ -19,6 +19,7 @@ #include "emu.h" #include "video/m50458.h" +#include "screen.h" //************************************************************************** @@ -26,7 +27,7 @@ //************************************************************************** // device type definition -const device_type M50458 = &device_creator; +const device_type M50458 = device_creator; static ADDRESS_MAP_START( m50458_vram, AS_0, 16, m50458_device ) AM_RANGE(0x0000, 0x023f) AM_RAM // vram diff --git a/src/devices/video/mb90082.cpp b/src/devices/video/mb90082.cpp index 8c9d2cf80be..d962d701fa4 100644 --- a/src/devices/video/mb90082.cpp +++ b/src/devices/video/mb90082.cpp @@ -21,7 +21,7 @@ //************************************************************************** // device type definition -const device_type MB90082 = &device_creator; +const device_type MB90082 = device_creator; static ADDRESS_MAP_START( mb90082_vram, AS_0, 16, mb90082_device ) AM_RANGE(0x0000, 0x023f) AM_RAM // main screen vram diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp index ae3c7c2b386..39ad396f185 100644 --- a/src/devices/video/mb_vcu.cpp +++ b/src/devices/video/mb_vcu.cpp @@ -30,7 +30,7 @@ TODO: //************************************************************************** // device type definition -const device_type MB_VCU = &device_creator; +const device_type MB_VCU = device_creator; //------------------------------------------------- // static_set_palette_tag: Set the tag of the diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index dcab1963fbe..add19de1f2b 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -41,23 +41,25 @@ #include "emu.h" #include "mc6845.h" +#include "screen.h" + #define LOG (0) -const device_type MC6845 = &device_creator; -const device_type MC6845_1 = &device_creator; -const device_type R6545_1 = &device_creator; -const device_type C6545_1 = &device_creator; -const device_type H46505 = &device_creator; -const device_type HD6845 = &device_creator; -const device_type SY6545_1 = &device_creator; -const device_type SY6845E = &device_creator; -const device_type HD6345 = &device_creator; -const device_type AMS40041 = &device_creator; -const device_type AMS40489 = &device_creator; -const device_type MOS8563 = &device_creator; -const device_type MOS8568 = &device_creator; +const device_type MC6845 = device_creator; +const device_type MC6845_1 = device_creator; +const device_type R6545_1 = device_creator; +const device_type C6545_1 = device_creator; +const device_type H46505 = device_creator; +const device_type HD6845 = device_creator; +const device_type SY6545_1 = device_creator; +const device_type SY6845E = device_creator; +const device_type HD6345 = device_creator; +const device_type AMS40041 = device_creator; +const device_type AMS40489 = device_creator; +const device_type MOS8563 = device_creator; +const device_type MOS8568 = device_creator; /* mode macros */ diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp index 4c07d65033f..e3781147f60 100644 --- a/src/devices/video/mc6847.cpp +++ b/src/devices/video/mc6847.cpp @@ -1760,14 +1760,14 @@ mc6847_base_device::pixel_t mc6847_base_device::artifacter::mix_color(double fac // VARIATIONS //************************************************************************** -const device_type MC6847_NTSC = &device_creator; -const device_type MC6847_PAL = &device_creator; -const device_type MC6847Y_NTSC = &device_creator; -const device_type MC6847Y_PAL = &device_creator; -const device_type MC6847T1_NTSC = &device_creator; -const device_type MC6847T1_PAL = &device_creator; -const device_type S68047 = &device_creator; -const device_type M5C6847P1 = &device_creator; +const device_type MC6847_NTSC = device_creator; +const device_type MC6847_PAL = device_creator; +const device_type MC6847Y_NTSC = device_creator; +const device_type MC6847Y_PAL = device_creator; +const device_type MC6847T1_NTSC = device_creator; +const device_type MC6847T1_PAL = device_creator; +const device_type S68047 = device_creator; +const device_type M5C6847P1 = device_creator; diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h index 1d408c5f560..100d3033877 100644 --- a/src/devices/video/mc6847.h +++ b/src/devices/video/mc6847.h @@ -7,11 +7,12 @@ Implementation of Motorola 6847 video hardware chip ***************************************************************************/ +#ifndef MAME_DEVICES_VIDEO_MC6847_H +#define MAME_DEVICES_VIDEO_MC6847_H #pragma once -#ifndef __MC6847__ -#define __MC6847__ +#include "screen.h" #define MC6847_MODE_AG 0x80 @@ -700,4 +701,4 @@ extern const device_type MC6847T1_PAL; extern const device_type S68047; extern const device_type M5C6847P1; -#endif /* __MC6847__ */ +#endif // MAME_DEVICES_VIDEO_MC6847_H diff --git a/src/devices/video/mga2064w.cpp b/src/devices/video/mga2064w.cpp index 50e1709594e..3dfd13dcec1 100644 --- a/src/devices/video/mga2064w.cpp +++ b/src/devices/video/mga2064w.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "mga2064w.h" -const device_type MGA2064W = &device_creator; +const device_type MGA2064W = device_creator; mga2064w_device::mga2064w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, MGA2064W, "Matrox Millennium", tag, owner, clock, "mga2064w", __FILE__) diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp index abfbaf808e3..10a8a8d87fe 100644 --- a/src/devices/video/mos6566.cpp +++ b/src/devices/video/mos6566.cpp @@ -21,6 +21,8 @@ #include "emu.h" #include "mos6566.h" +#include "screen.h" + //************************************************************************** @@ -213,13 +215,13 @@ static const rgb_t PALETTE_MOS[] = // DEVICE DEFINITIONS //************************************************************************** -const device_type MOS6566 = &device_creator; -const device_type MOS6567 = &device_creator; -const device_type MOS8562 = &device_creator; -const device_type MOS8564 = &device_creator; -const device_type MOS6569 = &device_creator; -const device_type MOS8565 = &device_creator; -const device_type MOS8566 = &device_creator; +const device_type MOS6566 = device_creator; +const device_type MOS6567 = device_creator; +const device_type MOS8562 = device_creator; +const device_type MOS8564 = device_creator; +const device_type MOS6569 = device_creator; +const device_type MOS8565 = device_creator; +const device_type MOS8566 = device_creator; // default address maps diff --git a/src/devices/video/msm6222b.cpp b/src/devices/video/msm6222b.cpp index c8eb8f5b790..6f720fc0f0d 100644 --- a/src/devices/video/msm6222b.cpp +++ b/src/devices/video/msm6222b.cpp @@ -13,8 +13,8 @@ #include "emu.h" #include "msm6222b.h" -const device_type MSM6222B = &device_creator; -const device_type MSM6222B_01 = &device_creator; +const device_type MSM6222B = device_creator; +const device_type MSM6222B_01 = device_creator; ROM_START( msm6222b_01 ) ROM_REGION( 0x1000, "cgrom", 0 ) diff --git a/src/devices/video/msm6255.cpp b/src/devices/video/msm6255.cpp index 10a5eb6e368..516dd8a0f12 100644 --- a/src/devices/video/msm6255.cpp +++ b/src/devices/video/msm6255.cpp @@ -52,7 +52,7 @@ //************************************************************************** // device type definition -const device_type MSM6255 = &device_creator; +const device_type MSM6255 = device_creator; // I/O map DEVICE_ADDRESS_MAP_START( map, 8, msm6255_device ) diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp index 4e31bf99514..29d51ef495b 100644 --- a/src/devices/video/pc_vga.cpp +++ b/src/devices/video/pc_vga.cpp @@ -46,9 +46,13 @@ #include "emu.h" #include "pc_vga.h" + #include "bus/isa/trident.h" #include "machine/eepromser.h" + #include "debugger.h" +#include "screen.h" + /*************************************************************************** @@ -117,25 +121,23 @@ enum ***************************************************************************/ // device type definition -const device_type VGA = &device_creator; -const device_type TSENG_VGA = &device_creator; -const device_type S3_VGA = &device_creator; -const device_type GAMTOR_VGA = &device_creator; -const device_type ATI_VGA = &device_creator; -const device_type IBM8514A = &device_creator; -const device_type MACH8 = &device_creator; +const device_type VGA = device_creator; +const device_type TSENG_VGA = device_creator; +const device_type S3_VGA = device_creator; +const device_type GAMTOR_VGA = device_creator; +const device_type ATI_VGA = device_creator; +const device_type IBM8514A = device_creator; +const device_type MACH8 = device_creator; vga_device::vga_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_palette(*this, "^palette"), - m_screen(*this,"^screen") + : device_t(mconfig, type, name, tag, owner, clock, shortname, source) + , m_palette(*this, "^palette") + , m_screen(*this,"^screen") { } vga_device::vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__), - m_palette(*this, "^palette"), - m_screen(*this,"^screen") + : vga_device(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__) { } @@ -150,7 +152,7 @@ tseng_vga_device::tseng_vga_device(const machine_config &mconfig, const char *ta } s3_vga_device::s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : ati_vga_device(mconfig, S3_VGA, "S3 Graphics VGA", tag, owner, clock, "s3_vga", __FILE__) + : s3_vga_device(mconfig, S3_VGA, "S3 Graphics VGA", tag, owner, clock, "s3_vga", __FILE__) { } @@ -165,7 +167,7 @@ gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, const char * } ati_vga_device::ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : svga_device(mconfig, ATI_VGA, "ATI VGA", tag, owner, clock, "ati_vga", __FILE__) + : ati_vga_device(mconfig, ATI_VGA, "ATI VGA", tag, owner, clock, "ati_vga", __FILE__) { } @@ -175,7 +177,7 @@ ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, } ibm8514a_device::ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, IBM8514A, "IBM8514A Video", tag, owner, clock, "ibm8514a", __FILE__) + : ibm8514a_device(mconfig, IBM8514A, "IBM8514A Video", tag, owner, clock, "ibm8514a", __FILE__) { } @@ -190,7 +192,7 @@ mach8_device::mach8_device(const machine_config &mconfig, device_type type, cons } mach8_device::mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : ibm8514a_device(mconfig, MACH8, "MACH8", tag, owner, clock, "mach8", __FILE__) + : mach8_device(mconfig, MACH8, "MACH8", tag, owner, clock, "mach8", __FILE__) { } diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index f4444774ab5..c5d4cef9156 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef PC_VGA_H -#define PC_VGA_H +#ifndef MAME_DEVICES_VIDEO_PC_VGA_H +#define MAME_DEVICES_VIDEO_PC_VGA_H MACHINE_CONFIG_EXTERN( pcvideo_vga ); MACHINE_CONFIG_EXTERN( pcvideo_trident_vga ); @@ -33,14 +33,13 @@ enum // ======================> vga_device -class vga_device : public device_t +class vga_device : public device_t { friend class ibm8514a_device; public: // construction/destruction vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - vga_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 void zero(); virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -56,7 +55,10 @@ public: virtual READ8_MEMBER(mem_linear_r); virtual WRITE8_MEMBER(mem_linear_w); virtual TIMER_CALLBACK_MEMBER(vblank_timer_cb); + protected: + vga_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; virtual void device_reset() override; @@ -242,12 +244,13 @@ extern const device_type VGA; class svga_device : public vga_device { public: - // construction/destruction - svga_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 void zero() override; virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; + protected: + // construction/destruction + svga_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); + void svga_vh_rgb8(bitmap_rgb32 &bitmap, const rectangle &cliprect); void svga_vh_rgb15(bitmap_rgb32 &bitmap, const rectangle &cliprect); void svga_vh_rgb16(bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -264,15 +267,14 @@ protected: uint8_t rgb24_en; uint8_t rgb32_en; uint8_t id; - }svga; + } svga; }; // ======================> ibm8514_device -class ibm8514a_device : public device_t +class ibm8514a_device : public device_t { public: - ibm8514a_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); ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void set_vga(const char* tag) { m_vga_tag.assign(tag); } @@ -378,6 +380,8 @@ public: } ibm8514; protected: + ibm8514a_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 void device_start() override; virtual void device_config_complete() override; vga_device* m_vga; // for pass-through @@ -411,7 +415,6 @@ extern const device_type IBM8514A; class mach8_device : public ibm8514a_device { public: - mach8_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); mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); READ16_MEMBER(mach8_ec0_r); @@ -441,6 +444,7 @@ public: READ16_MEMBER(mach8_clksel_r) { return mach8.clksel; } protected: + mach8_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 void device_start() override; struct { @@ -516,7 +520,6 @@ class ati_vga_device : public svga_device public: // construction/destruction ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - ati_vga_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 READ8_MEMBER(mem_r) override; virtual WRITE8_MEMBER(mem_w) override; @@ -531,6 +534,7 @@ public: mach8_device* get_8514() { return m_8514; } protected: + ati_vga_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 void device_start() override; private: void ati_define_video_mode(); @@ -549,12 +553,11 @@ extern const device_type ATI_VGA; // ======================> s3_vga_device -class s3_vga_device : public ati_vga_device +class s3_vga_device : public ati_vga_device { public: // construction/destruction s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - s3_vga_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 READ8_MEMBER(port_03b0_r) override; virtual WRITE8_MEMBER(port_03b0_w) override; @@ -571,7 +574,10 @@ public: virtual TIMER_CALLBACK_MEMBER(vblank_timer_cb) override; ibm8514a_device* get_8514() { return m_8514; } + protected: + s3_vga_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; virtual void device_reset() override; @@ -699,4 +705,4 @@ extern const device_type GAMTOR_VGA; */ -#endif /* PC_VGA_H */ +#endif /* MAME_DEVICES_VIDEO_PC_VGA_H */ diff --git a/src/devices/video/pcd8544.cpp b/src/devices/video/pcd8544.cpp index 73430cfbdd5..89ce964d6c0 100644 --- a/src/devices/video/pcd8544.cpp +++ b/src/devices/video/pcd8544.cpp @@ -9,13 +9,16 @@ #include "emu.h" #include "video/pcd8544.h" +#include "screen.h" + + #define LOG 0 //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type PCD8544 = &device_creator; +const device_type PCD8544 = device_creator; //************************************************************************** diff --git a/src/devices/video/poly.h b/src/devices/video/poly.h index 72706e037e3..a8b606bc08e 100644 --- a/src/devices/video/poly.h +++ b/src/devices/video/poly.h @@ -32,14 +32,17 @@ ***************************************************************************/ +#ifndef MAME_DEVICES_VIDEO_POLY_H +#define MAME_DEVICES_VIDEO_POLY_H + #pragma once -#ifndef __POLY_H__ -#define __POLY_H__ +#include "screen.h" #include #include + //************************************************************************** // DEBUGGING //************************************************************************** @@ -1318,4 +1321,4 @@ int frustum_clip_all(frustum_clip_vertex<_BaseType, _MaxParams>* clip_vert, int } -#endif // __POLY_H__ +#endif // MAME_DEVICES_VIDEO_POLY_H diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp index c86bed6c6fb..670e504b351 100644 --- a/src/devices/video/ppu2c0x.cpp +++ b/src/devices/video/ppu2c0x.cpp @@ -28,6 +28,8 @@ #include "emu.h" #include "video/ppu2c0x.h" +#include "screen.h" + /*************************************************************************** CONSTANTS @@ -73,14 +75,14 @@ static const pen_t default_colortable[] = //************************************************************************** // devices -const device_type PPU_2C02 = &device_creator; -const device_type PPU_2C03B = &device_creator; -const device_type PPU_2C04 = &device_creator; -const device_type PPU_2C07 = &device_creator; -const device_type PPU_2C05_01 = &device_creator; -const device_type PPU_2C05_02 = &device_creator; -const device_type PPU_2C05_03 = &device_creator; -const device_type PPU_2C05_04 = &device_creator; +const device_type PPU_2C02 = device_creator; +const device_type PPU_2C03B = device_creator; +const device_type PPU_2C04 = device_creator; +const device_type PPU_2C07 = device_creator; +const device_type PPU_2C05_01 = device_creator; +const device_type PPU_2C05_02 = device_creator; +const device_type PPU_2C05_03 = device_creator; +const device_type PPU_2C05_04 = device_creator; // default address map diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp index 27490f6738b..6b2963babdf 100644 --- a/src/devices/video/psx.cpp +++ b/src/devices/video/psx.cpp @@ -7,20 +7,23 @@ * */ -#define DEBUG_VIEWER ( 0 ) - #include "emu.h" + +#define DEBUG_VIEWER ( 0 ) #include "video/psx.h" +#include "screen.h" + + #define VERBOSE_LEVEL ( 0 ) // device type definition -const device_type CXD8514Q = &device_creator; -const device_type CXD8538Q = &device_creator; -const device_type CXD8561Q = &device_creator; -const device_type CXD8561BQ = &device_creator; -const device_type CXD8561CQ = &device_creator; -const device_type CXD8654Q = &device_creator; +const device_type CXD8514Q = device_creator; +const device_type CXD8538Q = device_creator; +const device_type CXD8561Q = device_creator; +const device_type CXD8561BQ = device_creator; +const device_type CXD8561CQ = device_creator; +const device_type CXD8654Q = device_creator; psxgpu_device::psxgpu_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), diff --git a/src/devices/video/ramdac.cpp b/src/devices/video/ramdac.cpp index 9b5220bd1eb..195365fff91 100644 --- a/src/devices/video/ramdac.cpp +++ b/src/devices/video/ramdac.cpp @@ -29,7 +29,7 @@ ADDRESS_MAP_END //************************************************************************** // device type definition -const device_type RAMDAC = &device_creator; +const device_type RAMDAC = device_creator; //************************************************************************** diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp index e4eb44768a3..78486be43a6 100644 --- a/src/devices/video/saa5050.cpp +++ b/src/devices/video/saa5050.cpp @@ -26,14 +26,14 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type SAA5050 = &device_creator; -const device_type SAA5051 = &device_creator; -const device_type SAA5052 = &device_creator; -const device_type SAA5053 = &device_creator; -const device_type SAA5054 = &device_creator; -const device_type SAA5055 = &device_creator; -const device_type SAA5056 = &device_creator; -const device_type SAA5057 = &device_creator; +const device_type SAA5050 = device_creator; +const device_type SAA5051 = device_creator; +const device_type SAA5052 = device_creator; +const device_type SAA5053 = device_creator; +const device_type SAA5054 = device_creator; +const device_type SAA5055 = device_creator; +const device_type SAA5056 = device_creator; +const device_type SAA5057 = device_creator; //------------------------------------------------- diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp index 970a3a4e7f4..517580c2231 100644 --- a/src/devices/video/scn2674.cpp +++ b/src/devices/video/scn2674.cpp @@ -7,10 +7,13 @@ #include "emu.h" #include "scn2674.h" +#include "screen.h" + + #define S674VERBOSE 0 #define LOG2674(x) do { if (S674VERBOSE) logerror x; } while (0) -const device_type SCN2674_VIDEO = &device_creator; +const device_type SCN2674_VIDEO = device_creator; // default address map diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp index 583b2c955c9..7e1af926245 100644 --- a/src/devices/video/sed1200.cpp +++ b/src/devices/video/sed1200.cpp @@ -16,10 +16,10 @@ #include "emu.h" #include "sed1200.h" -const device_type SED1200D0A = &device_creator; -const device_type SED1200F0A = &device_creator; -const device_type SED1200D0B = &device_creator; -const device_type SED1200F0B = &device_creator; +const device_type SED1200D0A = device_creator; +const device_type SED1200F0A = device_creator; +const device_type SED1200D0B = device_creator; +const device_type SED1200F0B = device_creator; ROM_START( sed1200x0a ) ROM_REGION( 0x800, "cgrom", 0 ) diff --git a/src/devices/video/sed1330.cpp b/src/devices/video/sed1330.cpp index acce37b1806..d7cb154cb91 100644 --- a/src/devices/video/sed1330.cpp +++ b/src/devices/video/sed1330.cpp @@ -61,7 +61,7 @@ //************************************************************************** // device type definition -const device_type SED1330 = &device_creator; +const device_type SED1330 = device_creator; // default address map diff --git a/src/devices/video/sed1520.cpp b/src/devices/video/sed1520.cpp index 7d65e9a76af..83f884d5756 100644 --- a/src/devices/video/sed1520.cpp +++ b/src/devices/video/sed1520.cpp @@ -12,12 +12,14 @@ #include "emu.h" #include "video/sed1520.h" +#include "screen.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** -const device_type SED1520 = &device_creator; +const device_type SED1520 = device_creator; //************************************************************************** diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp index 9cfe6001452..8fcfb4af3e6 100644 --- a/src/devices/video/snes_ppu.cpp +++ b/src/devices/video/snes_ppu.cpp @@ -189,7 +189,7 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type SNES_PPU = &device_creator; +const device_type SNES_PPU = device_creator; //************************************************************************** diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h index d8ca3fee814..ab1a30245df 100644 --- a/src/devices/video/snes_ppu.h +++ b/src/devices/video/snes_ppu.h @@ -6,10 +6,12 @@ ***************************************************************************/ +#ifndef MAME_DEVICES_VIDEO_SNES_PPU_H +#define MAME_DEVICES_VIDEO_SNES_PPU_H + #pragma once -#ifndef __SNES_PPU_H__ -#define __SNES_PPU_H__ +#include "screen.h" #define MCLK_NTSC (21477272) /* verified */ @@ -297,4 +299,4 @@ extern const device_type SNES_PPU; #define MCFG_SNES_PPU_OPENBUS_CB(_read) \ devcb = &snes_ppu_device::static_set_open_bus_callback(*device, DEVCB_##_read); -#endif +#endif // MAME_DEVICES_VIDEO_SNES_PPU_H diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp index bbf5d601921..6aa670dd7b7 100644 --- a/src/devices/video/stvvdp1.cpp +++ b/src/devices/video/stvvdp1.cpp @@ -16,7 +16,8 @@ Framebuffer todo: #include "emu.h" -#include "includes/saturn.h" +#include "includes/saturn.h" // FIXME: this is a dependency from devices on MAME + #define VDP1_LOG 0 diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index 8622f24b3c2..0f6e36ec07c 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -2,10 +2,6 @@ // copyright-holders:David Haywood, Angelo Salese, Olivier Galibert, Mariusz Wojcieszek, R. Belmont /* Sega Saturn VDP2 */ -#define DEBUG_MODE 0 -#define TEST_FUNCTIONS 0 -#define POPMESSAGE_DEBUG 0 - /* the dirty marking stuff and tile decoding will probably be removed in the end anyway as we'll need custom @@ -105,7 +101,15 @@ In other words,the first three types uses the offset and not the color allocated */ #include "emu.h" -#include "includes/saturn.h" +#include "includes/saturn.h" // FIXME: this is a dependency from devices on MAME + +#include "screen.h" + + +#define DEBUG_MODE 0 +#define TEST_FUNCTIONS 0 +#define POPMESSAGE_DEBUG 0 + enum { diff --git a/src/devices/video/t6a04.cpp b/src/devices/video/t6a04.cpp index 72df41a52d9..60780b84f0b 100644 --- a/src/devices/video/t6a04.cpp +++ b/src/devices/video/t6a04.cpp @@ -15,7 +15,7 @@ #include "video/t6a04.h" // devices -const device_type T6A04 = &device_creator; +const device_type T6A04 = device_creator; //------------------------------------------------- // device_validity_check - perform validity checks diff --git a/src/devices/video/tea1002.cpp b/src/devices/video/tea1002.cpp index f41520ddd17..5343de12830 100644 --- a/src/devices/video/tea1002.cpp +++ b/src/devices/video/tea1002.cpp @@ -39,7 +39,7 @@ const int tea1002_device::m_amplitute[] = // DEVICE DEFINITIONS //************************************************************************** -const device_type TEA1002 = &device_creator; +const device_type TEA1002 = device_creator; //************************************************************************** diff --git a/src/devices/video/tlc34076.cpp b/src/devices/video/tlc34076.cpp index 476b2f38829..ba4283fc683 100644 --- a/src/devices/video/tlc34076.cpp +++ b/src/devices/video/tlc34076.cpp @@ -35,7 +35,7 @@ //************************************************************************** // device type definition -const device_type TLC34076 = &device_creator; +const device_type TLC34076 = device_creator; //------------------------------------------------- diff --git a/src/devices/video/tms34061.cpp b/src/devices/video/tms34061.cpp index 768c7a01cda..3a74d450c52 100644 --- a/src/devices/video/tms34061.cpp +++ b/src/devices/video/tms34061.cpp @@ -15,6 +15,8 @@ #include "emu.h" #include "tms34061.h" +#include "screen.h" + #define VERBOSE (0) @@ -27,7 +29,7 @@ // tms34061_device - constructor //------------------------------------------------- -const device_type TMS34061 = &device_creator; +const device_type TMS34061 = device_creator; tms34061_device::tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TMS34061, "TMS34061 VSC", tag, owner, clock, "tms34061", __FILE__), diff --git a/src/devices/video/tms3556.cpp b/src/devices/video/tms3556.cpp index 0543cdfb332..ff902edd80c 100644 --- a/src/devices/video/tms3556.cpp +++ b/src/devices/video/tms3556.cpp @@ -16,6 +16,10 @@ #include "emu.h" #include "tms3556.h" +#include "screen.h" + + + //************************************************************************** // MACROS / CONSTANTS //************************************************************************** @@ -29,7 +33,7 @@ //************************************************************************** // devices -const device_type TMS3556 = &device_creator; +const device_type TMS3556 = device_creator; // default address map diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp index b095a5f8a04..c224b0965f4 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "video/tms9927.h" +#include "screen.h" + static const uint8_t chars_per_row_value[8] = { 20, 32, 40, 64, 72, 80, 96, 132 }; static const uint8_t skew_bits_value[4] = { 0, 1, 2, 2 }; @@ -29,10 +31,10 @@ static const uint8_t skew_bits_value[4] = { 0, 1, 2, 2 }; #define CURSOR_ROW_ADDRESS (m_reg[8] & 0x3f) -const device_type TMS9927 = &device_creator; -const device_type CRT5027 = &device_creator; -const device_type CRT5037 = &device_creator; -const device_type CRT5057 = &device_creator; +const device_type TMS9927 = device_creator; +const device_type CRT5027 = device_creator; +const device_type CRT5037 = device_creator; +const device_type CRT5057 = device_creator; tms9927_device::tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tms9927_device(mconfig, TMS9927, "TMS9927 VTC", tag, owner, clock, "tms9927", __FILE__) diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp index cb39a6659c5..5eacf00e2fb 100644 --- a/src/devices/video/tms9928a.cpp +++ b/src/devices/video/tms9928a.cpp @@ -27,14 +27,14 @@ #include "tms9928a.h" -const device_type TMS9928A = &device_creator; -const device_type TMS9918 = &device_creator; -const device_type TMS9918A = &device_creator; -const device_type TMS9118 = &device_creator; -const device_type TMS9128 = &device_creator; -const device_type TMS9929 = &device_creator; -const device_type TMS9929A = &device_creator; -const device_type TMS9129 = &device_creator; +const device_type TMS9928A = device_creator; +const device_type TMS9918 = device_creator; +const device_type TMS9918A = device_creator; +const device_type TMS9118 = device_creator; +const device_type TMS9128 = device_creator; +const device_type TMS9929 = device_creator; +const device_type TMS9929A = device_creator; +const device_type TMS9129 = device_creator; // ======= Debugging ========= diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 36dc2655928..03389ac14ad 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -23,9 +23,12 @@ */ -#ifndef __TMS9928A_H__ -#define __TMS9928A_H__ +#ifndef MAME_DEVICES_VIDEO_TMS9928A_H +#define MAME_DEVICES_VIDEO_TMS9928A_H +#pragma once + +#include "screen.h" #define TMS9928A_PALETTE_SIZE 16 @@ -213,4 +216,4 @@ public: }; -#endif +#endif // MAME_DEVICES_VIDEO_TMS9928A_H diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp index e84ad8436e6..8b6dce81ffa 100644 --- a/src/devices/video/upd3301.cpp +++ b/src/devices/video/upd3301.cpp @@ -22,6 +22,8 @@ #include "emu.h" #include "upd3301.h" +#include "screen.h" + //************************************************************************** @@ -63,7 +65,7 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type UPD3301 = &device_creator; +const device_type UPD3301 = device_creator; diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index 32aa6ba4b18..46e97fab0ba 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -37,6 +37,8 @@ #include "emu.h" #include "upd7220.h" +#include "screen.h" + //************************************************************************** @@ -143,7 +145,7 @@ static const int y_dir[8] = { 1, 1, 0,-1,-1,-1, 0, 1}; //************************************************************************** // devices -const device_type UPD7220 = &device_creator; +const device_type UPD7220 = device_creator; // default address map diff --git a/src/devices/video/upd7227.cpp b/src/devices/video/upd7227.cpp index 8cc0d97867e..61a415f608a 100644 --- a/src/devices/video/upd7227.cpp +++ b/src/devices/video/upd7227.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type UPD7227 = &device_creator; +const device_type UPD7227 = device_creator; static ADDRESS_MAP_START( upd7227_map, AS_PROGRAM, 8, upd7227_device ) diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp index 141448d463a..03476fd36af 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -84,8 +84,8 @@ ADDRESS_MAP_END // devices -const device_type V9938 = &device_creator; -const device_type V9958 = &device_creator; +const device_type V9938 = device_creator; +const device_type V9958 = device_creator; v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index 58846d58512..a927de33bd3 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -6,11 +6,12 @@ ***************************************************************************/ -#pragma once +#ifndef MAME_DEVICES_VIDEO_V9938_H +#define MAME_DEVICES_VIDEO_V9938_H -#ifndef __V9938_H__ -#define __V9938_H__ +#pragma once +#include "screen.h" //************************************************************************** @@ -296,4 +297,4 @@ protected: }; -#endif +#endif // MAME_DEVICES_VIDEO_V9938_H diff --git a/src/devices/video/vector.cpp b/src/devices/video/vector.cpp index feb9a7e9a5c..70fa93f44bb 100644 --- a/src/devices/video/vector.cpp +++ b/src/devices/video/vector.cpp @@ -65,7 +65,7 @@ void vector_options::init(emu_options& options) } // device type definition -const device_type VECTOR = &device_creator; +const device_type VECTOR = device_creator; vector_device::vector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VECTOR, "VECTOR", tag, owner, clock, "vector_device", __FILE__), diff --git a/src/devices/video/vic4567.cpp b/src/devices/video/vic4567.cpp index 9e30e8b9d30..cbf7d7ac10a 100644 --- a/src/devices/video/vic4567.cpp +++ b/src/devices/video/vic4567.cpp @@ -18,6 +18,9 @@ #include "emu.h" #include "video/vic4567.h" +#include "screen.h" + + /***************************************************************************** CONSTANTS *****************************************************************************/ @@ -142,7 +145,7 @@ #define VIC3_BITPLANE_IADDR(x) (x & 1 ? VIC3_BITPLANE_IADDR_HELPER(x) + 0x10000 : VIC3_BITPLANE_IADDR_HELPER(x)) -const device_type VIC3 = &device_creator; +const device_type VIC3 = device_creator; vic3_device::vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VIC3, "4567 VIC III", tag, owner, clock, "vic3", __FILE__), diff --git a/src/devices/video/vooddefs.h b/src/devices/video/vooddefs.h index 095f29f972c..810fdc557e1 100644 --- a/src/devices/video/vooddefs.h +++ b/src/devices/video/vooddefs.h @@ -8,6 +8,12 @@ ***************************************************************************/ +#ifndef MAME_DEVICES_VIDEO_VOODDEFS_H +#define MAME_DEVICES_VIDEO_VOODDEFS_H + +#pragma once + +#include "video/rgbutil.h" @@ -3194,3 +3200,5 @@ static inline rgbaint_t ATTR_FORCE_INLINE combineTexture(tmu_state *TT, const ui result.xor_imm_rgba(0xff, 0, 0, 0); return result; } + +#endif // MAME_DEVICES_VIDEO_VOODDEFS_H diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 2fa7c629bb5..35014038b71 100644 --- a/src/devices/video/voodoo.cpp +++ b/src/devices/video/voodoo.cpp @@ -143,11 +143,11 @@ bits(7:4) and bit(24)), X, and Y: #include "emu.h" - -#include "video/rgbutil.h" #include "voodoo.h" #include "vooddefs.h" +#include "screen.h" + /************************************* * @@ -5781,7 +5781,7 @@ void voodoo_device::device_stop() } -const device_type VOODOO_1 = &device_creator; +const device_type VOODOO_1 = device_creator; voodoo_1_device::voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : voodoo_device(mconfig, VOODOO_1, "3dfx Voodoo Graphics", tag, owner, clock, "voodoo_1", __FILE__) @@ -5798,7 +5798,7 @@ void voodoo_1_device::device_start() } -const device_type VOODOO_2 = &device_creator; +const device_type VOODOO_2 = device_creator; voodoo_2_device::voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : voodoo_device(mconfig, VOODOO_2, "3dfx Voodoo 2", tag, owner, clock, "voodoo_2", __FILE__) @@ -5815,7 +5815,7 @@ void voodoo_2_device::device_start() } -const device_type VOODOO_BANSHEE = &device_creator; +const device_type VOODOO_BANSHEE = device_creator; voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : voodoo_device(mconfig, VOODOO_BANSHEE, "3dfx Voodoo Banshee", tag, owner, clock, "voodoo_banshee", __FILE__) @@ -5837,7 +5837,7 @@ void voodoo_banshee_device::device_start() } -const device_type VOODOO_3 = &device_creator; +const device_type VOODOO_3 = device_creator; voodoo_3_device::voodoo_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : voodoo_banshee_device(mconfig, VOODOO_3, "3dfx Voodoo 3", tag, owner, clock, "voodoo_3", __FILE__) diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp index 9221b051b16..4c6214ce5d0 100644 --- a/src/devices/video/voodoo_pci.cpp +++ b/src/devices/video/voodoo_pci.cpp @@ -3,6 +3,9 @@ #include "emu.h" #include "voodoo_pci.h" +#include "screen.h" + + int voodoo_pci_device::m_type = 0; static MACHINE_CONFIG_FRAGMENT( voodoo_1_pci ) @@ -50,7 +53,7 @@ machine_config_constructor voodoo_pci_device::device_mconfig_additions() const } } -const device_type VOODOO_PCI = &device_creator; +const device_type VOODOO_PCI = device_creator; DEVICE_ADDRESS_MAP_START(config_map, 32, voodoo_pci_device) AM_RANGE(0x40, 0x4f) AM_READWRITE (pcictrl_r, pcictrl_w) diff --git a/src/devices/video/zeus2.cpp b/src/devices/video/zeus2.cpp index f40789b86ff..8df43743fa1 100644 --- a/src/devices/video/zeus2.cpp +++ b/src/devices/video/zeus2.cpp @@ -21,7 +21,7 @@ zeus2_renderer::zeus2_renderer(zeus2_device *state) { } -const device_type ZEUS2 = &device_creator; +const device_type ZEUS2 = device_creator; zeus2_device::zeus2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ZEUS2, "Midway Zeus2", tag, owner, clock, "zeus2", __FILE__), diff --git a/src/emu/crsshair.h b/src/emu/crsshair.h index c733f0afccf..bd938dada8a 100644 --- a/src/emu/crsshair.h +++ b/src/emu/crsshair.h @@ -12,6 +12,9 @@ #pragma once +class render_container; +class render_texture; + /*************************************************************************** CONSTANTS diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 5a36ecadfee..f14bedcf7ff 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -9,18 +9,24 @@ ***************************************************************************/ #include "emu.h" -#include "emuopts.h" -#include "osdepend.h" #include "debugcpu.h" -#include "debugcon.h" + #include "express.h" +#include "debugcon.h" #include "debugvw.h" + #include "debugger.h" +#include "emuopts.h" +#include "screen.h" #include "uiinput.h" -#include "xmlfile.h" + #include "coreutil.h" +#include "osdepend.h" +#include "xmlfile.h" + #include + enum { EXECUTION_STATE_STOPPED, diff --git a/src/emu/debug/dvstate.cpp b/src/emu/debug/dvstate.cpp index a7a2215bd9e..55dba88d7e3 100644 --- a/src/emu/debug/dvstate.cpp +++ b/src/emu/debug/dvstate.cpp @@ -9,9 +9,13 @@ ***************************************************************************/ #include "emu.h" -#include "debugvw.h" #include "dvstate.h" +#include "debugvw.h" + +#include "screen.h" + + const int debug_view_state::REG_DIVIDER; const int debug_view_state::REG_CYCLES; const int debug_view_state::REG_BEAMX; diff --git a/src/emu/device.cpp b/src/emu/device.cpp index a78e7173342..e26205b147f 100644 --- a/src/emu/device.cpp +++ b/src/emu/device.cpp @@ -9,9 +9,11 @@ ***************************************************************************/ #include "emu.h" -#include "string.h" +#include "speaker.h" #include "debug/debugcpu.h" +#include + //************************************************************************** // LIVE DEVICE MANAGEMENT diff --git a/src/emu/device.h b/src/emu/device.h index 37cf6631e4a..dc88f6dd6c6 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -81,16 +81,19 @@ class device_missing_dependencies : public emu_exception { }; // a device_type is simply a pointer to its alloc function -typedef device_t *(*device_type)(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); +typedef std::unique_ptr (*device_type)(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); // this template function creates a stub which constructs a device -template -device_t *device_creator(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +template +std::unique_ptr device_creator_impl(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) { - return global_alloc_clear<_DeviceClass>(mconfig, tag, owner, clock); + return make_unique_clear(mconfig, tag, owner, clock); } +template +constexpr device_type device_creator = &device_creator_impl; + // timer IDs for devices typedef u32 device_timer_id; @@ -194,7 +197,15 @@ class device_t : public delegate_late_bind protected: // construction/destruction - device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source); + device_t( + const machine_config &mconfig, + device_type type, + const char *name, + const char *tag, + device_t *owner, + u32 clock, + const char *shortname, + const char *source); public: virtual ~device_t(); @@ -332,7 +343,7 @@ protected: //------------------- end derived class overrides // core device properties - const device_type m_type; // device type + device_type m_type; // device type std::string m_name; // name of the device std::string m_shortname; // short name of the device std::string m_searchpath; // search path, used for media loading @@ -436,12 +447,13 @@ class device_iterator public: class auto_iterator { -public: + public: // construction auto_iterator(device_t *devptr, int curdepth, int maxdepth) - : m_curdevice(devptr), - m_curdepth(curdepth), - m_maxdepth(maxdepth) { } + : m_curdevice(devptr) + , m_curdepth(curdepth) + , m_maxdepth(maxdepth) + { } // getters device_t *current() const { return m_curdevice; } @@ -452,7 +464,7 @@ public: device_t &operator*() const { assert(m_curdevice != nullptr); return *m_curdevice; } const auto_iterator &operator++() { advance(); return *this; } -protected: + protected: // search depth-first for the next device void advance() { @@ -551,7 +563,7 @@ private: // ======================> device_type_iterator // helper class to find devices of a given type in the device hierarchy -template +template class device_type_iterator { public: @@ -563,7 +575,7 @@ public: : device_iterator::auto_iterator(devptr, curdepth, maxdepth) { // make sure the first device is of the specified type - while (m_curdevice != nullptr && m_curdevice->type() != _DeviceType) + while (m_curdevice && (m_curdevice->type() != _DeviceType)) advance(); } diff --git a/src/emu/diexec.cpp b/src/emu/diexec.cpp index ea20860c426..e43613b0302 100644 --- a/src/emu/diexec.cpp +++ b/src/emu/diexec.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "debugger.h" +#include "screen.h" //************************************************************************** diff --git a/src/emu/diimage.h b/src/emu/diimage.h index f5863f11705..c41d3ad913a 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -272,7 +272,7 @@ protected: void run_hash(void (*partialhash)(util::hash_collection &, const unsigned char *, unsigned long, const char *), util::hash_collection &hashes, const char *types); void image_checkhash(); - void update_names(const device_type device_type = nullptr, const char *inst = nullptr, const char *brief = nullptr); + void update_names(device_type device_type = nullptr, const char *inst = nullptr, const char *brief = nullptr); const software_part *find_software_item(const std::string &identifier, bool restrict_to_interface, software_list_device **device = nullptr) const; bool load_software_part(const std::string &identifier); diff --git a/src/emu/disound.cpp b/src/emu/disound.cpp index 2cf4748530f..1ddcbfb179c 100644 --- a/src/emu/disound.cpp +++ b/src/emu/disound.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "speaker.h" diff --git a/src/emu/divideo.cpp b/src/emu/divideo.cpp index c79d69b9132..c2ac42fd1b2 100644 --- a/src/emu/divideo.cpp +++ b/src/emu/divideo.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "screen.h" const char device_video_interface::s_unconfigured_screen_tag[] = "!!UNCONFIGURED!!"; diff --git a/src/emu/drawgfx.cpp b/src/emu/drawgfx.cpp index b22576c59da..0107d6418ba 100644 --- a/src/emu/drawgfx.cpp +++ b/src/emu/drawgfx.cpp @@ -66,7 +66,7 @@ static inline s32 normalize_yscroll(const bitmap_t &bitmap, s32 yscroll) // DEVICE DEFINITIONS //************************************************************************** -const device_type GFXDECODE = &device_creator; +const device_type GFXDECODE = device_creator; gfxdecode_device::gfxdecode_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, GFXDECODE, "gfxdecode", tag, owner, clock, "gfxdecode", __FILE__), diff --git a/src/emu/driver.h b/src/emu/driver.h index f130b74d6bd..f3366ba25e5 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -226,13 +226,16 @@ private: // this template function creates a stub which constructs a device -template -device_t *driver_device_creator(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +template +std::unique_ptr driver_device_creator_impl(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) { assert(owner == nullptr); assert(clock == 0); - return global_alloc_clear<_DriverClass>(mconfig, &driver_device_creator<_DriverClass>, tag); + return make_unique_clear(mconfig, &driver_device_creator_impl, tag); } +template +const device_type driver_device_creator = &driver_device_creator_impl; + #endif /* MAME_EMU_DRIVER_H */ diff --git a/src/emu/drivers/empty.cpp b/src/emu/drivers/empty.cpp index 074171074ce..59a93d72ab3 100644 --- a/src/emu/drivers/empty.cpp +++ b/src/emu/drivers/empty.cpp @@ -20,10 +20,7 @@ class empty_state : public driver_device { public: // constructor - empty_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) - { - } + using driver_device::driver_device; virtual void machine_start() override { diff --git a/src/emu/emu.h b/src/emu/emu.h index 65a45a4824d..58e6d4786f3 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -101,12 +101,10 @@ typedef device_t * (*machine_config_constructor)(machine_config &config, device_ #include "drawgfx.h" #include "emupal.h" #include "tilemap.h" -#include "screen.h" #include "video.h" // sound-related #include "sound.h" -#include "speaker.h" // generic helpers #include "devcb.h" diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp index d155d4d61ee..501349622ce 100644 --- a/src/emu/emupal.cpp +++ b/src/emu/emupal.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "screen.h" #define VERBOSE 0 @@ -17,7 +18,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PALETTE = &device_creator; +const device_type PALETTE = device_creator; palette_device::palette_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, PALETTE, "palette", tag, owner, clock, "palette", __FILE__), diff --git a/src/emu/emupal.h b/src/emu/emupal.h index a8af7713b48..0664745318b 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -523,7 +523,7 @@ private: }; // device type iterator -typedef device_type_iterator<&device_creator, palette_device> palette_device_iterator; +typedef device_type_iterator palette_device_iterator; #endif // MAME_EMU_EMUPAL_H diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 7caf66501b9..cb037b60d2d 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -1278,7 +1278,7 @@ static ADDRESS_MAP_START(dummy, AS_0, 8, dummy_space_device) AM_RANGE(0x00000000, 0xffffffff) AM_READWRITE(read, write) ADDRESS_MAP_END -const device_type DUMMY_SPACE = &device_creator; +const device_type DUMMY_SPACE = device_creator; dummy_space_device::dummy_space_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, DUMMY_SPACE, "Dummy Space", tag, owner, clock, "dummy_space", __FILE__), diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp index 0eb4532e543..15302ba0705 100644 --- a/src/emu/mconfig.cpp +++ b/src/emu/mconfig.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "emuopts.h" +#include "screen.h" + #include @@ -131,16 +133,18 @@ device_t *machine_config::device_add(device_t *owner, const char *tag, device_ty if (owner != nullptr) { // allocate the new device - device_t *device = (*type)(*this, tag, owner, clock); + std::unique_ptr device = type(*this, tag, owner, clock); // append it to the owner's list - return &config_new_device(owner->subdevices().m_list.append(*device)); + return &config_new_device(owner->subdevices().m_list.append(*device.release())); + } + else + { + // allocate the root device directly + assert(!m_root_device); + m_root_device = type(*this, tag, nullptr, clock); + return &config_new_device(*m_root_device); } - - // allocate the root device directly - assert(m_root_device == nullptr); - m_root_device.reset((*type)(*this, tag, nullptr, clock)); - return &config_new_device(*m_root_device); } @@ -159,19 +163,21 @@ device_t *machine_config::device_replace(device_t *owner, const char *tag, devic osd_printf_warning("Warning: attempting to replace non-existent device '%s'\n", tag); return device_add(owner, tag, type, clock); } + else + { + // make sure we have the old device's actual owner + owner = old_device->owner(); + assert(owner != nullptr); - // make sure we have the old device's actual owner - owner = old_device->owner(); - assert(owner != nullptr); - - // remove references to the old device - remove_references(*old_device); + // remove references to the old device + remove_references(*old_device); - // allocate the new device - device_t *new_device = (*type)(*this, tag, owner, clock); + // allocate the new device + std::unique_ptr new_device = type(*this, tag, owner, clock); - // substitute it for the old one in the owner's list - return &config_new_device(owner->subdevices().m_list.replace_and_remove(*new_device, *old_device)); + // substitute it for the old one in the owner's list + return &config_new_device(owner->subdevices().m_list.replace_and_remove(*new_device.release(), *old_device)); + } } diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 8a3774b8725..f89c8dfa9b7 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -114,7 +114,7 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t { \ devcb_base *devcb = nullptr; \ (void)devcb; \ - if (owner == nullptr) owner = config.device_add(nullptr, "root", &driver_device_creator<_class>, 0); + if (owner == nullptr) owner = config.device_add(nullptr, "root", driver_device_creator<_class>, 0); /** @def MACHINE_CONFIG_FRAGMENT(_name) @@ -157,7 +157,7 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t { \ devcb_base *devcb = nullptr; \ (void)devcb; \ - if (owner == nullptr) owner = config.device_add(nullptr, "root", &driver_device_creator<_class>, 0); \ + if (owner == nullptr) owner = config.device_add(nullptr, "root", driver_device_creator<_class>, 0); \ owner = MACHINE_CONFIG_NAME(_base)(config, owner, device); /** diff --git a/src/emu/render.h b/src/emu/render.h index c4f78ef6555..3a5b5cecccc 100644 --- a/src/emu/render.h +++ b/src/emu/render.h @@ -49,7 +49,7 @@ //#include "osdepend.h" //#include "bitmap.h" -//#include "screen.h" +#include "screen.h" #include #include diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index f204b9c034e..8fd134ba470 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -31,7 +31,10 @@ //************************************************************************** // device type definition -const device_type SCREEN = &device_creator; +const device_type SCREEN = device_creator; + +template class device_finder; +template class device_finder; const attotime screen_device::DEFAULT_FRAME_PERIOD(attotime::from_hz(DEFAULT_FRAME_RATE)); diff --git a/src/emu/screen.h b/src/emu/screen.h index 24dab4e7be4..4ad0c8ab85e 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -7,17 +7,12 @@ Core MAME screen device. ***************************************************************************/ - -#include +#ifndef MAME_EMU_SCREEN_H +#define MAME_EMU_SCREEN_H #pragma once -#ifndef __EMU_H__ -#error Dont include this file directly; include emu.h instead. -#endif - -#ifndef MAME_EMU_SCREEN_H -#define MAME_EMU_SCREEN_H +#include //************************************************************************** @@ -370,7 +365,10 @@ private: extern const device_type SCREEN; // iterator helper -typedef device_type_iterator<&device_creator, screen_device> screen_device_iterator; +typedef device_type_iterator screen_device_iterator; + +extern template class device_finder; +extern template class device_finder; /*! @defgroup Screen device configuration macros diff --git a/src/emu/softlist_dev.cpp b/src/emu/softlist_dev.cpp index 824ab75d0ef..7a80dc57569 100644 --- a/src/emu/softlist_dev.cpp +++ b/src/emu/softlist_dev.cpp @@ -29,7 +29,7 @@ typedef std::unordered_map softlist_map; //************************************************************************** // device type definition -const device_type SOFTWARE_LIST = &device_creator; +const device_type SOFTWARE_LIST = device_creator; false_software_list_loader false_software_list_loader::s_instance; rom_software_list_loader rom_software_list_loader::s_instance; image_software_list_loader image_software_list_loader::s_instance; diff --git a/src/emu/softlist_dev.h b/src/emu/softlist_dev.h index 1c4b493ad50..c53f48fca49 100644 --- a/src/emu/softlist_dev.h +++ b/src/emu/softlist_dev.h @@ -189,7 +189,7 @@ private: extern const device_type SOFTWARE_LIST; // device type iterator -typedef device_type_iterator<&device_creator, software_list_device> software_list_device_iterator; +typedef device_type_iterator software_list_device_iterator; #endif // __SOFTLIST_DEV_H_ diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 1f3373caf0b..be16a3476e3 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "speaker.h" #include "emuopts.h" #include "osdepend.h" #include "config.h" diff --git a/src/emu/speaker.cpp b/src/emu/speaker.cpp index 0fb2fd55605..1b14f13e73a 100644 --- a/src/emu/speaker.cpp +++ b/src/emu/speaker.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "speaker.h" @@ -27,7 +28,10 @@ //************************************************************************** // device type definition -const device_type SPEAKER = &device_creator; +const device_type SPEAKER = device_creator; + +template class device_finder; +template class device_finder; diff --git a/src/emu/speaker.h b/src/emu/speaker.h index 13ea7c08958..bbd55ac66f1 100644 --- a/src/emu/speaker.h +++ b/src/emu/speaker.h @@ -7,16 +7,11 @@ Speaker output sound device. ***************************************************************************/ - -#pragma once - -#ifndef __EMU_H__ -#error Dont include this file directly; include emu.h instead. -#endif - #ifndef MAME_EMU_SPEAKER_H #define MAME_EMU_SPEAKER_H +#pragma once + //************************************************************************** // GLOBAL VARIABLES @@ -50,8 +45,7 @@ extern const device_type SPEAKER; // ======================> speaker_device -class speaker_device : public device_t, - public device_mixer_interface +class speaker_device : public device_t, public device_mixer_interface { public: // construction/destruction @@ -83,7 +77,10 @@ protected: // speaker device iterator -typedef device_type_iterator<&device_creator, speaker_device> speaker_device_iterator; +typedef device_type_iterator speaker_device_iterator; + +extern template class device_finder; +extern template class device_finder; #endif /* MAME_EMU_SPEAKER_H */ diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp index 13531985467..2e2b14f5086 100644 --- a/src/emu/tilemap.cpp +++ b/src/emu/tilemap.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "screen.h" //************************************************************************** @@ -1599,7 +1600,7 @@ void tilemap_manager::mark_all_dirty() //************************************************************************** // device type definition -const device_type TILEMAP = &device_creator; +const device_type TILEMAP = device_creator; //------------------------------------------------- // tilemap_device - constructor diff --git a/src/emu/timer.cpp b/src/emu/timer.cpp index 2e9eb0edfaa..577fa0150f4 100644 --- a/src/emu/timer.cpp +++ b/src/emu/timer.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "screen.h" /*************************************************************************** @@ -26,7 +27,7 @@ // LIVE TIMER DEVICE //************************************************************************** -const device_type TIMER = &device_creator; +const device_type TIMER = device_creator; //------------------------------------------------- // timer_device - constructor diff --git a/src/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp index 7904c106353..9f281c46296 100644 --- a/src/frontend/mame/clifront.cpp +++ b/src/frontend/mame/clifront.cpp @@ -702,14 +702,12 @@ void cli_frontend::listslots(const char *gamename) { if (option.second->selectable()) { - device_t *dev = (*option.second->devtype())(*drivlist.config(), "dummy", &drivlist.config()->root_device(), 0); + std::unique_ptr dev = option.second->devtype()(*drivlist.config(), "dummy", &drivlist.config()->root_device(), 0); dev->config_complete(); - if (first_option) { + if (first_option) printf("%-16s %s\n", option.second->name(),dev->name()); - } else { + else printf("%-34s%-16s %s\n", "", option.second->name(),dev->name()); - } - global_free(dev); first_option = false; } diff --git a/src/frontend/mame/info.cpp b/src/frontend/mame/info.cpp index 7c964de669c..2576edf878e 100644 --- a/src/frontend/mame/info.cpp +++ b/src/frontend/mame/info.cpp @@ -9,17 +9,24 @@ ***************************************************************************/ #include "emu.h" + +#include "info.h" #include "mameopts.h" + #include "machine/ram.h" #include "sound/samples.h" -#include "info.h" -#include "xmlfile.h" + #include "config.h" #include "drivenum.h" +#include "screen.h" #include "softlist_dev.h" +#include "speaker.h" + +#include "xmlfile.h" #include + #define XML_ROOT "mame" #define XML_TOP "machine" diff --git a/src/frontend/mame/info.h b/src/frontend/mame/info.h index 29f931b5c4a..6ffce39e496 100644 --- a/src/frontend/mame/info.h +++ b/src/frontend/mame/info.h @@ -8,11 +8,14 @@ ***************************************************************************/ -#pragma once - #ifndef __INFO_H__ #define __INFO_H__ +#pragma once + +#include "emuopts.h" + + class driver_enumerator; diff --git a/src/frontend/mame/mameopts.cpp b/src/frontend/mame/mameopts.cpp index be3ceb89845..13233122d2b 100644 --- a/src/frontend/mame/mameopts.cpp +++ b/src/frontend/mame/mameopts.cpp @@ -10,12 +10,15 @@ #include "emu.h" #include "mameopts.h" + #include "drivenum.h" +#include "screen.h" #include "softlist_dev.h" #include #include + int mame_options::m_slot_options = 0; int mame_options::m_device_options = 0; diff --git a/src/frontend/mame/ui/devctrl.h b/src/frontend/mame/ui/devctrl.h index e0b757cccca..96cd6237e7b 100644 --- a/src/frontend/mame/ui/devctrl.h +++ b/src/frontend/mame/ui/devctrl.h @@ -44,7 +44,7 @@ protected: private: // device iterator - typedef device_type_iterator<&device_creator, DeviceType> iterator; + typedef device_type_iterator, DeviceType> iterator; DeviceType * m_device; int m_count; diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index 73659c37137..16fbc6249ff 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -14,11 +14,12 @@ #include "emu.h" #include "includes/alesis.h" #include "sound/volt_reg.h" +#include "speaker.h" #define LOG 1 // device type definition -const device_type ALESIS_DM3AG = &device_creator; +const device_type ALESIS_DM3AG = device_creator; /*************************************************************************** IMPLEMENTATION diff --git a/src/mame/audio/arcadia.cpp b/src/mame/audio/arcadia.cpp index 00085a7ec9e..6b2d632f906 100644 --- a/src/mame/audio/arcadia.cpp +++ b/src/mame/audio/arcadia.cpp @@ -42,7 +42,7 @@ // device type definition -const device_type ARCADIA_SOUND = &device_creator; +const device_type ARCADIA_SOUND = device_creator; //------------------------------------------------- // arcadia_sound_device - constructor diff --git a/src/mame/audio/astrof.cpp b/src/mame/audio/astrof.cpp index e5fee67ee6c..f64546700ea 100644 --- a/src/mame/audio/astrof.cpp +++ b/src/mame/audio/astrof.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/astrof.h" +#include "speaker.h" /************************************* diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp index 16dbf50fe8c..1aa9ea1e3d1 100644 --- a/src/mame/audio/atarijsa.cpp +++ b/src/mame/audio/atarijsa.cpp @@ -84,10 +84,10 @@ ALL: the LPF (low pass filter) bit which selectively places a lowpass filter in // GLOBAL VARIABLES //************************************************************************** -extern const device_type ATARI_JSA_I = &device_creator; -extern const device_type ATARI_JSA_II = &device_creator; -extern const device_type ATARI_JSA_III = &device_creator; -extern const device_type ATARI_JSA_IIIS = &device_creator; +const device_type ATARI_JSA_I = device_creator; +const device_type ATARI_JSA_II = device_creator; +const device_type ATARI_JSA_III = device_creator; +const device_type ATARI_JSA_IIIS = device_creator; diff --git a/src/mame/audio/bwidow.cpp b/src/mame/audio/bwidow.cpp index 51739fdf8f1..9c6e0b5506c 100644 --- a/src/mame/audio/bwidow.cpp +++ b/src/mame/audio/bwidow.cpp @@ -4,10 +4,12 @@ #include "emu.h" +#include "includes/bwidow.h" + #include "sound/pokey.h" #include "sound/discrete.h" -#include "includes/bwidow.h" +#include "speaker.h" /************************************* diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index daf378e8577..84d4d5d6cf1 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -25,6 +25,9 @@ D0 explosion enable gates a noise generator #include "sound/discrete.h" #include "sound/pokey.h" +#include "speaker.h" + + /* This sets an amount of gain boost to apply to the final signal * that will drive it into clipping. The slider is ajusted by the * reverse factor, so that the final result is not clipped. diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index 1073709df97..87dca1ebcb0 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -7,13 +7,14 @@ ****************************************************************************/ -#define LOG_COMM (0) -#define LOG_32031_IOPORTS (0) - - #include "emu.h" -#include "cpu/tms32031/tms32031.h" #include "cage.h" +#include "cpu/tms32031/tms32031.h" +#include "speaker.h" + + +#define LOG_COMM (0) +#define LOG_32031_IOPORTS (0) @@ -105,7 +106,7 @@ static const char *const register_names[] = * *************************************/ -const device_type ATARI_CAGE = &device_creator; +const device_type ATARI_CAGE = device_creator; //------------------------------------------------- @@ -683,7 +684,7 @@ machine_config_constructor atari_cage_device::device_mconfig_additions() const } -const device_type ATARI_CAGE_SEATTLE = &device_creator; +const device_type ATARI_CAGE_SEATTLE = device_creator; //------------------------------------------------- diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp index 3532cf708de..cdec09a7308 100644 --- a/src/mame/audio/cclimber.cpp +++ b/src/mame/audio/cclimber.cpp @@ -34,7 +34,7 @@ MACHINE_CONFIG_END // DEVICE DEFINITIONS //************************************************************************** -const device_type CCLIMBER_AUDIO = &device_creator; +const device_type CCLIMBER_AUDIO = device_creator; //************************************************************************** diff --git a/src/mame/audio/channelf.cpp b/src/mame/audio/channelf.cpp index fb72231484f..50576cc0297 100644 --- a/src/mame/audio/channelf.cpp +++ b/src/mame/audio/channelf.cpp @@ -6,7 +6,7 @@ #define MAX_AMPLITUDE 0x7fff -const device_type CHANNELF_SOUND = &device_creator; +const device_type CHANNELF_SOUND = device_creator; channelf_sound_device::channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CHANNELF_SOUND, "Channel F Sound", tag, owner, clock, "channelf_sound", __FILE__), diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 9228af9571c..3e87c390eb4 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -19,11 +19,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/cinemat.h" + #include "cpu/z80/z80.h" -#include "cpu/ccpu/ccpu.h" #include "cpu/z80/z80daisy.h" #include "machine/z80ctc.h" -#include "includes/cinemat.h" +#include "speaker.h" /************************************* diff --git a/src/mame/audio/cliffhgr.cpp b/src/mame/audio/cliffhgr.cpp index 029a353e504..2fdc02ca88e 100644 --- a/src/mame/audio/cliffhgr.cpp +++ b/src/mame/audio/cliffhgr.cpp @@ -1,7 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles,Ernesto Corvi #include "emu.h" -#include "sound/discrete.h" +#include "audio/cliffhgr.h" + #define CLIFF_ENABLE_SND_1 NODE_01 #define CLIFF_ENABLE_SND_2 NODE_02 diff --git a/src/mame/audio/cliffhgr.h b/src/mame/audio/cliffhgr.h index e0363b0b3bb..340b043debe 100644 --- a/src/mame/audio/cliffhgr.h +++ b/src/mame/audio/cliffhgr.h @@ -1,4 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles,Ernesto Corvi +#ifndef MAME_AUDIO_CLIFFHGR_H +#define MAME_AUDIO_CLIFFHGR_H + +#pragma once + +#include "sound/discrete.h" DISCRETE_SOUND_EXTERN( cliffhgr ); + +#endif // MAME_AUDIO_CLIFFHGR_H diff --git a/src/mame/audio/cps3.cpp b/src/mame/audio/cps3.cpp index a3fe0e4833b..c5008a17b59 100644 --- a/src/mame/audio/cps3.cpp +++ b/src/mame/audio/cps3.cpp @@ -11,7 +11,7 @@ // device type definition -const device_type CPS3 = &device_creator; +const device_type CPS3 = device_creator; //************************************************************************** diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp index 9141f2465ad..3ab1845fdcc 100644 --- a/src/mame/audio/crbaloon.cpp +++ b/src/mame/audio/crbaloon.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/crbaloon.h" +#include "speaker.h" /* timing sources */ diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp index dac8d4ebd9a..cea1053a8f9 100644 --- a/src/mame/audio/csd.cpp +++ b/src/mame/audio/csd.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -extern const device_type MIDWAY_CHEAP_SQUEAK_DELUXE = &device_creator; +const device_type MIDWAY_CHEAP_SQUEAK_DELUXE = device_creator; //------------------------------------------------- // audio cpu map diff --git a/src/mame/audio/dai_snd.cpp b/src/mame/audio/dai_snd.cpp index da20912577d..09bef90e5b5 100644 --- a/src/mame/audio/dai_snd.cpp +++ b/src/mame/audio/dai_snd.cpp @@ -14,7 +14,7 @@ #include "dai_snd.h" // device type definition -const device_type DAI_SOUND = &device_creator; +const device_type DAI_SOUND = device_creator; //------------------------------------------------- diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index e43c41853d1..3d71d0fc354 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -154,6 +154,7 @@ #include "emu.h" #include "dcs.h" +#include "speaker.h" #define LOG_DCS_TRANSFERS (0) @@ -2487,7 +2488,7 @@ int dcs_audio_device::preprocess_write(uint16_t data) return result; } -const device_type DCS_AUDIO_2K = &device_creator; +const device_type DCS_AUDIO_2K = device_creator; //------------------------------------------------- // dcs_audio_2k_device - constructor @@ -2503,7 +2504,7 @@ machine_config_constructor dcs_audio_2k_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( dcs_audio_2k ); } -const device_type DCS_AUDIO_2K_UART = &device_creator; +const device_type DCS_AUDIO_2K_UART = device_creator; //------------------------------------------------- // dcs_audio_2k_uart_device - constructor @@ -2519,7 +2520,7 @@ machine_config_constructor dcs_audio_2k_uart_device::device_mconfig_additions() return MACHINE_CONFIG_NAME( dcs_audio_2k_uart ); } -const device_type DCS_AUDIO_8K = &device_creator; +const device_type DCS_AUDIO_8K = device_creator; //------------------------------------------------- // dcs_audio_8k_device - constructor @@ -2535,7 +2536,7 @@ machine_config_constructor dcs_audio_8k_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( dcs_audio_8k ); } -const device_type DCS_AUDIO_WPC = &device_creator; +const device_type DCS_AUDIO_WPC = device_creator; //------------------------------------------------- // dcs_audio_wpc_device - constructor @@ -2563,7 +2564,7 @@ dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type } -const device_type DCS2_AUDIO_2115 = &device_creator; +const device_type DCS2_AUDIO_2115 = device_creator; //------------------------------------------------- // dcs2_audio_2115_device - constructor @@ -2579,7 +2580,7 @@ machine_config_constructor dcs2_audio_2115_device::device_mconfig_additions() co return MACHINE_CONFIG_NAME( dcs2_audio_2115 ); } -const device_type DCS2_AUDIO_2104 = &device_creator; +const device_type DCS2_AUDIO_2104 = device_creator; //------------------------------------------------- // dcs2_audio_2104_device - constructor @@ -2596,7 +2597,7 @@ machine_config_constructor dcs2_audio_2104_device::device_mconfig_additions() co } -const device_type DCS2_AUDIO_DSIO = &device_creator; +const device_type DCS2_AUDIO_DSIO = device_creator; //------------------------------------------------- // dcs2_audio_dsio_device - constructor @@ -2612,7 +2613,7 @@ machine_config_constructor dcs2_audio_dsio_device::device_mconfig_additions() co return MACHINE_CONFIG_NAME( dcs2_audio_dsio ); } -const device_type DCS2_AUDIO_DENVER = &device_creator; +const device_type DCS2_AUDIO_DENVER = device_creator; //------------------------------------------------- // dcs2_audio_denver_device - constructor diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp index 7cbee2d9ef4..6ce93a8e84a 100644 --- a/src/mame/audio/decobsmt.cpp +++ b/src/mame/audio/decobsmt.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "audio/decobsmt.h" +#include "speaker.h" #define M6809_TAG "soundcpu" #define BSMT_TAG "bsmt" @@ -52,7 +53,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type DECOBSMT = &device_creator; +const device_type DECOBSMT = device_creator; //------------------------------------------------- diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 869c15d24ce..28d6d366719 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1,12 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Couriersud #include "emu.h" +#include "includes/dkong.h" + #include "cpu/mcs48/mcs48.h" #include "sound/discrete.h" - #include "sound/tms5110.h" - -#include "includes/dkong.h" +#include "speaker.h" /**************************************************************** diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp index 786fd2fe0dd..e8cdaaf0964 100644 --- a/src/mame/audio/dsbz80.cpp +++ b/src/mame/audio/dsbz80.cpp @@ -40,7 +40,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type DSBZ80 = &device_creator; +const device_type DSBZ80 = device_creator; //------------------------------------------------- diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index 7fe7744e69b..5b8c69ace47 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -38,11 +38,12 @@ #include "machine/clock.h" #include "machine/input_merger.h" +#include "speaker.h" -extern const device_type EFO_ZSU = &device_creator; -extern const device_type EFO_ZSU1 = &device_creator; -extern const device_type CEDAR_MAGNET_SOUND = &device_creator; +const device_type EFO_ZSU = device_creator; +const device_type EFO_ZSU1 = device_creator; +const device_type CEDAR_MAGNET_SOUND = device_creator; efo_zsu_device::efo_zsu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source) diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index a2d3593aeee..b738e7e2b1f 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -7,10 +7,12 @@ *************************************************************************/ #include "emu.h" +#include "audio/exidy.h" + #include "cpu/z80/z80.h" #include "machine/rescap.h" #include "cpu/m6502/m6502.h" -#include "audio/exidy.h" +#include "speaker.h" @@ -203,7 +205,7 @@ void exidy_sound_device::common_sh_start() sh6840_register_state_globals(); } -const device_type EXIDY = &device_creator; +const device_type EXIDY = device_creator; exidy_sound_device::exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, EXIDY, "Exidy SFX", tag, owner, clock, "exidy_sfx", __FILE__), @@ -657,7 +659,7 @@ WRITE8_MEMBER( venture_sound_device::filter_w ) *************************************/ -const device_type EXIDY_VENTURE = &device_creator; +const device_type EXIDY_VENTURE = device_creator; venture_sound_device::venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : exidy_sound_device(mconfig, EXIDY_VENTURE, "Exidy SFX+PSG", tag, owner, clock, "venture_sound", __FILE__) @@ -902,7 +904,7 @@ WRITE_LINE_MEMBER( victory_sound_device::main_ack_w ) } -const device_type EXIDY_VICTORY = &device_creator; +const device_type EXIDY_VICTORY = device_creator; victory_sound_device::victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : exidy_sound_device(mconfig, EXIDY_VICTORY, "Exidy SFX+PSG+Speech", tag, owner, clock, "victory_sound", __FILE__), diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp index 68ec274af9f..7c902298406 100644 --- a/src/mame/audio/exidy440.cpp +++ b/src/mame/audio/exidy440.cpp @@ -10,9 +10,11 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6809/m6809.h" #include "audio/exidy440.h" +#include "cpu/m6809/m6809.h" +#include "speaker.h" + #define SOUND_LOG 0 #define FADE_TO_ZERO 1 @@ -46,7 +48,7 @@ static const int channel_bits[4] = }; -const device_type EXIDY440 = &device_creator; +const device_type EXIDY440 = device_creator; exidy440_sound_device::exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, EXIDY440, "Exidy 440 CVSD", tag, owner, clock, "exidy440_sound", __FILE__), diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index c33702cd475..161fb5c79d7 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -386,7 +386,7 @@ static DISCRETE_SOUND_START(mooncrst) DISCRETE_MIXER7(NODE_280, 1, NODE_133_00, NODE_133_02, NODE_133_02,NODE_133_03, NODE_120, NODE_157, NODE_182, &mooncrst_mixer_desc) DISCRETE_SOUND_END -const device_type GALAXIAN = &device_creator; +const device_type GALAXIAN = device_creator; galaxian_sound_device::galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, GALAXIAN, "Galaxian Audio Custom", tag, owner, clock, "galaxian_sound", __FILE__), diff --git a/src/mame/audio/gamate.cpp b/src/mame/audio/gamate.cpp index 52798917f7c..c53b5cf55ee 100644 --- a/src/mame/audio/gamate.cpp +++ b/src/mame/audio/gamate.cpp @@ -13,7 +13,7 @@ enum { ClockDelay=32 }; // device type definition -const device_type GAMATE_SND = &device_creator; +const device_type GAMATE_SND = device_creator; const int gamate_sound_device::DAConverter[]={ 0, 3, 7, 13, 23, 41, 75, 137, 249, 453, 825, 1499, 2726, 4956, 9011, 16383 }; // (*.55) on the real below index 8 bareless measureable const uint8_t Mask[]={ 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0x1f, 0x3f, 0x1f, 0x1f, 0x1f, 0xff, 0xff, 0xf }; diff --git a/src/mame/audio/geebee.cpp b/src/mame/audio/geebee.cpp index beeac9e3620..91660fe91e5 100644 --- a/src/mame/audio/geebee.cpp +++ b/src/mame/audio/geebee.cpp @@ -13,7 +13,7 @@ #include "audio/geebee.h" -const device_type GEEBEE = &device_creator; +const device_type GEEBEE = device_creator; geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, GEEBEE, "Gee Bee Audio Custom", tag, owner, clock, "geebee_sound", __FILE__), diff --git a/src/mame/audio/gomoku.cpp b/src/mame/audio/gomoku.cpp index 23ea836c212..d4084838088 100644 --- a/src/mame/audio/gomoku.cpp +++ b/src/mame/audio/gomoku.cpp @@ -16,7 +16,7 @@ static const int defgain = 48; // device type definition -const device_type GOMOKU = &device_creator; +const device_type GOMOKU = device_creator; //************************************************************************** diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index ca2281fdd50..14afa787bb1 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -25,10 +25,10 @@ // GLOBAL VARIABLES //************************************************************************** -extern const device_type GOTTLIEB_SOUND_REV0 = &device_creator; -extern const device_type GOTTLIEB_SOUND_REV1 = &device_creator; -extern const device_type GOTTLIEB_SOUND_REV1_WITH_VOTRAX = &device_creator; -extern const device_type GOTTLIEB_SOUND_REV2 = &device_creator; +const device_type GOTTLIEB_SOUND_REV0 = device_creator; +const device_type GOTTLIEB_SOUND_REV1 = device_creator; +const device_type GOTTLIEB_SOUND_REV1_WITH_VOTRAX = device_creator; +const device_type GOTTLIEB_SOUND_REV2 = device_creator; //************************************************************************** diff --git a/src/mame/audio/gridlee.cpp b/src/mame/audio/gridlee.cpp index 742d3d57ec3..d34a6ca1c4e 100644 --- a/src/mame/audio/gridlee.cpp +++ b/src/mame/audio/gridlee.cpp @@ -11,7 +11,7 @@ // device type definition -const device_type GRIDLEE = &device_creator; +const device_type GRIDLEE = device_creator; //************************************************************************** diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp index 5391dcee945..8250b40f6cc 100644 --- a/src/mame/audio/harddriv.cpp +++ b/src/mame/audio/harddriv.cpp @@ -11,6 +11,7 @@ #include "cpu/tms32010/tms32010.h" #include "machine/atarigen.h" #include "sound/volt_reg.h" +#include "speaker.h" #define BIO_FREQUENCY (1000000 / 50) @@ -25,7 +26,7 @@ // harddriv_sound_board_device - constructor //------------------------------------------------- -const device_type HARDDRIV_SOUND_BOARD_DEVICE = &device_creator; +const device_type HARDDRIV_SOUND_BOARD_DEVICE = device_creator; harddriv_sound_board_device::harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, HARDDRIV_SOUND_BOARD_DEVICE, "Hard Drivin' Sound Board", tag, owner, clock, "harddriv_sound", __FILE__), diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index b53ff9e4b6e..d1e5e27bdaa 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -41,6 +41,8 @@ so levels 0,1,2,5 are unmasked, vectors get set during the sound CPU init code. #include "emu.h" #include "includes/hng64.h" +#include "speaker.h" + // save the sound program? #define DUMP_SOUNDPRG 0 diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp index a46d68124dc..02b55b2ff8c 100644 --- a/src/mame/audio/hyprolyb.cpp +++ b/src/mame/audio/hyprolyb.cpp @@ -4,7 +4,7 @@ #include "cpu/m6800/m6800.h" #include "audio/hyprolyb.h" -const device_type HYPROLYB_ADPCM = &device_creator; +const device_type HYPROLYB_ADPCM = device_creator; hyprolyb_adpcm_device::hyprolyb_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, HYPROLYB_ADPCM, "Hyper Olympics Audio", tag, owner, clock, "hyprolyb_adpcm", __FILE__), diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 57ede17fd0c..99fdbf3ae26 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -7,13 +7,16 @@ ***************************************************************************/ #include "emu.h" +#include "audio/irem.h" + #include "cpu/m6800/m6800.h" #include "sound/discrete.h" -#include "audio/irem.h" +#include "speaker.h" + -const device_type IREM_M62_AUDIO = &device_creator; -const device_type IREM_M52_SOUNDC_AUDIO = &device_creator; -const device_type IREM_M52_LARGE_AUDIO = &device_creator; +const device_type IREM_M62_AUDIO = device_creator; +const device_type IREM_M52_SOUNDC_AUDIO = device_creator; +const device_type IREM_M52_LARGE_AUDIO = device_creator; irem_audio_device::irem_audio_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), diff --git a/src/mame/audio/jedi.cpp b/src/mame/audio/jedi.cpp index 6abf830adc3..36c40902132 100644 --- a/src/mame/audio/jedi.cpp +++ b/src/mame/audio/jedi.cpp @@ -9,10 +9,11 @@ ***************************************************************************/ #include "emu.h" +#include "includes/jedi.h" #include "cpu/m6502/m6502.h" #include "sound/tms5220.h" #include "sound/pokey.h" -#include "includes/jedi.h" +#include "speaker.h" diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index 5c2cca8c616..91c9c4092bb 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -81,8 +81,10 @@ #include "emu.h" #include "includes/leland.h" + #include "cpu/z80/z80.h" #include "sound/volt_reg.h" +#include "speaker.h" #define LOG_COMM 0 #define LOG_EXTERN 0 @@ -349,7 +351,7 @@ void leland_80186_sound_device::device_reset() m_ext_active = 0; } -const device_type LELAND_80186 = &device_creator; +const device_type LELAND_80186 = device_creator; leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LELAND_80186, "80186 DAC (Leland)", tag, owner, clock, "leland_80186_sound", __FILE__), @@ -404,7 +406,7 @@ leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconf { } -const device_type REDLINE_80186 = &device_creator; +const device_type REDLINE_80186 = device_creator; redline_80186_sound_device::redline_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : leland_80186_sound_device(mconfig, REDLINE_80186, "80186 DAC (Redline Racer)", tag, owner, clock, "redline_80186_sound", __FILE__) @@ -412,7 +414,7 @@ redline_80186_sound_device::redline_80186_sound_device(const machine_config &mco m_type = TYPE_REDLINE; } -const device_type ATAXX_80186 = &device_creator; +const device_type ATAXX_80186 = device_creator; ataxx_80186_sound_device::ataxx_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : leland_80186_sound_device(mconfig, REDLINE_80186, "80186 DAC (Ataxx)", tag, owner, clock, "ataxx_80186_sound", __FILE__) @@ -420,7 +422,7 @@ ataxx_80186_sound_device::ataxx_80186_sound_device(const machine_config &mconfig m_type = TYPE_ATAXX; } -const device_type WSF_80186 = &device_creator; +const device_type WSF_80186 = device_creator; wsf_80186_sound_device::wsf_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : leland_80186_sound_device(mconfig, REDLINE_80186, "80186 DAC (WSF)", tag, owner, clock, "wsf_80186_sound", __FILE__) diff --git a/src/mame/audio/lynx.cpp b/src/mame/audio/lynx.cpp index 09174bad289..89ff60be811 100644 --- a/src/mame/audio/lynx.cpp +++ b/src/mame/audio/lynx.cpp @@ -85,8 +85,8 @@ AUD_A_RIGHT EQU %00000001 // device type definition -const device_type LYNX_SND = &device_creator; -const device_type LYNX2_SND = &device_creator; +const device_type LYNX_SND = device_creator; +const device_type LYNX2_SND = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/mame/audio/m72.cpp b/src/mame/audio/m72.cpp index 101cb1c9f51..d07a86751ec 100644 --- a/src/mame/audio/m72.cpp +++ b/src/mame/audio/m72.cpp @@ -47,7 +47,7 @@ Shisensho II 1993 Rev 3.34 M81 Yes #include "m72.h" -const device_type M72 = &device_creator; +const device_type M72 = device_creator; m72_audio_device::m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, M72, "Irem M72 Audio Custom", tag, owner, clock, "m72_audio", __FILE__) diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index 4a31e113e5d..2deb825bae0 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -1,11 +1,13 @@ // license:BSD-3-Clause // copyright-holders:Couriersud #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/mario.h" + #include "cpu/mcs48/mcs48.h" +#include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "speaker.h" -#include "includes/mario.h" #include "audio/nl_mario.h" /**************************************************************** diff --git a/src/mame/audio/micro3d.cpp b/src/mame/audio/micro3d.cpp index c82fc024218..eebed7887a7 100644 --- a/src/mame/audio/micro3d.cpp +++ b/src/mame/audio/micro3d.cpp @@ -165,7 +165,7 @@ void micro3d_sound_device::noise_sh_w(uint8_t data) *************************************/ -const device_type MICRO3D = &device_creator; +const device_type MICRO3D = device_creator; micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MICRO3D, "Microprose Audio Custom", tag, owner, clock, "micro3d_sound", __FILE__), diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index b2921c626a1..4b83e1562dc 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -31,10 +31,10 @@ // GLOBAL VARIABLES //************************************************************************** -extern const device_type MIDWAY_SSIO = &device_creator; -extern const device_type MIDWAY_SOUNDS_GOOD = &device_creator; -extern const device_type MIDWAY_TURBO_CHEAP_SQUEAK = &device_creator; -extern const device_type MIDWAY_SQUAWK_N_TALK = &device_creator; +const device_type MIDWAY_SSIO = device_creator; +const device_type MIDWAY_SOUNDS_GOOD = device_creator; +const device_type MIDWAY_TURBO_CHEAP_SQUEAK = device_creator; +const device_type MIDWAY_SQUAWK_N_TALK = device_creator; diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index 8a8085e5b48..198536a4e30 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "includes/mw8080bw.h" +#include "speaker.h" /************************************* diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp index 9877faaa9ef..3f7ef60e2a1 100644 --- a/src/mame/audio/n8080.cpp +++ b/src/mame/audio/n8080.cpp @@ -9,9 +9,11 @@ #include "emu.h" #include "includes/n8080.h" #include "sound/volt_reg.h" +#include "speaker.h" -static const double ATTACK_RATE = 10e-6 * 500; -static const double DECAY_RATE = 10e-6 * 16000; + +constexpr double ATTACK_RATE = 10e-6 * 500; +constexpr double DECAY_RATE = 10e-6 * 16000; void n8080_state::spacefev_update_SN76477_status() diff --git a/src/mame/audio/namco52.cpp b/src/mame/audio/namco52.cpp index 872e9a9d741..7375bd7d753 100644 --- a/src/mame/audio/namco52.cpp +++ b/src/mame/audio/namco52.cpp @@ -157,7 +157,7 @@ ROM_START( namco_52xx ) ROM_END -const device_type NAMCO_52XX = &device_creator; +const device_type NAMCO_52XX = device_creator; namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_52XX, "Namco 52xx", tag, owner, clock, "namco52", __FILE__), diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp index c4176c83e28..db18a3e2df5 100644 --- a/src/mame/audio/namco54.cpp +++ b/src/mame/audio/namco54.cpp @@ -128,7 +128,7 @@ ROM_START( namco_54xx ) ROM_LOAD( "54xx.bin", 0x0000, 0x0400, CRC(ee7357e0) SHA1(01bdf984a49e8d0cc8761b2cc162fd6434d5afbe) ) ROM_END -const device_type NAMCO_54XX = &device_creator; +const device_type NAMCO_54XX = device_creator; namco_54xx_device::namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_54XX, "Namco 54xx", tag, owner, clock, "namco54", __FILE__), diff --git a/src/mame/audio/phoenix.cpp b/src/mame/audio/phoenix.cpp index ca591013807..ede90fb999f 100644 --- a/src/mame/audio/phoenix.cpp +++ b/src/mame/audio/phoenix.cpp @@ -48,7 +48,7 @@ -const device_type PHOENIX = &device_creator; +const device_type PHOENIX = device_creator; phoenix_sound_device::phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PHOENIX, "Phoenix Audio Custom", tag, owner, clock, "phoenix_sound", __FILE__), diff --git a/src/mame/audio/pleiads.cpp b/src/mame/audio/pleiads.cpp index b8af63623da..0472617fa3e 100644 --- a/src/mame/audio/pleiads.cpp +++ b/src/mame/audio/pleiads.cpp @@ -18,7 +18,7 @@ #define TONE1_CLOCK 8000 -const device_type PLEIADS = &device_creator; +const device_type PLEIADS = device_creator; pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PLEIADS, "Pleiads Audio Custom", tag, owner, clock, "pleiads_sound", __FILE__), @@ -107,7 +107,7 @@ void pleiads_sound_device::device_start() common_start(); } -const device_type NAUGHTYB = &device_creator; +const device_type NAUGHTYB = device_creator; naughtyb_sound_device::naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pleiads_sound_device(mconfig, NAUGHTYB, "Naughty Boy Audio Custom", tag, owner, clock, "naughtyb_sound", __FILE__) @@ -175,7 +175,7 @@ void naughtyb_sound_device::device_start() common_start(); } -const device_type POPFLAME = &device_creator; +const device_type POPFLAME = device_creator; popflame_sound_device::popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pleiads_sound_device(mconfig, POPFLAME, "Pop Flamer Audio Custom", tag, owner, clock, "popflame_sound", __FILE__) diff --git a/src/mame/audio/polepos.cpp b/src/mame/audio/polepos.cpp index c1f05b30443..2a06964c400 100644 --- a/src/mame/audio/polepos.cpp +++ b/src/mame/audio/polepos.cpp @@ -213,7 +213,7 @@ static void filter_opamp_m_bandpass_setup(device_t *device, double r1, double r2 // device type definition -const device_type POLEPOS = &device_creator; +const device_type POLEPOS = device_creator; //************************************************************************** diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index ed19887efef..c3d73176756 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -7,11 +7,15 @@ *************************************************************************/ #include "emu.h" +#include "includes/qix.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" -#include "includes/qix.h" -#include "sound/sn76496.h" #include "sound/discrete.h" +#include "sound/sn76496.h" +#include "speaker.h" + + /* Discrete Sound Input Nodes */ #define QIX_DAC_DATA NODE_01 @@ -21,9 +25,6 @@ - - - /*************************************************************************** Audio handlers ***************************************************************************/ diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index 5bccf4706fd..6cc930e221c 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "rax.h" +#include "speaker.h" /************************************* @@ -493,7 +494,7 @@ MACHINE_CONFIG_FRAGMENT( rax ) MACHINE_CONFIG_END -const device_type ACCLAIM_RAX = &device_creator; +const device_type ACCLAIM_RAX = device_creator; //------------------------------------------------- // acclaim_rax_device - constructor diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp index f57641a7cc8..18bbe9d62ff 100644 --- a/src/mame/audio/redalert.cpp +++ b/src/mame/audio/redalert.cpp @@ -10,13 +10,15 @@ ****************************************************************************/ #include "emu.h" +#include "includes/redalert.h" + +#include "cpu/i8085/i8085.h" #include "cpu/m6800/m6800.h" #include "cpu/m6502/m6502.h" #include "machine/rescap.h" -#include "cpu/i8085/i8085.h" #include "machine/6821pia.h" #include "sound/ay8910.h" -#include "includes/redalert.h" +#include "speaker.h" diff --git a/src/mame/audio/redbaron.cpp b/src/mame/audio/redbaron.cpp index 17e4967035c..f13a5a201e1 100644 --- a/src/mame/audio/redbaron.cpp +++ b/src/mame/audio/redbaron.cpp @@ -24,7 +24,7 @@ // device type definition -const device_type REDBARON = &device_creator; +const device_type REDBARON = device_creator; //************************************************************************** diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index fc5b2f0af86..961c4014204 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -13,7 +13,7 @@ #include "sound/volt_reg.h" -const device_type S11C_BG = &device_creator; +const device_type S11C_BG = device_creator; s11c_bg_device::s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig,S11C_BG,"Williams System 11C Background Music",tag,owner,clock, "s11c_bg", __FILE__), diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index 7d575414907..24ad43ec1f8 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -14,11 +14,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/scramble.h" + #include "cpu/z80/z80.h" #include "machine/7474.h" #include "sound/flt_rc.h" #include "sound/ay8910.h" -#include "includes/scramble.h" +#include "speaker.h" #define AD2083_TMS5110_CLOCK XTAL_640kHz diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp index 927981f31be..60806aaad06 100644 --- a/src/mame/audio/segag80r.cpp +++ b/src/mame/audio/segag80r.cpp @@ -29,7 +29,7 @@ #define SEGA005_555_TIMER_FREQ (1.44 / ((15000 + 2 * 4700) * 1.5e-6)) #define SEGA005_COUNTER_FREQ (100000) /* unknown, just a guess */ -const device_type SEGA005 = &device_creator; +const device_type SEGA005 = device_creator; sega005_sound_device::sega005_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGA005, "Sega 005 Audio Custom", tag, owner, clock, "sega005_sound", __FILE__), diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp index 6e210e1992c..7a2130eae07 100644 --- a/src/mame/audio/segam1audio.cpp +++ b/src/mame/audio/segam1audio.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "audio/segam1audio.h" +#include "speaker.h" #define M68000_TAG "m1sndcpu" #define MULTIPCM_1_TAG "m1pcm1" @@ -63,7 +64,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type SEGAM1AUDIO = &device_creator; +const device_type SEGAM1AUDIO = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp index e93dfec091e..388700b4ad5 100644 --- a/src/mame/audio/segasnd.cpp +++ b/src/mame/audio/segasnd.cpp @@ -64,7 +64,7 @@ static inline double step_cr_filter(g80_filter_state *state, double input) SPEECH BOARD ***************************************************************************/ -const device_type SEGASPEECH = &device_creator; +const device_type SEGASPEECH = device_creator; speech_sound_device::speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGASPEECH, "Sega Speech Sound Board", tag, owner, clock, "sega_speech_sound", __FILE__), @@ -237,7 +237,7 @@ MACHINE_CONFIG_END UNIVERSAL SOUND BOARD ***************************************************************************/ -const device_type SEGAUSB = &device_creator; +const device_type SEGAUSB = device_creator; usb_sound_device::usb_sound_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), @@ -879,7 +879,7 @@ machine_config_constructor usb_sound_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( segausb ); } -const device_type SEGAUSBROM = &device_creator; +const device_type SEGAUSBROM = device_creator; usb_rom_sound_device::usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : usb_sound_device(mconfig, SEGAUSBROM, "Sega Universal Sound Board with ROM", tag, owner, clock, "segausbrom", __FILE__) diff --git a/src/mame/audio/seibu.cpp b/src/mame/audio/seibu.cpp index 9e2f8fe128e..5814b51ba44 100644 --- a/src/mame/audio/seibu.cpp +++ b/src/mame/audio/seibu.cpp @@ -71,7 +71,7 @@ 00002CA2: 17 37 */ -const device_type SEIBU_SOUND = &device_creator; +const device_type SEIBU_SOUND = device_creator; seibu_sound_device::seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEIBU_SOUND, "Seibu Sound System", tag, owner, clock, "seibu_sound", __FILE__), @@ -320,7 +320,7 @@ ADDRESS_MAP_END /***************************************************************************/ -const device_type SEI80BU = &device_creator; +const device_type SEI80BU = device_creator; sei80bu_device::sei80bu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEI80BU, "SEI80BU Encrypted Z80 Interface", tag, owner, clock, "sei80bu", __FILE__), @@ -374,7 +374,7 @@ READ8_MEMBER(sei80bu_device::opcode_r) FIXME: hook up an actual MSM5205 in place of this custom implementation ***************************************************************************/ -const device_type SEIBU_ADPCM = &device_creator; +const device_type SEIBU_ADPCM = device_creator; seibu_adpcm_device::seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEIBU_ADPCM, "Seibu ADPCM (MSM5205)", tag, owner, clock, "seibu_adpcm", __FILE__), diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp index b442581d910..cf29796f185 100644 --- a/src/mame/audio/snes_snd.cpp +++ b/src/mame/audio/snes_snd.cpp @@ -153,7 +153,7 @@ static const int ENVCNT[0x20] #define MEtoLE16( x ) little_endianize_int16(x) -const device_type SNES = &device_creator; +const device_type SNES = device_creator; snes_sound_device::snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SNES, "SNES Custom DSP (SPC700)", tag, owner, clock, "snes_sound", __FILE__), diff --git a/src/mame/audio/snk6502.cpp b/src/mame/audio/snk6502.cpp index 526292ab920..2b367d2690b 100644 --- a/src/mame/audio/snk6502.cpp +++ b/src/mame/audio/snk6502.cpp @@ -128,7 +128,7 @@ DISCRETE_SOUND_START( fantasy ) DISCRETE_SOUND_END -const device_type SNK6502 = &device_creator; +const device_type SNK6502 = device_creator; snk6502_sound_device::snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SNK6502, "SNK6502 Audio Custom", tag, owner, clock, "snk6502_sound", __FILE__), diff --git a/src/mame/audio/socrates.cpp b/src/mame/audio/socrates.cpp index e6046756243..e50b06d9b8a 100644 --- a/src/mame/audio/socrates.cpp +++ b/src/mame/audio/socrates.cpp @@ -16,7 +16,7 @@ // device type definition -const device_type SOCRATES_SOUND = &device_creator; +const device_type SOCRATES_SOUND = device_creator; //------------------------------------------------- diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp index 7f9cd3767e9..4add86fc961 100644 --- a/src/mame/audio/spacefb.cpp +++ b/src/mame/audio/spacefb.cpp @@ -8,10 +8,12 @@ #include "emu.h" #include "includes/spacefb.h" + #include "cpu/mcs48/mcs48.h" #include "sound/dac.h" #include "sound/samples.h" #include "sound/volt_reg.h" +#include "speaker.h" READ8_MEMBER(spacefb_state::audio_p2_r) diff --git a/src/mame/audio/special.cpp b/src/mame/audio/special.cpp index 60dcabf0839..61bcccc3959 100644 --- a/src/mame/audio/special.cpp +++ b/src/mame/audio/special.cpp @@ -14,7 +14,7 @@ // device type definition -const device_type SPECIMX_SND = &device_creator; +const device_type SPECIMX_SND = device_creator; //************************************************************************** diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index adfeda28361..5daff51693b 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -9,10 +9,12 @@ To Do: add filters ***************************************************************************/ #include "emu.h" -#include "sound/discrete.h" -#include "machine/6821pia.h" #include "includes/spiders.h" +#include "machine/6821pia.h" +#include "sound/discrete.h" +#include "speaker.h" + /* Discrete Sound Input Nodes */ #define SPIDERS_WEB_SOUND_DATA NODE_01 diff --git a/src/mame/audio/svis_snd.cpp b/src/mame/audio/svis_snd.cpp index e4a0d3099e6..eb94212eb85 100644 --- a/src/mame/audio/svis_snd.cpp +++ b/src/mame/audio/svis_snd.cpp @@ -11,7 +11,7 @@ // device type definition -const device_type SVISION_SND = &device_creator; +const device_type SVISION_SND = device_creator; //************************************************************************** diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp index 8fb7078d8a0..2106b0fc53c 100644 --- a/src/mame/audio/t5182.cpp +++ b/src/mame/audio/t5182.cpp @@ -151,7 +151,7 @@ rom. #define T5182_CLOCK XTAL_14_31818MHz/4 -const device_type T5182 = &device_creator; +const device_type T5182 = device_creator; t5182_device::t5182_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, T5182, "T5182 MCU", tag, owner, clock, "t5182", __FILE__), diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index a793b0eeef2..80ef6b085e0 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -14,9 +14,10 @@ #include "emu.h" #include "taito_en.h" +#include "speaker.h" -const device_type TAITO_EN = &device_creator; +const device_type TAITO_EN = device_creator; taito_en_device::taito_en_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TAITO_EN, "Taito Ensoniq Sound System", tag, owner, clock, "taito_en", __FILE__), diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp index efac1676b27..a29f1aea9b4 100644 --- a/src/mame/audio/taito_zm.cpp +++ b/src/mame/audio/taito_zm.cpp @@ -31,7 +31,7 @@ TODO: /**************************************************************************/ -const device_type TAITO_ZOOM = &device_creator; +const device_type TAITO_ZOOM = device_creator; //------------------------------------------------- // taito_zoom_device - constructor diff --git a/src/mame/audio/taitosnd.cpp b/src/mame/audio/taitosnd.cpp index 6a2d9795ee1..2f885674d66 100644 --- a/src/mame/audio/taitosnd.cpp +++ b/src/mame/audio/taitosnd.cpp @@ -29,7 +29,7 @@ // device type definition -const device_type TC0140SYT = &device_creator; +const device_type TC0140SYT = device_creator; //************************************************************************** diff --git a/src/mame/audio/targ.cpp b/src/mame/audio/targ.cpp index 2b3437053f9..b90290e78c6 100644 --- a/src/mame/audio/targ.cpp +++ b/src/mame/audio/targ.cpp @@ -16,6 +16,7 @@ #include "emu.h" #include "includes/exidy.h" #include "sound/volt_reg.h" +#include "speaker.h" diff --git a/src/mame/audio/tiamc1.cpp b/src/mame/audio/tiamc1.cpp index 70d8f7b6c95..3be08b7b551 100644 --- a/src/mame/audio/tiamc1.cpp +++ b/src/mame/audio/tiamc1.cpp @@ -46,7 +46,7 @@ // device type definition -const device_type TIAMC1 = &device_creator; +const device_type TIAMC1 = device_creator; //************************************************************************** diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp index ed5942d49e4..e27f3b32c3a 100644 --- a/src/mame/audio/timeplt.cpp +++ b/src/mame/audio/timeplt.cpp @@ -14,13 +14,15 @@ #include "emu.h" #include "audio/timeplt.h" + #include "machine/gen_latch.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_14_31818MHz -const device_type TIMEPLT_AUDIO = &device_creator; +const device_type TIMEPLT_AUDIO = device_creator; timeplt_audio_device::timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TIMEPLT_AUDIO, "Time Pilot Audio", tag, owner, clock, "timeplt_audio", __FILE__), diff --git a/src/mame/audio/trackfld.cpp b/src/mame/audio/trackfld.cpp index 9be59fd9157..389ec21479b 100644 --- a/src/mame/audio/trackfld.cpp +++ b/src/mame/audio/trackfld.cpp @@ -11,7 +11,7 @@ -const device_type TRACKFLD_AUDIO = &device_creator; +const device_type TRACKFLD_AUDIO = device_creator; trackfld_audio_device::trackfld_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TRACKFLD_AUDIO, "Track And Field Audio", tag, owner, clock, "trackfld_audio", __FILE__), diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp index 47ad4406219..592b46399d8 100644 --- a/src/mame/audio/turbo.cpp +++ b/src/mame/audio/turbo.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "includes/turbo.h" #include "sound/samples.h" +#include "speaker.h" #define DISCRETE_TEST (0) diff --git a/src/mame/audio/turrett.cpp b/src/mame/audio/turrett.cpp index 22f2558a9aa..379907093f6 100644 --- a/src/mame/audio/turrett.cpp +++ b/src/mame/audio/turrett.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "includes/turrett.h" +const device_type TURRETT = device_creator; //------------------------------------------------- diff --git a/src/mame/audio/tvc.cpp b/src/mame/audio/tvc.cpp index 5212c176c76..693de81fb18 100644 --- a/src/mame/audio/tvc.cpp +++ b/src/mame/audio/tvc.cpp @@ -10,7 +10,7 @@ #include "tvc.h" // device type definition -const device_type TVC_SOUND = &device_creator; +const device_type TVC_SOUND = device_creator; //------------------------------------------------- // tvc_sound_device - constructor diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp index 4e58dd940b9..a8e3d53e4d1 100644 --- a/src/mame/audio/tx1.cpp +++ b/src/mame/audio/tx1.cpp @@ -51,7 +51,7 @@ static const double tx1_engine_gains[16] = }; -const device_type TX1 = &device_creator; +const device_type TX1 = device_creator; tx1_sound_device::tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TX1, "TX-1 Audio Custom", tag, owner, clock, "tx1_sound", __FILE__), @@ -335,7 +335,7 @@ static const double bb_engine_gains[16] = -1.0/(1.0/(BUGGYBOY_R1S + BUGGYBOY_R2S + BUGGYBOY_R3S + BUGGYBOY_R4S) + 1.0/100e3)/100e3, }; -const device_type BUGGYBOY = &device_creator; +const device_type BUGGYBOY = device_creator; buggyboy_sound_device::buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : tx1_sound_device(mconfig, BUGGYBOY, "Buggy Boy Audio Custom", tag, owner, clock, "buggyboy_sound", __FILE__) diff --git a/src/mame/audio/vboy.cpp b/src/mame/audio/vboy.cpp index 7bf9f28d4e8..707fdf8ce3c 100644 --- a/src/mame/audio/vboy.cpp +++ b/src/mame/audio/vboy.cpp @@ -11,7 +11,7 @@ #include "vboy.h" // device type definition -const device_type VBOYSND = &device_creator; +const device_type VBOYSND = device_creator; //#define LAME_COMPILER_BUG diff --git a/src/mame/audio/vc4000.cpp b/src/mame/audio/vc4000.cpp index 79eee1b1b71..cb00aa57d8c 100644 --- a/src/mame/audio/vc4000.cpp +++ b/src/mame/audio/vc4000.cpp @@ -11,7 +11,7 @@ #include "vc4000.h" -const device_type VC4000_SND = &device_creator; +const device_type VC4000_SND = device_creator; vc4000_sound_device::vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VC4000_SND, "Intertion Electronic VC 4000 Audio Custom", tag, owner, clock, "vc4000_sound", __FILE__), diff --git a/src/mame/audio/warpwarp.cpp b/src/mame/audio/warpwarp.cpp index 943540f01ae..301a99de38c 100644 --- a/src/mame/audio/warpwarp.cpp +++ b/src/mame/audio/warpwarp.cpp @@ -16,7 +16,7 @@ #define CLOCK_1V (18432000/3/2/384) -const device_type WARPWARP = &device_creator; +const device_type WARPWARP = device_creator; warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WARPWARP, "Warp Warp Audio Custom", tag, owner, clock, "warpwarp_sound", __FILE__), diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 9bab10f8bb1..8b5021daeb4 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -56,9 +56,9 @@ // GLOBAL VARIABLES //************************************************************************** -extern const device_type WILLIAMS_NARC_SOUND = &device_creator; -extern const device_type WILLIAMS_CVSD_SOUND = &device_creator; -extern const device_type WILLIAMS_ADPCM_SOUND = &device_creator; +const device_type WILLIAMS_NARC_SOUND = device_creator; +const device_type WILLIAMS_CVSD_SOUND = device_creator; +const device_type WILLIAMS_ADPCM_SOUND = device_creator; diff --git a/src/mame/audio/wiping.cpp b/src/mame/audio/wiping.cpp index 14ad7398c91..cd518d9e567 100644 --- a/src/mame/audio/wiping.cpp +++ b/src/mame/audio/wiping.cpp @@ -14,7 +14,7 @@ static const int samplerate = 48000; static const int defgain = 48; -const device_type WIPING = &device_creator; +const device_type WIPING = device_creator; wiping_sound_device::wiping_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WIPING, "Wiping Audio Custom", tag, owner, clock, "wiping_sound", __FILE__), diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp index 6d78a05a176..481ca882529 100644 --- a/src/mame/audio/wpcsnd.cpp +++ b/src/mame/audio/wpcsnd.cpp @@ -14,7 +14,7 @@ #define LOG_WPCSND (0) -const device_type WPCSND = &device_creator; +const device_type WPCSND = device_creator; wpcsnd_device::wpcsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig,WPCSND,"Williams WPC Sound",tag,owner,clock, "wpcsnd", __FILE__), diff --git a/src/mame/audio/wswan.cpp b/src/mame/audio/wswan.cpp index 68a9e264f51..1459acdc390 100644 --- a/src/mame/audio/wswan.cpp +++ b/src/mame/audio/wswan.cpp @@ -18,7 +18,7 @@ The noise taps and behavior are the same as the Virtual Boy. // device type definition -const device_type WSWAN_SND = &device_creator; +const device_type WSWAN_SND = device_creator; //************************************************************************** diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp index 04c06958195..b880608fd48 100644 --- a/src/mame/audio/zaccaria.cpp +++ b/src/mame/audio/zaccaria.cpp @@ -13,8 +13,8 @@ // GLOBAL VARIABLES //************************************************************************** -device_type const ZACCARIA_1B11107 = &device_creator; -device_type const ZACCARIA_1B11142 = &device_creator; +device_type const ZACCARIA_1B11107 = device_creator; +device_type const ZACCARIA_1B11142 = device_creator; diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index 95d49796004..551d519d3ac 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -73,12 +73,15 @@ correctly. #define AUDIO_CLOCK_1942P (MASTER_CLOCK_1942P/16) #include "emu.h" +#include "includes/1942.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/netlist.h" -#include "netlist/devices/net_lib.h" +#include "screen.h" +#include "speaker.h" -#include "includes/1942.h" +#include "netlist/devices/net_lib.h" #define NLFILT(RA, R1, C1, R2) \ NET_C(RA.1, V5) \ diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp index a9528c41d2c..76685cd365d 100644 --- a/src/mame/drivers/1943.cpp +++ b/src/mame/drivers/1943.cpp @@ -32,11 +32,14 @@ */ #include "emu.h" +#include "includes/1943.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/1943.h" +#include "screen.h" +#include "speaker.h" /* Protection Handlers */ diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp index ad061060db0..aef9295fd60 100644 --- a/src/mame/drivers/1945kiii.cpp +++ b/src/mame/drivers/1945kiii.cpp @@ -47,6 +47,8 @@ Notes: #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_16MHz diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp index 59705e05803..dce6c82f6cd 100644 --- a/src/mame/drivers/20pacgal.cpp +++ b/src/mame/drivers/20pacgal.cpp @@ -85,11 +85,13 @@ Graphics: CY37256P160-83AC x 2 (Ultra37000 CPLD family - 160 pin TQFP, 256 Macro #include "emu.h" #include "includes/20pacgal.h" + #include "cpu/z180/z180.h" #include "machine/eepromser.h" #include "machine/watchdog.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 6b91ead3e95..b39c80c16c9 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -35,9 +35,11 @@ DAC -26.6860Mhz */ #include "emu.h" +#include "includes/taito_f3.h" + #include "cpu/m68000/m68000.h" #include "sound/2610intf.h" -#include "includes/taito_f3.h" +#include "speaker.h" class _2mindril_state : public taito_f3_state diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp index bb82cbba362..264603adad2 100644 --- a/src/mame/drivers/30test.cpp +++ b/src/mame/drivers/30test.cpp @@ -46,6 +46,8 @@ http://blogs.yahoo.co.jp/nadegatayosoyuki/59285865.html #include "emu.h" #include "cpu/mc68hc11/mc68hc11.h" #include "sound/okim6295.h" +#include "speaker.h" + #include "30test.lh" #define MAIN_CLOCK XTAL_16MHz diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index e85eca6370f..49cd262b39b 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -28,6 +28,8 @@ #include "machine/eepromser.h" #include "machine/pxa255.h" #include "sound/dmadac.h" +#include "screen.h" +#include "speaker.h" class _39in1_state : public driver_device { diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp index 6aab517506c..db5db112604 100644 --- a/src/mame/drivers/3do.cpp +++ b/src/mame/drivers/3do.cpp @@ -95,9 +95,11 @@ Part list of Goldstar 3DO Interactive Multiplayer #include "emu.h" #include "includes/3do.h" -#include "imagedev/chd_cd.h" + #include "cpu/arm/arm.h" #include "cpu/arm7/arm7.h" +#include "imagedev/chd_cd.h" +#include "screen.h" #define X2_CLOCK_PAL 59000000 diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp index 2417d15debb..814333ff455 100644 --- a/src/mame/drivers/3x3puzzl.cpp +++ b/src/mame/drivers/3x3puzzl.cpp @@ -43,6 +43,8 @@ Notes: #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_10MHz diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp index d383d35df13..db89509ff84 100644 --- a/src/mame/drivers/4004clk.cpp +++ b/src/mame/drivers/4004clk.cpp @@ -12,6 +12,8 @@ #include "cpu/i4004/i4004.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "4004clk.lh" class nixieclock_state : public driver_device diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp index 417429e9e17..4ab8a49dc7f 100644 --- a/src/mame/drivers/40love.cpp +++ b/src/mame/drivers/40love.cpp @@ -223,11 +223,15 @@ Notes - Has jumper setting for 122HZ or 61HZ) #include "emu.h" #include "includes/40love.h" + #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + void fortyl_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index 1ed49924c8e..b7d359fc845 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -17,6 +17,7 @@ #include "emu.h" #include "cpu/mips/r3000.h" +#include "screen.h" struct ip6_regs_t diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp index 084ca4ba964..7651be0d2d6 100644 --- a/src/mame/drivers/4enlinea.cpp +++ b/src/mame/drivers/4enlinea.cpp @@ -186,6 +186,16 @@ *************************************************************************/ +#include "emu.h" +#include "bus/isa/cga.h" +#include "bus/isa/isa.h" +#include "cpu/z80/z80.h" +#include "sound/ay8910.h" +#include "video/cgapal.h" +#include "video/mc6845.h" +#include "speaker.h" + + #define MAIN_CLOCK XTAL_16MHz #define SEC_CLOCK XTAL_8MHz #define HCGA_CLOCK XTAL_14_31818MHz @@ -195,15 +205,6 @@ #define SND_AY_CLOCK SEC_CLOCK /4 /* 2 MHz. (measured) */ #define CRTC_CLOCK SEC_CLOCK /2 /* 8 MHz. (measured) */ - -#include "emu.h" -#include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "sound/ay8910.h" -#include "bus/isa/isa.h" -#include "bus/isa/cga.h" -#include "video/cgapal.h" - class _4enlinea_state : public driver_device { public: @@ -211,7 +212,7 @@ public: : driver_device(mconfig, type, tag), m_ay(*this, "aysnd"), m_maincpu(*this, "maincpu") - { } + { } required_device m_ay; @@ -257,7 +258,7 @@ const tiny_rom_entry *isa8_cga_4enlinea_device::device_rom_region() const return nullptr; } -const device_type ISA8_CGA_4ENLINEA = &device_creator; +const device_type ISA8_CGA_4ENLINEA = device_creator; isa8_cga_4enlinea_device::isa8_cga_4enlinea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_cga_device( mconfig, ISA8_CGA_4ENLINEA, "ISA8_CGA_4ENLINEA", tag, owner, clock, "4enlinea_cga", __FILE__) diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp index a546f764d5f..199172c4f45 100644 --- a/src/mame/drivers/4enraya.cpp +++ b/src/mame/drivers/4enraya.cpp @@ -119,9 +119,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/4enraya.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" -#include "includes/4enraya.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_8MHz diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp index acfa158233b..8d7a41c02d4 100644 --- a/src/mame/drivers/4roses.cpp +++ b/src/mame/drivers/4roses.cpp @@ -172,15 +172,19 @@ ***********************************************************************************/ -#define MASTER_CLOCK XTAL_16MHz - #include "emu.h" +#include "includes/funworld.h" + #include "cpu/m6502/m65c02.h" -#include "video/mc6845.h" -#include "sound/ay8910.h" #include "machine/nvram.h" -#include "includes/funworld.h" +#include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_16MHz class _4roses_state : public funworld_state { diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index 56cdac32fe2..3fad2e4af5a 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -441,16 +441,18 @@ *******************************************************************************/ - -#define MASTER_CLOCK XTAL_10MHz - #include "emu.h" #include "cpu/m6502/m6502.h" -#include "video/mc6845.h" #include "machine/6821pia.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/okim6295.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_10MHz class _5clown_state : public driver_device diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index d8f2987d712..22a356902fb 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -194,12 +194,14 @@ *****************************************************************************/ #include "emu.h" +#include "includes/8080bw.h" + #include "cpu/m6800/m6800.h" #include "cpu/i8085/i8085.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "sound/speaker.h" -#include "includes/8080bw.h" + +#include "speaker.h" #include "attackfc.lh" #include "cosmicm.lh" diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index 5ec57a8a11e..17364b242d5 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -7,13 +7,17 @@ ***************************************************************************/ #include "emu.h" +#include "includes/88games.h" + #include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" -#include "sound/ym2151.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/88games.h" +#include "sound/ym2151.h" + +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index 3613753f6e4..3130f962317 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -27,7 +27,9 @@ TODO: #include "bus/vcs/scharger.h" #include "bus/vcs/compumat.h" #include "bus/vcs_ctrl/ctrl.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #if USE_NEW_RIOT diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp index 148eae300a2..7b0cdd48a33 100644 --- a/src/mame/drivers/a5105.cpp +++ b/src/mame/drivers/a5105.cpp @@ -20,18 +20,22 @@ ToDo: ****************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "video/upd7220.h" +#include "imagedev/cassette.h" +#include "imagedev/flopdrv.h" #include "machine/ram.h" #include "machine/upd765.h" -#include "formats/a5105_dsk.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" -#include "imagedev/cassette.h" -#include "imagedev/flopdrv.h" -#include "sound/wave.h" #include "sound/beep.h" +#include "sound/wave.h" +#include "video/upd7220.h" + +#include "screen.h" +#include "speaker.h" +#include "formats/a5105_dsk.h" class a5105_state : public driver_device diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp index 39c613d64dc..80162f77bfd 100644 --- a/src/mame/drivers/a51xx.cpp +++ b/src/mame/drivers/a51xx.cpp @@ -14,6 +14,8 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" + class a51xx_state : public driver_device { diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp index 6e0da15aac4..fbf33520990 100644 --- a/src/mame/drivers/a6809.cpp +++ b/src/mame/drivers/a6809.cpp @@ -57,6 +57,8 @@ enter show next address #include "video/mc6845.h" #include "imagedev/cassette.h" #include "sound/wave.h" +#include "screen.h" +#include "speaker.h" class a6809_state : public driver_device diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp index 825413856a8..d681f7140d7 100644 --- a/src/mame/drivers/a7150.cpp +++ b/src/mame/drivers/a7150.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "cpu/i86/i86.h" +#include "screen.h" class a7150_state : public driver_device diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp index 7477b35cc0f..9c61a85c3c3 100644 --- a/src/mame/drivers/a7800.cpp +++ b/src/mame/drivers/a7800.cpp @@ -103,7 +103,9 @@ #include "machine/mos6530n.h" #include "video/maria.h" #include "bus/a7800/a78_carts.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #define A7800_NTSC_Y1 XTAL_14_31818MHz #define CLK_PAL 1773447 diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp index 00e468750b5..69e29745673 100644 --- a/src/mame/drivers/aa310.cpp +++ b/src/mame/drivers/aa310.cpp @@ -84,8 +84,9 @@ #include "emu.h" -#include "cpu/arm/arm.h" #include "includes/archimds.h" + +#include "cpu/arm/arm.h" #include "formats/acorn_dsk.h" #include "formats/apd_dsk.h" #include "machine/i2cmem.h" @@ -93,6 +94,7 @@ #include "machine/wd_fdc.h" #include "sound/volt_reg.h" #include "softlist.h" +#include "speaker.h" class aa310_state : public archimedes_state { diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index f52b903183d..0d9e2655a8f 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -76,7 +76,9 @@ Notes: #include "emu.h" #include "includes/abc80.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index f41cc37831b..c64c80b9bba 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -153,6 +153,7 @@ Notes: #include "video/abc802.h" #include "video/abc806.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp index ba3f64c8836..3f3dc6518d6 100644 --- a/src/mame/drivers/ac1.cpp +++ b/src/mame/drivers/ac1.cpp @@ -19,11 +19,15 @@ ****************************************************************************/ #include "emu.h" +#include "includes/ac1.h" + #include "cpu/z80/z80.h" -#include "machine/z80pio.h" #include "imagedev/cassette.h" +#include "machine/z80pio.h" #include "sound/wave.h" -#include "includes/ac1.h" +#include "screen.h" +#include "speaker.h" + static GFXDECODE_START( ac1 ) GFXDECODE_ENTRY( "gfx1", 0x0000, ac1_charlayout, 0, 1 ) diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp index 711ed70fe55..a7c855c71ef 100644 --- a/src/mame/drivers/ace.cpp +++ b/src/mame/drivers/ace.cpp @@ -41,6 +41,7 @@ A1 2101 2101 #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" #include "ace.lh" diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp index 40741a064c7..1b67896a6c6 100644 --- a/src/mame/drivers/acefruit.cpp +++ b/src/mame/drivers/acefruit.cpp @@ -14,6 +14,7 @@ Inputs and Dip Switches by Stephh #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "screen.h" #include "sidewndr.lh" diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp index e26422f13af..4c1e55cf97a 100644 --- a/src/mame/drivers/aces1.cpp +++ b/src/mame/drivers/aces1.cpp @@ -26,11 +26,14 @@ JPM style Reel MCU? Certainly reel data seems to be muxed together in aweird way #include "emu.h" +#include "video/awpvid.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/i8255.h" #include "machine/steppers.h" -#include "video/awpvid.h" +#include "speaker.h" + #include "aces1.lh" // MFME2MAME layouts: diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp index a410152deb4..2debf884361 100644 --- a/src/mame/drivers/acommand.cpp +++ b/src/mame/drivers/acommand.cpp @@ -60,6 +60,8 @@ JALCF1 BIN 1,048,576 02-07-99 1:11a JALCF1.BIN #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class acommand_state : public driver_device diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp index 480719fb6b8..a9faef5e6df 100644 --- a/src/mame/drivers/acrnsys1.cpp +++ b/src/mame/drivers/acrnsys1.cpp @@ -52,6 +52,8 @@ Note that left-most digit is not wired up, and therefore will always be blank. #include "machine/74145.h" #include "imagedev/cassette.h" #include "sound/wave.h" +#include "speaker.h" + #include "acrnsys1.lh" diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp index 6d898b20901..679feec959e 100644 --- a/src/mame/drivers/actfancr.cpp +++ b/src/mame/drivers/actfancr.cpp @@ -25,12 +25,15 @@ *******************************************************************************/ #include "emu.h" +#include "includes/actfancr.h" + #include "cpu/m6502/m6502.h" #include "cpu/h6280/h6280.h" #include "sound/2203intf.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/actfancr.h" +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp index 918132a6ae9..230518deb05 100644 --- a/src/mame/drivers/adam.cpp +++ b/src/mame/drivers/adam.cpp @@ -301,7 +301,9 @@ Mark Gordon #include "emu.h" #include "includes/adam.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index ee1c0d38363..eec373a4bf3 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -156,13 +156,15 @@ Quick Jack administration/service mode: #include "emu.h" #include "cpu/m68000/m68000.h" -#include "sound/ay8910.h" -#include "video/hd63484.h" -#include "machine/microtch.h" #include "machine/mc68681.h" +#include "machine/microtch.h" #include "machine/msm6242.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/hd63484.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" class adp_state : public driver_device diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp index 077970ef936..d715478c9ec 100644 --- a/src/mame/drivers/advision.cpp +++ b/src/mame/drivers/advision.cpp @@ -19,10 +19,14 @@ #include "emu.h" #include "includes/advision.h" + #include "cpu/mcs48/mcs48.h" #include "cpu/cop400/cop400.h" #include "sound/volt_reg.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + /* Memory Maps */ diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp index c06625387cf..25dd1ee8cf4 100644 --- a/src/mame/drivers/aeroboto.cpp +++ b/src/mame/drivers/aeroboto.cpp @@ -25,10 +25,14 @@ Revisions: ****************************************************************************/ #include "emu.h" +#include "includes/aeroboto.h" + #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" -#include "includes/aeroboto.h" + +#include "screen.h" +#include "speaker.h" READ8_MEMBER(aeroboto_state::aeroboto_201_r) diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 2fb4748ccdd..b9695300597 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -61,11 +61,14 @@ Verification still needed for the other PCBs. ***************************************************************************/ #include "emu.h" +#include "includes/aerofgt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/2610intf.h" #include "sound/3812intf.h" -#include "includes/aerofgt.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(aerofgt_state::sound_command_w) diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp index 986b9d3771c..42ac7a8e293 100644 --- a/src/mame/drivers/age_candy.cpp +++ b/src/mame/drivers/age_candy.cpp @@ -13,6 +13,7 @@ Device is a 27c256 location U3 */ #include "emu.h" +#include "speaker.h" class age_candy_state : public driver_device diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp index c454952b037..24345c59557 100644 --- a/src/mame/drivers/aim65.cpp +++ b/src/mame/drivers/aim65.cpp @@ -26,7 +26,10 @@ Bugs #include "emu.h" #include "includes/aim65.h" + #include "softlist.h" +#include "speaker.h" + #include "aim65.lh" diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp index ceb26ccd0c3..847e509686d 100644 --- a/src/mame/drivers/airbustr.cpp +++ b/src/mame/drivers/airbustr.cpp @@ -220,10 +220,13 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit */ #include "emu.h" +#include "includes/airbustr.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/airbustr.h" +#include "speaker.h" + /* Read/Write Handlers */ READ8_MEMBER(airbustr_state::devram_r) diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index 4d38e6d20ea..483e0215932 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -149,23 +149,26 @@ Stephh's notes (based on the game Z80 code and some tests) : #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/ym2151.h" #include "audio/seibu.h" #include "video/airraid_dev.h" +#include "cpu/z80/z80.h" +#include "sound/ym2151.h" +#include "speaker.h" + + class airraid_state : public driver_device { public: airraid_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_seibu_sound(*this, "seibu_sound"), - m_mainram(*this, "mainram"), - m_palette(*this, "palette"), - m_decrypted_opcodes(*this, "decrypted_opcodes"), - m_airraid_video(*this,"airraid_vid") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_seibu_sound(*this, "seibu_sound") + , m_mainram(*this, "mainram") + , m_palette(*this, "palette") + , m_decrypted_opcodes(*this, "decrypted_opcodes") + , m_airraid_video(*this,"airraid_vid") + { } required_device m_maincpu; diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp index f2e1680228f..71e22cdc537 100644 --- a/src/mame/drivers/ajax.cpp +++ b/src/mame/drivers/ajax.cpp @@ -13,12 +13,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/ajax.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "cpu/m6809/konami.h" #include "sound/ym2151.h" -#include "includes/ajax.h" -#include "includes/konamipt.h" +#include "speaker.h" + static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8, ajax_state ) AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ls138_f10_r, ls138_f10_w) /* bankswitch + sound command + FIRQ command */ diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp index c69d8d9f75f..48b5b9cf030 100644 --- a/src/mame/drivers/albazc.cpp +++ b/src/mame/drivers/albazc.cpp @@ -15,6 +15,8 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class albazc_state : public driver_device { diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp index f5d2978b4be..87631b6fc1a 100644 --- a/src/mame/drivers/albazg.cpp +++ b/src/mame/drivers/albazg.cpp @@ -41,6 +41,8 @@ PCB: #include "machine/watchdog.h" #include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_12MHz diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp index 2dcc1a094bd..6f6893ec760 100644 --- a/src/mame/drivers/aleck64.cpp +++ b/src/mame/drivers/aleck64.cpp @@ -174,10 +174,14 @@ Notes: */ #include "emu.h" +#include "includes/n64.h" + #include "cpu/rsp/rsp.h" #include "cpu/mips/mips3.h" #include "sound/dmadac.h" -#include "includes/n64.h" +#include "screen.h" +#include "speaker.h" + class aleck64_state : public n64_state { diff --git a/src/mame/drivers/aleisttl.cpp b/src/mame/drivers/aleisttl.cpp index 51c2e64ff1a..dce966f2c5e 100644 --- a/src/mame/drivers/aleisttl.cpp +++ b/src/mame/drivers/aleisttl.cpp @@ -30,6 +30,7 @@ #include "machine/netlist.h" #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" +#include "screen.h" // copied by Pong, not accurate for this driver! // start diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp index d8c117ce0b9..5c6710d4630 100644 --- a/src/mame/drivers/alesis.cpp +++ b/src/mame/drivers/alesis.cpp @@ -15,6 +15,7 @@ #include "emu.h" #include "includes/alesis.h" #include "sr16.lh" +#include "screen.h" WRITE8_MEMBER( alesis_state::kb_matrix_w ) diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 258e2df1a35..4a41651b219 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -23,12 +23,13 @@ **************************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" -#include "render.h" #include "includes/amiga.h" +#include "cpu/m68000/m68000.h" #include "machine/ldp1450.h" #include "machine/nvram.h" #include "machine/amigafdc.h" +#include "render.h" +#include "speaker.h" class alg_state : public amiga_state diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp index e3104b47231..4b18f13034e 100644 --- a/src/mame/drivers/alien.cpp +++ b/src/mame/drivers/alien.cpp @@ -18,6 +18,8 @@ #include "emu.h" #include "cpu/sh4/sh4.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_200MHz diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index 257c70ab0ab..4809e3846e6 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -10,12 +10,14 @@ Preliminary driver by: ***************************************************************************/ #include "emu.h" +#include "includes/aliens.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/aliens.h" +#include "speaker.h" WRITE8_MEMBER(aliens_state::aliens_coin_counter_w) diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp index f3f7b3781b6..f7d83ccc975 100644 --- a/src/mame/drivers/alinvade.cpp +++ b/src/mame/drivers/alinvade.cpp @@ -22,8 +22,12 @@ #include "emu.h" #include "cpu/m6502/m6502.h" #include "sound/discrete.h" +#include "screen.h" +#include "speaker.h" + #include "alinvade.lh" + class alinvade_state : public driver_device { public: diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index df37a9da3f3..43f9acf7a42 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -186,6 +186,7 @@ DIP locations verified from manuals for: #include "emu.h" #include "includes/alpha68k.h" + #include "cpu/m68000/m68000.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" @@ -195,7 +196,8 @@ DIP locations verified from manuals for: #include "sound/dac.h" #include "sound/volt_reg.h" #include "sound/ym2413.h" - +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 8e2e440bcb9..86b6145ab2b 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -18,6 +18,7 @@ #include "machine/ram.h" #include "video/hd44780.h" #include "rendlay.h" +#include "screen.h" class alphasmart_state : public driver_device { diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp index 10960dd493d..9380cd1db3a 100644 --- a/src/mame/drivers/alphatro.cpp +++ b/src/mame/drivers/alphatro.cpp @@ -38,14 +38,16 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "machine/i8251.h" -#include "machine/clock.h" #include "imagedev/cassette.h" +#include "machine/clock.h" +#include "machine/i8251.h" +#include "machine/ram.h" #include "sound/beep.h" #include "sound/wave.h" -#include "machine/ram.h" +#include "video/mc6845.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_4MHz diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index cd69efbe400..3d3ae5cdb9e 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -6,10 +6,11 @@ ***************************************************************************/ #include "emu.h" -#include "rendlay.h" -#include "sound/speaker.h" #include "cpu/alto2/alto2cpu.h" #include "machine/diablo_hd.h" +#include "screen.h" +#include "rendlay.h" +#include "speaker.h" class alto2_state : public driver_device { diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp index be832f8c9cf..443e13a0f7e 100644 --- a/src/mame/drivers/amaticmg.cpp +++ b/src/mame/drivers/amaticmg.cpp @@ -410,22 +410,24 @@ ***********************************************************************************/ -#define MASTER_CLOCK XTAL_16MHz -#define CPU_CLOCK MASTER_CLOCK/4 /* guess */ -#define SND_CLOCK MASTER_CLOCK/4 /* guess */ -#define CRTC_CLOCK MASTER_CLOCK/8 /* guess */ - - #include "emu.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" #include "machine/i8255.h" #include "sound/3812intf.h" +#include "video/mc6845.h" //#include "sound/dac.h" +#include "screen.h" +#include "speaker.h" #include "suprstar.lh" +#define MASTER_CLOCK XTAL_16MHz +#define CPU_CLOCK MASTER_CLOCK/4 /* guess */ +#define SND_CLOCK MASTER_CLOCK/4 /* guess */ +#define CRTC_CLOCK MASTER_CLOCK/8 /* guess */ + + class amaticmg_state : public driver_device { public: diff --git a/src/mame/drivers/amazonlf.cpp b/src/mame/drivers/amazonlf.cpp index c5273db0d7d..8cf69f73a26 100644 --- a/src/mame/drivers/amazonlf.cpp +++ b/src/mame/drivers/amazonlf.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "cpu/se3208/se3208.h" +#include "screen.h" class amazonlf_state : public driver_device diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp index 1bd1ed724b6..963881a350e 100644 --- a/src/mame/drivers/ambush.cpp +++ b/src/mame/drivers/ambush.cpp @@ -47,6 +47,8 @@ #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp index aa8a19ae9e2..9813a6f0379 100644 --- a/src/mame/drivers/amerihok.cpp +++ b/src/mame/drivers/amerihok.cpp @@ -17,6 +17,7 @@ Processor is unknown #include "emu.h" #include "sound/okim6295.h" +#include "speaker.h" class amerihok_state : public driver_device diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index 868ce35a369..7942fe75515 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -24,6 +24,7 @@ #include "machine/cr511b.h" #include "machine/rp5c01.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp index ac9028853cd..4064a91aa5b 100644 --- a/src/mame/drivers/ampoker2.cpp +++ b/src/mame/drivers/ampoker2.cpp @@ -377,12 +377,16 @@ #define MASTER_CLOCK XTAL_6MHz #include "emu.h" +#include "includes/ampoker2.h" + #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #include "ampoker2.lh" #include "sigmapkr.lh" -#include "includes/ampoker2.h" /********************** * Read/Write Handlers * diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp index 750cee42f04..2cd9a43f0f3 100644 --- a/src/mame/drivers/amspdwy.cpp +++ b/src/mame/drivers/amspdwy.cpp @@ -16,8 +16,10 @@ Sound: YM2151 ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/amspdwy.h" +#include "cpu/z80/z80.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index 4cc247e17ea..78d6f3ac514 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -110,6 +110,7 @@ Some bugs left : #include "machine/ram.h" #include "softlist.h" +#include "speaker.h" #define MANUFACTURER_NAME 0x07 #define TV_REFRESH_RATE 0x10 diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index b367be69283..0204669d39e 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -70,6 +70,21 @@ *******************************************************************************/ +#include "emu.h" +#include "cpu/i86/i86.h" +#include "machine/i8155.h" +#include "machine/i8255.h" +#include "machine/msm5832.h" +#include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ticket.h" +#include "sound/sn76496.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + +#include "amusco.lh" + #define MASTER_CLOCK XTAL_22_1184MHz /* confirmed */ #define SECOND_CLOCK XTAL_15MHz /* confirmed */ @@ -82,18 +97,6 @@ #define COIN_IMPULSE 3 -#include "emu.h" -#include "cpu/i86/i86.h" -#include "video/mc6845.h" -#include "machine/i8155.h" -#include "machine/i8255.h" -#include "sound/sn76496.h" -#include "machine/pic8259.h" -#include "machine/pit8253.h" -#include "machine/msm5832.h" -#include "machine/ticket.h" -#include "amusco.lh" - class amusco_state : public driver_device { diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index aede4b8c60a..ddfabb1315d 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -82,13 +82,15 @@ ToDo: #include "emu.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "machine/upd765.h" +#include "machine/i8251.h" +#include "machine/i8255.h" #include "machine/keyboard.h" #include "machine/pit8253.h" -#include "machine/i8255.h" -#include "machine/i8251.h" +#include "machine/upd765.h" #include "sound/beep.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class amust_state : public driver_device diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp index a3c9500c2e5..508ee65216f 100644 --- a/src/mame/drivers/angelkds.cpp +++ b/src/mame/drivers/angelkds.cpp @@ -124,13 +124,15 @@ Dumped by Chackn #include "emu.h" +#include "includes/angelkds.h" + #include "cpu/z80/z80.h" +#include "machine/i8255.h" #include "machine/segacrp2_device.h" #include "sound/2203intf.h" -#include "includes/angelkds.h" -#include "machine/i8255.h" - +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/anzterm.cpp b/src/mame/drivers/anzterm.cpp index f65a2d4e7f9..a35bb37c52d 100644 --- a/src/mame/drivers/anzterm.cpp +++ b/src/mame/drivers/anzterm.cpp @@ -350,6 +350,7 @@ Components: #include "machine/6850acia.h" #include "machine/i8214.h" #include "machine/mc6854.h" +#include "screen.h" namespace { diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp index a103be3142e..6d5a6014e8e 100644 --- a/src/mame/drivers/apc.cpp +++ b/src/mame/drivers/apc.cpp @@ -54,15 +54,17 @@ #include "emu.h" #include "cpu/i86/i86.h" -#include "sound/upd1771.h" +#include "machine/am9517a.h" +#include "machine/nvram.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/am9517a.h" -#include "machine/upd765.h" #include "machine/upd1990a.h" -#include "machine/nvram.h" +#include "machine/upd765.h" +#include "sound/upd1771.h" #include "video/upd7220.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" //#include "sound/ay8910.h" #define MAIN_CLOCK XTAL_5MHz diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp index 4e2337ad84d..434ff5f9c14 100644 --- a/src/mame/drivers/apexc.cpp +++ b/src/mame/drivers/apexc.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "cpu/apexc/apexc.h" +#include "screen.h" class apexc_state : public driver_device @@ -96,7 +97,7 @@ private: int m_writable; }; -const device_type APEXC_CYLINDER = &device_creator; +const device_type APEXC_CYLINDER = device_creator; apexc_cylinder_image_device::apexc_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APEXC_CYLINDER, "APEXC Cylinder", tag, owner, clock, "apexc_cylinder_image", __FILE__), @@ -218,7 +219,7 @@ protected: virtual void device_start() override { } }; -const device_type APEXC_TAPE_PUNCHER = &device_creator; +const device_type APEXC_TAPE_PUNCHER = device_creator; apexc_tape_puncher_image_device::apexc_tape_puncher_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APEXC_TAPE_PUNCHER, "APEXC Tape Puncher", tag, owner, clock, "apexc_tape_puncher_image", __FILE__), @@ -250,7 +251,7 @@ protected: virtual void device_start() override { } }; -const device_type APEXC_TAPE_READER = &device_creator; +const device_type APEXC_TAPE_READER = device_creator; apexc_tape_reader_image_device::apexc_tape_reader_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APEXC_TAPE_READER, "APEXC Tape Reader", tag, owner, clock, "apexc_tape_reader_image", __FILE__), diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp index 75f6e772a93..4560eb43d4b 100644 --- a/src/mame/drivers/apf.cpp +++ b/src/mame/drivers/apf.cpp @@ -69,20 +69,24 @@ ToDo: ******************************************************************************************************************/ #include "emu.h" + #include "cpu/m6800/m6800.h" -#include "video/mc6847.h" -#include "sound/speaker.h" -#include "sound/wave.h" -#include "machine/6821pia.h" -#include "machine/wd_fdc.h" -#include "imagedev/cassette.h" #include "formats/apf_apt.h" +#include "imagedev/cassette.h" +#include "machine/6821pia.h" #include "machine/ram.h" +#include "machine/wd_fdc.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "video/mc6847.h" #include "bus/apf/slot.h" #include "bus/apf/rom.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class apf_state : public driver_device { diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp index dce85b753b8..eb402beb804 100644 --- a/src/mame/drivers/apogee.cpp +++ b/src/mame/drivers/apogee.cpp @@ -10,15 +10,21 @@ #include "emu.h" +#include "includes/radio86.h" + #include "cpu/i8085/i8085.h" -#include "sound/wave.h" -#include "sound/speaker.h" +#include "imagedev/cassette.h" #include "machine/i8255.h" #include "machine/pit8253.h" -#include "imagedev/cassette.h" -#include "formats/rk_cas.h" -#include "includes/radio86.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/rk_cas.h" + class apogee_state : public radio86_state { diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index 0610626d2b9..957de372d17 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -23,19 +23,25 @@ * - data sheets from Intel and Motorola */ +#include "emu.h" + #define VERBOSE 0 -#include "emu.h" #include "includes/apollo.h" -#include "debugger.h" + #include "cpu/m68000/m68kcpu.h" #include "sound/beep.h" -#include "apollo_dsp.lh" // we use set_verbose #include "bus/isa/omti8621.h" #include "bus/isa/3c505.h" +#include "debugger.h" +#include "speaker.h" + +#include "apollo_dsp.lh" + + #define TERMINAL_TAG "terminal" // we use this to prevent excessive logging (if emulation runs amok) diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index 99d7f4b58b0..b343274879f 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -80,6 +80,7 @@ #include "bus/a1bus/a1cassette.h" #include "bus/a1bus/a1cffa.h" +#include "screen.h" #include "softlist.h" #define A1_CPU_TAG "maincpu" diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 17a77f3ba3a..409dfd8f671 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -39,50 +39,49 @@ II Plus: RAM options reduced to 16/32/48 KB. ************************************************************************/ #include "emu.h" -#include "machine/bankdev.h" -#include "machine/ram.h" -#include "machine/kb3600.h" -#include "sound/speaker.h" -#include "imagedev/flopdrv.h" -#include "imagedev/cassette.h" -#include "formats/ap2_dsk.h" -#include "cpu/m6502/m6502.h" #include "includes/apple2.h" #include "video/apple2.h" -#include "bus/a2bus/a2bus.h" +#include "machine/bankdev.h" +#include "imagedev/flopdrv.h" + +#include "bus/a2bus/a2alfam2.h" +#include "bus/a2bus/a2applicard.h" +#include "bus/a2bus/a2arcadebd.h" +#include "bus/a2bus/a2cffa.h" +#include "bus/a2bus/a2corvus.h" #include "bus/a2bus/a2diskii.h" #include "bus/a2bus/a2diskiing.h" -#include "bus/a2bus/a2mockingboard.h" -#include "bus/a2bus/a2cffa.h" +#include "bus/a2bus/a2dx1.h" +#include "bus/a2bus/a2echoii.h" +#include "bus/a2bus/a2mcms.h" #include "bus/a2bus/a2memexp.h" +#include "bus/a2bus/a2midi.h" +#include "bus/a2bus/a2mockingboard.h" +#include "bus/a2bus/a2pic.h" +#include "bus/a2bus/a2sam.h" #include "bus/a2bus/a2scsi.h" -#include "bus/a2bus/a2thunderclock.h" #include "bus/a2bus/a2softcard.h" -#include "bus/a2bus/a2videoterm.h" #include "bus/a2bus/a2ssc.h" #include "bus/a2bus/a2swyft.h" #include "bus/a2bus/a2themill.h" -#include "bus/a2bus/a2sam.h" -#include "bus/a2bus/a2alfam2.h" -#include "bus/a2bus/laser128.h" -#include "bus/a2bus/a2echoii.h" -#include "bus/a2bus/a2arcadebd.h" -#include "bus/a2bus/a2midi.h" -#include "bus/a2bus/a2zipdrive.h" -#include "bus/a2bus/a2applicard.h" +#include "bus/a2bus/a2thunderclock.h" #include "bus/a2bus/a2ultraterm.h" -#include "bus/a2bus/a2pic.h" -#include "bus/a2bus/a2corvus.h" -#include "bus/a2bus/a2mcms.h" -#include "bus/a2bus/a2dx1.h" -#include "bus/a2bus/timemasterho.h" +#include "bus/a2bus/a2videoterm.h" +#include "bus/a2bus/a2zipdrive.h" +#include "bus/a2bus/ezcgi.h" +#include "bus/a2bus/laser128.h" #include "bus/a2bus/mouse.h" -#include "bus/a2bus/ramcard16k.h" #include "bus/a2bus/ramcard128k.h" -#include "bus/a2bus/ezcgi.h" +#include "bus/a2bus/ramcard16k.h" +#include "bus/a2bus/timemasterho.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/ap2_dsk.h" + #define A2_CPU_TAG "maincpu" #define A2_KBDC_TAG "ay3600" diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index 80d3cc41f95..b00021c6f61 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -97,23 +97,20 @@ Address bus A0-A11 is Y0-Y11 ***************************************************************************/ #include "emu.h" -#include "machine/bankdev.h" -#include "machine/ram.h" -#include "machine/kb3600.h" -#include "sound/speaker.h" -#include "imagedev/flopdrv.h" -#include "imagedev/cassette.h" -#include "formats/ap2_dsk.h" +#include "video/apple2.h" + #include "cpu/m6502/m6502.h" #include "cpu/m6502/m65c02.h" -#include "cpu/z80/z80.h" #include "cpu/mcs48/mcs48.h" -#include "formats/ap_dsk35.h" -#include "machine/sonydriv.h" +#include "cpu/z80/z80.h" +#include "imagedev/cassette.h" +#include "imagedev/flopdrv.h" #include "machine/appldriv.h" -#include "bus/rs232/rs232.h" +#include "machine/bankdev.h" +#include "machine/kb3600.h" #include "machine/mos6551.h" -#include "video/apple2.h" +#include "machine/ram.h" +#include "machine/sonydriv.h" #include "bus/a2bus/a2bus.h" #include "bus/a2bus/a2diskii.h" @@ -150,7 +147,15 @@ Address bus A0-A11 is Y0-Y11 #include "bus/a2bus/a2eext80col.h" #include "bus/a2bus/a2eramworks3.h" +#include "bus/rs232/rs232.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/ap2_dsk.h" +#include "formats/ap_dsk35.h" + #define A2_CPU_TAG "maincpu" #define A2_KBDC_TAG "ay3600" diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 5d31f13b25e..251c754b77c 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -44,22 +44,18 @@ #include "emu.h" -#include "cpu/g65816/g65816.h" #include "includes/apple2.h" #include "includes/apple2e.h" -#include "imagedev/flopdrv.h" -#include "formats/ap2_dsk.h" -#include "formats/ap_dsk35.h" #include "includes/apple2gs.h" -#include "machine/sonydriv.h" + +#include "cpu/g65816/g65816.h" +#include "imagedev/flopdrv.h" #include "machine/appldriv.h" -#include "sound/es5503.h" #include "machine/applefdc.h" +#include "machine/sonydriv.h" #include "machine/z80scc.h" -#include "sound/speaker.h" -#include "machine/ram.h" +#include "sound/es5503.h" -#include "bus/a2bus/a2bus.h" #include "bus/a2bus/a2diskii.h" #include "bus/a2bus/a2mockingboard.h" #include "bus/a2bus/a2cffa.h" @@ -78,9 +74,13 @@ //#include "bus/a2bus/a2udrive.h" #include "bus/a2bus/a2hsscsi.h" -#include "bus/rs232/rs232.h" - +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/ap_dsk35.h" +#include "formats/ap2_dsk.h" + static const gfx_layout apple2gs_text_layout = { diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp index 68a43923597..d78f7c6e80b 100644 --- a/src/mame/drivers/apple3.cpp +++ b/src/mame/drivers/apple3.cpp @@ -19,7 +19,6 @@ #include "emu.h" #include "includes/apple3.h" #include "includes/apple2.h" -#include "bus/rs232/rs232.h" #include "sound/volt_reg.h" #include "formats/ap2_dsk.h" @@ -28,7 +27,11 @@ #include "bus/a2bus/a2thunderclock.h" #include "bus/a2bus/mouse.h" +#include "bus/rs232/rs232.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" static ADDRESS_MAP_START( apple3_map, AS_PROGRAM, 8, apple3_state ) AM_RANGE(0x0000, 0xffff) AM_READWRITE(apple3_memory_r, apple3_memory_w) diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp index f0a23ef55f1..04316b8a2a3 100644 --- a/src/mame/drivers/applix.cpp +++ b/src/mame/drivers/applix.cpp @@ -35,18 +35,23 @@ ****************************************************************************/ #include "emu.h" + +#include "bus/centronics/ctronics.h" #include "cpu/m68000/m68000.h" -#include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" -#include "video/mc6845.h" +#include "cpu/z80/z80.h" +#include "imagedev/cassette.h" #include "machine/6522via.h" #include "machine/wd_fdc.h" #include "sound/dac.h" -#include "sound/wave.h" #include "sound/volt_reg.h" +#include "sound/wave.h" +#include "video/mc6845.h" + +#include "screen.h" +#include "speaker.h" + #include "formats/applix_dsk.h" -#include "imagedev/cassette.h" -#include "bus/centronics/ctronics.h" diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp index a2aab70cc97..826102a3001 100644 --- a/src/mame/drivers/appoooh.cpp +++ b/src/mame/drivers/appoooh.cpp @@ -164,10 +164,13 @@ Language ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/appoooh.h" + +#include "cpu/z80/z80.h" #include "machine/segacrp2_device.h" #include "sound/sn76496.h" +#include "screen.h" +#include "speaker.h" WRITE_LINE_MEMBER(appoooh_state::adpcm_int) diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 91f6842d433..8926e21e3e8 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -12,24 +12,26 @@ ***************************************************************************/ #include "emu.h" +#include "bus/apricot/expansion/expansion.h" +#include "bus/apricot/keyboard/keyboard.h" +#include "bus/centronics/ctronics.h" +#include "bus/rs232/rs232.h" #include "cpu/i86/i86.h" #include "cpu/i8089/i8089.h" +#include "formats/apridisk.h" +#include "imagedev/flopdrv.h" #include "machine/ram.h" -#include "machine/pit8253.h" +#include "machine/74153.h" #include "machine/i8255.h" #include "machine/pic8259.h" -#include "machine/z80dart.h" -#include "machine/74153.h" +#include "machine/pit8253.h" #include "machine/wd_fdc.h" -#include "video/mc6845.h" +#include "machine/z80dart.h" #include "sound/sn76496.h" -#include "imagedev/flopdrv.h" -#include "formats/apridisk.h" -#include "bus/centronics/ctronics.h" -#include "bus/rs232/rs232.h" -#include "bus/apricot/expansion/expansion.h" -#include "bus/apricot/keyboard/keyboard.h" +#include "video/mc6845.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp index f6acd741289..ea689b1ea29 100644 --- a/src/mame/drivers/apricotf.cpp +++ b/src/mame/drivers/apricotf.cpp @@ -25,17 +25,18 @@ */ #include "emu.h" +#include "bus/centronics/ctronics.h" #include "cpu/i86/i86.h" #include "cpu/z80/z80daisy.h" +#include "formats/apridisk.h" #include "imagedev/flopdrv.h" #include "machine/apricotkb.h" #include "machine/buffer.h" -#include "bus/centronics/ctronics.h" +#include "machine/input_merger.h" #include "machine/wd_fdc.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" -#include "machine/input_merger.h" -#include "formats/apridisk.h" +#include "screen.h" //************************************************************************** diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index 9a7170f8d6d..e80068a7f2a 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -25,11 +25,12 @@ */ #include "emu.h" +#include "bus/centronics/ctronics.h" #include "cpu/i86/i86.h" #include "cpu/m6800/m6800.h" +#include "formats/apridisk.h" #include "machine/am9517a.h" #include "machine/apricotkb.h" -#include "bus/centronics/ctronics.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" @@ -37,7 +38,8 @@ #include "machine/z80dart.h" #include "sound/sn76496.h" #include "video/mc6845.h" -#include "formats/apridisk.h" +#include "screen.h" +#include "speaker.h" #include "apricotp.lh" diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp index 128de28049c..dd76b6167f4 100644 --- a/src/mame/drivers/aquarium.cpp +++ b/src/mame/drivers/aquarium.cpp @@ -51,10 +51,12 @@ Notes: #include "emu.h" +#include "includes/aquarium.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/ym2151.h" -#include "includes/aquarium.h" +#include "speaker.h" READ16_MEMBER(aquarium_state::aquarium_coins_r) diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp index 8aab033b2eb..987e23c69d0 100644 --- a/src/mame/drivers/aquarius.cpp +++ b/src/mame/drivers/aquarius.cpp @@ -23,7 +23,10 @@ #include "emu.h" #include "includes/aquarius.h" + #include "softlist.h" +#include "speaker.h" + /*************************************************************************** CONSTANTS diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp index df243930db2..fa511214a28 100644 --- a/src/mame/drivers/arabian.cpp +++ b/src/mame/drivers/arabian.cpp @@ -45,10 +45,14 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/mb88xx/mb88xx.h" #include "includes/arabian.h" + +#include "cpu/mb88xx/mb88xx.h" +#include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + /* constants */ #define MAIN_OSC XTAL_12MHz diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp index 9256ff64deb..8e3e2506e55 100644 --- a/src/mame/drivers/arachnid.cpp +++ b/src/mame/drivers/arachnid.cpp @@ -61,10 +61,11 @@ #include "emu.h" #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" -#include "machine/ram.h" #include "machine/6840ptm.h" +#include "machine/ram.h" +#include "sound/spkrdev.h" #include "video/tms9928a.h" -#include "sound/speaker.h" +#include "speaker.h" #define SCREEN_TAG "screen" #define M6809_TAG "u3" diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp index 1fd36da6c5f..0c6b488ea7a 100644 --- a/src/mame/drivers/arcadecl.cpp +++ b/src/mame/drivers/arcadecl.cpp @@ -69,11 +69,12 @@ #include "emu.h" +#include "includes/arcadecl.h" #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "sound/okim6295.h" #include "video/atarimo.h" -#include "includes/arcadecl.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_14_31818MHz diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp index d747a5bd795..905f0b0b70d 100644 --- a/src/mame/drivers/arcadia.cpp +++ b/src/mame/drivers/arcadia.cpp @@ -122,6 +122,7 @@ anything in hardware. No cartridge has been found which uses them. #include "emu.h" #include "includes/arcadia.h" #include "softlist.h" +#include "speaker.h" static ADDRESS_MAP_START( arcadia_mem, AS_PROGRAM, 8, arcadia_state ) AM_RANGE( 0x0000, 0x0fff) AM_DEVREAD("cartslot", arcadia_cart_slot_device, read_rom) diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp index 6aac2c8c2eb..26658e884d0 100644 --- a/src/mame/drivers/argo.cpp +++ b/src/mame/drivers/argo.cpp @@ -25,6 +25,7 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class argo_state : public driver_device @@ -40,7 +41,7 @@ public: , m_maincpu(*this, "maincpu") , m_p_videoram(*this, "videoram") , m_p_chargen(*this, "chargen") - { } + { } DECLARE_WRITE8_MEMBER(argo_videoram_w); DECLARE_READ8_MEMBER(argo_io_r); diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp index 36e9d6606ce..d70019516d4 100644 --- a/src/mame/drivers/argus.cpp +++ b/src/mame/drivers/argus.cpp @@ -120,10 +120,12 @@ Known issues : #include "emu.h" +#include "includes/argus.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "includes/argus.h" +#include "speaker.h" void argus_state::machine_start() diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp index 0ccc8880f28..c551afcf7f3 100644 --- a/src/mame/drivers/aristmk4.cpp +++ b/src/mame/drivers/aristmk4.cpp @@ -320,6 +320,8 @@ #include "sound/samples.h" #include "machine/mc146818.h" // DALLAS1287 is functionally compatible. #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" // Button panel and lamps #include "aristmk4.lh" // AU 90cr with gamble diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp index 0951825a890..181536eb02f 100644 --- a/src/mame/drivers/aristmk5.cpp +++ b/src/mame/drivers/aristmk5.cpp @@ -167,10 +167,9 @@ *****************************************************************************************************************/ -#define MASTER_CLOCK XTAL_72MHz /* confirmed */ - #include "emu.h" #include "includes/archimds.h" + #include "cpu/arm/arm.h" #include "machine/ds1302.h" #include "machine/watchdog.h" @@ -181,10 +180,13 @@ #include "machine/ins8250.h" #include "machine/ticket.h" #include "sound/volt_reg.h" +#include "speaker.h" #include "aristmk5.lh" #include "aristmk5_us.lh" +#define MASTER_CLOCK XTAL_72MHz /* confirmed */ + class aristmk5_state : public archimedes_state { public: diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index bbe82626e13..23fd68d8cf3 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/src/mame/drivers/aristmk6.cpp @@ -27,6 +27,7 @@ notes: #include "cpu/sh4/sh4.h" #include "machine/ins8250.h" #include "machine/eepromser.h" +#include "screen.h" class aristmk6_state : public driver_device { diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp index c0a3ae1546c..22e579fe13c 100644 --- a/src/mame/drivers/arkanoid.cpp +++ b/src/mame/drivers/arkanoid.cpp @@ -792,6 +792,9 @@ DIP locations verified for: #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + /***************************************************************************/ diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 7de230d0770..eba42d271af 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -314,6 +314,7 @@ Notes: #include "emu.h" #include "includes/armedf.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" @@ -321,6 +322,8 @@ Notes: #include "sound/3812intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #define LEGION_HACK 0 diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp index 25e81048373..1462b3a770e 100644 --- a/src/mame/drivers/arsystems.cpp +++ b/src/mame/drivers/arsystems.cpp @@ -51,10 +51,12 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/amiga.h" + +#include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/amigafdc.h" +#include "speaker.h" // arcadia_state was also defined in mess/includes/arcadia.h diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp index 0a19087b19a..ab622dfd96a 100644 --- a/src/mame/drivers/artmagic.cpp +++ b/src/mame/drivers/artmagic.cpp @@ -25,13 +25,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/artmagic.h" + #include "cpu/m68000/m68000.h" -#include "cpu/tms34010/tms34010.h" #include "cpu/mcs51/mcs51.h" -#include "video/tlc34076.h" -#include "includes/artmagic.h" -#include "sound/okim6295.h" +#include "cpu/tms34010/tms34010.h" #include "machine/nvram.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK_40MHz (XTAL_40MHz) diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp index 3bab957d1fc..bdccb3808de 100644 --- a/src/mame/drivers/ashnojoe.cpp +++ b/src/mame/drivers/ashnojoe.cpp @@ -75,10 +75,14 @@ Coin B is not used *************************************************************************/ #include "emu.h" +#include "includes/ashnojoe.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" -#include "includes/ashnojoe.h" +#include "screen.h" +#include "speaker.h" + READ16_MEMBER(ashnojoe_state::fake_4a00a_r) { diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp index fb4e47c8f08..78062f8b173 100644 --- a/src/mame/drivers/asst128.cpp +++ b/src/mame/drivers/asst128.cpp @@ -24,7 +24,7 @@ DEVICE_ADDRESS_MAP_START( map, 8, asst128_mb_device ) AM_RANGE(0x00a0, 0x00a1) AM_WRITE(nmi_enable_w) ADDRESS_MAP_END -const device_type ASST128_MOTHERBOARD = &device_creator; +const device_type ASST128_MOTHERBOARD = device_creator; class asst128_state : public driver_device { diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp index 870b05d527c..b6f0d8dd47c 100644 --- a/src/mame/drivers/asterix.cpp +++ b/src/mame/drivers/asterix.cpp @@ -13,13 +13,17 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/asterix.h" +#include "includes/konamipt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/ym2151.h" #include "sound/k053260.h" -#include "includes/konamipt.h" -#include "includes/asterix.h" +#include "screen.h" +#include "speaker.h" + #if 0 READ16_MEMBER(asterix_state::control2_r) diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index 08520d50cbd..b3dc69b8303 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -186,20 +186,22 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a ***************************************************************************/ #include "emu.h" +#include "includes/asteroid.h" +#include "audio/llander.h" #include "cpu/m6502/m6502.h" -#include "machine/watchdog.h" -#include "video/vector.h" -#include "video/avgdvg.h" #include "machine/atari_vg.h" -#include "includes/asteroid.h" +#include "machine/watchdog.h" #include "sound/discrete.h" #include "sound/pokey.h" -#include "audio/llander.h" +#include "video/avgdvg.h" +#include "video/vector.h" +#include "screen.h" +#include "speaker.h" #include "astdelux.lh" #define MASTER_CLOCK (XTAL_12_096MHz) -#define CLOCK_3KHZ ((double)MASTER_CLOCK / 4096) +#define CLOCK_3KHZ (double(MASTER_CLOCK) / 4096) /************************************* * diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index 9eb6740ee0d..5c1dc027068 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -22,6 +22,8 @@ DIP locations verified for: #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/samples.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_2MHz diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp index 3f59c92a7cc..c6c5d982231 100644 --- a/src/mame/drivers/astrcorp.cpp +++ b/src/mame/drivers/astrcorp.cpp @@ -39,9 +39,12 @@ To do: #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" -#include "machine/ticket.h" #include "machine/nvram.h" +#include "machine/ticket.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + class astrocorp_state : public driver_device { diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 864c8bd14ad..243e4c3084d 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -114,14 +114,17 @@ ****************************************************************************/ #include "emu.h" +#include "includes/astrocde.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "includes/astrocde.h" #include "machine/z80ctc.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/votrax.h" +#include "speaker.h" + #include "gorf.lh" #include "seawolf2.lh" #include "spacezap.lh" diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 278773aefa2..9d82c53b56e 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -59,8 +59,8 @@ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/astrof.h" +#include "cpu/m6502/m6502.h" #define MASTER_CLOCK (XTAL_10_595MHz) diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp index 6881bd86ed6..d26d30c8ce4 100644 --- a/src/mame/drivers/astrohome.cpp +++ b/src/mame/drivers/astrohome.cpp @@ -7,24 +7,29 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/astrocde.h" + +#include "cpu/z80/z80.h" #include "machine/ram.h" #include "sound/astrocde.h" + #include "bus/astrocde/slot.h" #include "bus/astrocde/rom.h" #include "bus/astrocde/exp.h" #include "bus/astrocde/ram.h" + #include "softlist.h" +#include "speaker.h" + class astrocde_mess_state : public astrocde_state { public: astrocde_mess_state(const machine_config &mconfig, device_type type, const char *tag) - : astrocde_state(mconfig, type, tag), - m_cart(*this, "cartslot"), - m_exp(*this, "exp") - { } + : astrocde_state(mconfig, type, tag) + , m_cart(*this, "cartslot") + , m_exp(*this, "exp") + { } required_device m_cart; required_device m_exp; diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp index 3c31e120919..f3024183f46 100644 --- a/src/mame/drivers/asuka.cpp +++ b/src/mame/drivers/asuka.cpp @@ -216,17 +216,20 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/z180/z180.h" -#include "cpu/m68000/m68000.h" +#include "includes/asuka.h" #include "includes/taitoipt.h" #include "audio/taitosnd.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z180/z180.h" +#include "cpu/z80/z80.h" +#include "machine/bonzeadv.h" #include "machine/watchdog.h" #include "sound/2610intf.h" -#include "sound/ym2151.h" #include "sound/msm5205.h" -#include "includes/asuka.h" -#include "machine/bonzeadv.h" +#include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" /*********************************************************** diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index aa6d3028863..2ab4695d0d0 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -13,19 +13,20 @@ #include "emu.h" -#include "cpu/i86/i286.h" +#include "bus/isa/isa_cards.h" +#include "bus/lpci/pci.h" +#include "bus/lpci/vt82c505.h" +#include "bus/pc_kbd/keyboards.h" #include "cpu/i386/i386.h" +#include "cpu/i86/i286.h" #include "machine/at.h" -#include "machine/wd7600.h" #include "machine/cs8221.h" -#include "machine/nvram.h" -#include "machine/vt82c496.h" -#include "bus/lpci/pci.h" -#include "bus/lpci/vt82c505.h" #include "machine/ds128x.h" +#include "machine/nvram.h" #include "machine/ram.h" -#include "bus/isa/isa_cards.h" -#include "bus/pc_kbd/keyboards.h" +#include "machine/vt82c496.h" +#include "machine/wd7600.h" +#include "speaker.h" class at_state : public driver_device { diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp index 1f61e7917d2..6ec9f45976a 100644 --- a/src/mame/drivers/atari400.cpp +++ b/src/mame/drivers/atari400.cpp @@ -52,7 +52,9 @@ #include "bus/a800/a800_slot.h" #include "bus/a800/a800_carts.h" #include "bus/a800/a8sio.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /****************************************************************************** Atari 800 memory map (preliminary) diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp index 3e0bd7cf300..17b7542c5f9 100644 --- a/src/mame/drivers/atari_s1.cpp +++ b/src/mame/drivers/atari_s1.cpp @@ -45,10 +45,13 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/watchdog.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "atari_s1.lh" diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp index dd6c3e13a22..9c73c3f77d0 100644 --- a/src/mame/drivers/atari_s2.cpp +++ b/src/mame/drivers/atari_s2.cpp @@ -23,10 +23,13 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/watchdog.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "atari_s2.lh" diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp index 64572ecbc7d..f4974d239a1 100644 --- a/src/mame/drivers/atarifb.cpp +++ b/src/mame/drivers/atarifb.cpp @@ -105,10 +105,11 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/atarifb.h" +#include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "sound/discrete.h" +#include "speaker.h" #include "atarifb.lh" #include "atarifb4.lh" diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp index 4a9bd7b1bd1..2cb0c189ce4 100644 --- a/src/mame/drivers/atarig1.cpp +++ b/src/mame/drivers/atarig1.cpp @@ -21,9 +21,9 @@ #include "emu.h" -#include "machine/watchdog.h" -#include "video/atarirle.h" #include "includes/atarig1.h" +#include "machine/watchdog.h" +#include "speaker.h" diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp index 1f02a5905c2..4bf18c78daf 100644 --- a/src/mame/drivers/atarig42.cpp +++ b/src/mame/drivers/atarig42.cpp @@ -20,9 +20,9 @@ ***************************************************************************/ #include "emu.h" -#include "machine/watchdog.h" -#include "video/atarirle.h" #include "includes/atarig42.h" +#include "machine/watchdog.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp index a76373cbe92..59976ccdc3e 100644 --- a/src/mame/drivers/atarigx2.cpp +++ b/src/mame/drivers/atarigx2.cpp @@ -25,9 +25,9 @@ #include "emu.h" -#include "cpu/m68000/m68000.h" -#include "video/atarirle.h" #include "includes/atarigx2.h" +#include "cpu/m68000/m68000.h" +#include "speaker.h" diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index 45c18c7e10a..db674a69a93 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -5,7 +5,9 @@ #include "machine/clock.h" #include "bus/midi/midi.h" #include "video/atarist.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index f00048b8e6d..6a2401f2a97 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -191,6 +191,7 @@ RoadBlasters (aka Future Vette):005* #include "emu.h" +#include "includes/atarisy1.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "machine/atarigen.h" @@ -199,7 +200,7 @@ RoadBlasters (aka Future Vette):005* #include "sound/ym2151.h" #include "sound/pokey.h" #include "video/atarimo.h" -#include "includes/atarisy1.h" +#include "speaker.h" diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp index 707aaf7923f..504dc4d9e52 100644 --- a/src/mame/drivers/atarisy2.cpp +++ b/src/mame/drivers/atarisy2.cpp @@ -127,6 +127,7 @@ #include "emu.h" #include "includes/atarisy2.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_20MHz diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp index ede54766efa..f9cd66b4a72 100644 --- a/src/mame/drivers/atarisy4.cpp +++ b/src/mame/drivers/atarisy4.cpp @@ -20,6 +20,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/tms32010/tms32010.h" #include "video/poly.h" +#include "screen.h" struct atarisy4_polydata diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp index b63e10a6a70..924aec9995e 100644 --- a/src/mame/drivers/atarittl.cpp +++ b/src/mame/drivers/atarittl.cpp @@ -78,6 +78,7 @@ #include "machine/nl_stuntcyc.h" #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" +#include "screen.h" // copied by Pong, not accurate for this driver! diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index 47c639be6a6..942f5ae08f1 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -57,6 +57,7 @@ #include "sound/pokey.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_14_31818MHz diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp index 0f944ac9d8b..90742ae87fb 100644 --- a/src/mame/drivers/atm.cpp +++ b/src/mame/drivers/atm.cpp @@ -15,13 +15,9 @@ computer to boot up (with keyboard problems). #include "includes/spectrum.h" #include "includes/spec128.h" #include "includes/specpls3.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" + #include "sound/ay8910.h" -#include "sound/speaker.h" #include "machine/beta.h" -#include "machine/ram.h" -#include "machine/spec_snqk.h" class atm_state : public spectrum_state diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index 46c50225bf7..20c35fe70f3 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -115,7 +115,9 @@ Hardware: PPIA 8255 #include "emu.h" #include "includes/atom.h" #include "formats/imageutl.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /*************************************************************************** PARAMETERS diff --git a/src/mame/drivers/atronic.cpp b/src/mame/drivers/atronic.cpp index a213c0a95a9..2dc995b858e 100644 --- a/src/mame/drivers/atronic.cpp +++ b/src/mame/drivers/atronic.cpp @@ -16,6 +16,7 @@ #include "emu.h" #include "cpu/z180/z180.h" +#include "screen.h" class atronic_state : public driver_device diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 48571180652..ec039e61d6a 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -52,19 +52,24 @@ */ #include "emu.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "sound/ay8910.h" +#include "machine/am9517a.h" #include "machine/msm5832.h" +#include "machine/nvram.h" +#include "machine/ram.h" +#include "machine/upd765.h" +#include "machine/z80ctc.h" #include "machine/z80dart.h" #include "machine/z80pio.h" -#include "machine/z80ctc.h" -#include "machine/am9517a.h" -#include "machine/upd765.h" +#include "sound/ay8910.h" #include "video/tms9927.h" -#include "machine/ram.h" -#include "machine/nvram.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class attache_state : public driver_device { diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp index 3c826afd1ae..fe89d3ba6b7 100644 --- a/src/mame/drivers/attckufo.cpp +++ b/src/mame/drivers/attckufo.cpp @@ -14,6 +14,7 @@ #include "cpu/m6502/m6502.h" #include "machine/6821pia.h" #include "sound/mos6560.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index 8d624e22ebc..9803bd1cdde 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/src/mame/drivers/atvtrack.cpp @@ -94,6 +94,7 @@ TODO: #include "emu.h" #include "cpu/sh4/sh4.h" #include "debugger.h" +#include "screen.h" //#define SPECIALMODE 1 // Alternate code path diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index f6af1fc31f7..1b15abc1bc9 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -33,6 +33,9 @@ #include "emu.h" #include "includes/aussiebyte.h" +#include "screen.h" +#include "speaker.h" + /*********************************************************** diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp index 6efd0fed41d..0ac8ba7b61d 100644 --- a/src/mame/drivers/avalnche.cpp +++ b/src/mame/drivers/avalnche.cpp @@ -31,10 +31,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/avalnche.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "sound/discrete.h" -#include "includes/avalnche.h" +#include "screen.h" +#include "speaker.h" #include "avalnche.lh" diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp index 775fce5ce1b..b0d826f4403 100644 --- a/src/mame/drivers/avigo.cpp +++ b/src/mame/drivers/avigo.cpp @@ -71,6 +71,10 @@ #include "emu.h" #include "includes/avigo.h" + +#include "screen.h" +#include "speaker.h" + #include "avigo.lh" diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp index 51beaec77b4..27a70b3663e 100644 --- a/src/mame/drivers/avt.cpp +++ b/src/mame/drivers/avt.cpp @@ -404,11 +404,6 @@ ************************************************************************************************/ - -#define MASTER_CLOCK XTAL_16MHz /* unknown */ -#define CPU_CLOCK MASTER_CLOCK/4 /* guess... seems accurate */ -#define CRTC_CLOCK MASTER_CLOCK/24 /* it gives 63.371293 Hz. with current settings */ - #include "emu.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" @@ -416,6 +411,13 @@ #include "video/mc6845.h" //#include "machine/z80ctc.h" //#include "machine/z80pio.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_16MHz /* unknown */ +#define CPU_CLOCK MASTER_CLOCK/4 /* guess... seems accurate */ +#define CRTC_CLOCK MASTER_CLOCK/24 /* it gives 63.371293 Hz. with current settings */ class avt_state : public driver_device diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp index 6851d677fce..3d4d16805f2 100644 --- a/src/mame/drivers/ax20.cpp +++ b/src/mame/drivers/ax20.cpp @@ -17,8 +17,9 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/i86/i86.h" #include "bus/isa/fdc.h" +#include "cpu/i86/i86.h" +#include "screen.h" class ax20_state : public driver_device { diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp index 56de6ca3405..83d09547a1c 100644 --- a/src/mame/drivers/aztarac.cpp +++ b/src/mame/drivers/aztarac.cpp @@ -16,12 +16,14 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" #include "includes/aztarac.h" -#include "sound/ay8910.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "sound/ay8910.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp index a7190a97d69..e79f5118d9c 100644 --- a/src/mame/drivers/b16.cpp +++ b/src/mame/drivers/b16.cpp @@ -15,8 +15,9 @@ #include "emu.h" #include "cpu/i86/i86.h" -#include "video/mc6845.h" #include "machine/am9517a.h" +#include "video/mc6845.h" +#include "screen.h" diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp index 36fe7c2bd44..e2c5cc17ec5 100644 --- a/src/mame/drivers/b2m.cpp +++ b/src/mame/drivers/b2m.cpp @@ -19,7 +19,9 @@ #include "machine/ram.h" #include "includes/b2m.h" #include "formats/smx_dsk.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* Address maps */ static ADDRESS_MAP_START(b2m_mem, AS_PROGRAM, 8, b2m_state ) diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index cc203c5a623..f47a0122384 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -21,8 +21,10 @@ #include "sound/ymz280b.h" #include "cpu/arm/arm.h" #include "video/deco16ic.h" -#include "rendlay.h" #include "video/decospr.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" class backfire_state : public driver_device diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp index 35eff4cdd6b..5bbeabdf668 100644 --- a/src/mame/drivers/badlands.cpp +++ b/src/mame/drivers/badlands.cpp @@ -164,12 +164,13 @@ Measurements - #include "emu.h" +#include "includes/badlands.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/badlands.h" +#include "speaker.h" diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp index b71fbcfaa86..b086c18a1cc 100644 --- a/src/mame/drivers/bagman.cpp +++ b/src/mame/drivers/bagman.cpp @@ -63,9 +63,12 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" +#include "includes/bagman.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/bagman.h" +#include "screen.h" +#include "speaker.h" void bagman_state::machine_start() diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp index 4c8c9fc79f2..a151aeaeb7f 100644 --- a/src/mame/drivers/balsente.cpp +++ b/src/mame/drivers/balsente.cpp @@ -227,13 +227,15 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" +#include "includes/balsente.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" -#include "includes/balsente.h" #include "sound/cem3394.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "speaker.h" #include "stocker.lh" diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp index 7ab55d544fb..1fc03c95f40 100644 --- a/src/mame/drivers/banctec.cpp +++ b/src/mame/drivers/banctec.cpp @@ -19,6 +19,7 @@ #include "cpu/mcs51/mcs51.h" #include "cpu/m6800/m6800.h" #include "video/mc6845.h" +#include "screen.h" class banctec_state : public driver_device { @@ -30,7 +31,7 @@ public: , m_maincpu(*this, "maincpu") , m_videoram(*this, "videoram") , m_p_chargen(*this, "chargen") - { } + { } MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr); diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp index cc7372de331..d9e507395d5 100644 --- a/src/mame/drivers/bankp.cpp +++ b/src/mame/drivers/bankp.cpp @@ -94,9 +94,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/bankp.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/bankp.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_15_468MHz diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp index 04d17275f26..fc01cad9c2a 100644 --- a/src/mame/drivers/baraduke.cpp +++ b/src/mame/drivers/baraduke.cpp @@ -108,10 +108,13 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" +#include "includes/baraduke.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6800.h" #include "machine/watchdog.h" -#include "includes/baraduke.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(baraduke_state::inputport_select_w) diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp index e70eeeb5ccb..97dedb53ecb 100644 --- a/src/mame/drivers/barata.cpp +++ b/src/mame/drivers/barata.cpp @@ -34,12 +34,14 @@ **************************************************************************/ -#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */ - #include "emu.h" #include "cpu/mcs51/mcs51.h" -#include "barata.lh" #include "rendlay.h" +#include "speaker.h" + +#include "barata.lh" + +#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */ class barata_state : public driver_device { diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp index 49c15875705..30b2ba9f84f 100644 --- a/src/mame/drivers/bartop52.cpp +++ b/src/mame/drivers/bartop52.cpp @@ -18,12 +18,16 @@ */ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/atari400.h" -#include "sound/speaker.h" + +#include "cpu/m6502/m6502.h" +#include "sound/spkrdev.h" #include "sound/pokey.h" #include "video/gtia.h" +#include "screen.h" +#include "speaker.h" + class bartop52_state : public atari_common_state { diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp index 24f7a2677ff..aff359cac85 100644 --- a/src/mame/drivers/batman.cpp +++ b/src/mame/drivers/batman.cpp @@ -20,10 +20,11 @@ #include "emu.h" +#include "includes/batman.h" #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "video/atarimo.h" -#include "includes/batman.h" +#include "speaker.h" diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp index fa459ced611..4f35cb7c9ad 100644 --- a/src/mame/drivers/battlane.cpp +++ b/src/mame/drivers/battlane.cpp @@ -12,9 +12,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/battlane.h" + #include "cpu/m6809/m6809.h" #include "sound/3526intf.h" -#include "includes/battlane.h" +#include "screen.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp index 072f1db8325..42a4d47b1f1 100644 --- a/src/mame/drivers/battlera.cpp +++ b/src/mame/drivers/battlera.cpp @@ -93,10 +93,11 @@ Notes: **********************************************************************/ #include "emu.h" +#include "includes/battlera.h" #include "cpu/h6280/h6280.h" #include "sound/2203intf.h" #include "sound/c6280.h" -#include "includes/battlera.h" +#include "speaker.h" void battlera_state::machine_start() diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp index 48f450da13b..641682a25c5 100644 --- a/src/mame/drivers/battlex.cpp +++ b/src/mame/drivers/battlex.cpp @@ -45,9 +45,12 @@ #include "emu.h" +#include "includes/battlex.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/battlex.h" +#include "screen.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(battlex_state::battlex_interrupt) diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp index 5b76d2b7aa5..a6c298df3a7 100644 --- a/src/mame/drivers/battlnts.cpp +++ b/src/mame/drivers/battlnts.cpp @@ -13,13 +13,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/battlnts.h" +#include "includes/konamipt.h" + #include "cpu/m6809/hd6309.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/3812intf.h" -#include "includes/konamipt.h" -#include "includes/battlnts.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 5f254fc3ccc..eee2bbf9444 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -40,6 +40,7 @@ /* Core includes */ #include "emu.h" +#include "includes/bbc.h" /* Components */ #include "bus/rs232/rs232.h" @@ -50,8 +51,6 @@ #include "bus/econet/econet.h" #include "sound/tms5220.h" /* Speech */ #include "video/saa5050.h" /* Teletext */ -#include "bbc.lh" -#include "bbcm.lh" /* Devices */ #include "formats/acorn_dsk.h" @@ -59,8 +58,12 @@ #include "imagedev/cassette.h" #include "formats/uef_cas.h" #include "formats/csw_cas.h" -#include "includes/bbc.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "bbc.lh" +#include "bbcm.lh" /****************************************************************************** A = BBC Model A diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp index c9cdc938d14..f3bb91fdf1d 100644 --- a/src/mame/drivers/bbusters.cpp +++ b/src/mame/drivers/bbusters.cpp @@ -195,12 +195,15 @@ foreground and not behind the moving elevator layer. ***************************************************************************/ #include "emu.h" +#include "includes/bbusters.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" +#include "machine/nvram.h" #include "sound/2608intf.h" #include "sound/2610intf.h" -#include "includes/bbusters.h" -#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp index 6dcfa62f4db..496b43d317a 100644 --- a/src/mame/drivers/bcs3.cpp +++ b/src/mame/drivers/bcs3.cpp @@ -53,6 +53,8 @@ #include "cpu/z80/z80daisy.h" #include "machine/z80ctc.h" #include "imagedev/cassette.h" +#include "screen.h" +#include "speaker.h" class bcs3_state : public driver_device diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp index 5d2cf1a7561..dcd8e7d0594 100644 --- a/src/mame/drivers/beaminv.cpp +++ b/src/mame/drivers/beaminv.cpp @@ -55,6 +55,8 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" + #include "beaminv.lh" diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp index adb7b8f55d5..f8f5c0a89d0 100644 --- a/src/mame/drivers/beathead.cpp +++ b/src/mame/drivers/beathead.cpp @@ -103,6 +103,7 @@ #include "includes/beathead.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "speaker.h" #define MAX_SCANLINES 262 diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index ffc715efa9a..047a1486f9c 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -21,6 +21,7 @@ #include "machine/pckeybrd.h" #include "bus/lpci/mpc105.h" #include "bus/scsi/scsi.h" +#include "speaker.h" /* Devices */ #include "bus/scsi/scsicd.h" diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp index d243c6eee78..e8da27e5015 100644 --- a/src/mame/drivers/beehive.cpp +++ b/src/mame/drivers/beehive.cpp @@ -22,6 +22,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class beehive_state : public driver_device diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp index cc6e0a58bd8..2490f0eb008 100644 --- a/src/mame/drivers/beezer.cpp +++ b/src/mame/drivers/beezer.cpp @@ -33,6 +33,8 @@ #include "sound/mm5837.h" #include "sound/dac76.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/belatra.cpp b/src/mame/drivers/belatra.cpp index cb996f09781..7c94c0eec1c 100644 --- a/src/mame/drivers/belatra.cpp +++ b/src/mame/drivers/belatra.cpp @@ -44,6 +44,7 @@ Viking?s Fun Mill #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" +#include "speaker.h" class belatra_state : public driver_device { diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp index 4efbd6fba8a..1b83f20cbe6 100644 --- a/src/mame/drivers/berzerk.cpp +++ b/src/mame/drivers/berzerk.cpp @@ -11,12 +11,15 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "audio/exidy.h" + +#include "cpu/z80/z80.h" #include "machine/74181.h" #include "machine/nvram.h" #include "sound/s14001a.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class berzerk_state : public driver_device diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp index bca0b7cfa54..ca0175f0c39 100644 --- a/src/mame/drivers/bestleag.cpp +++ b/src/mame/drivers/bestleag.cpp @@ -23,6 +23,8 @@ Dip Locations added according to Service Mode #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class bestleag_state : public driver_device diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp index a762114cb7a..f9e1cbf22de 100644 --- a/src/mame/drivers/beta.cpp +++ b/src/mame/drivers/beta.cpp @@ -34,11 +34,13 @@ #include "cpu/m6502/m6502.h" #include "machine/mos6530n.h" #include "machine/ram.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "speaker.h" + #include "beta.lh" #define SCREEN_TAG "screen" diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 2533e233674..6feee17b8f0 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -75,15 +75,17 @@ ******************************************************************************/ #include "emu.h" -#include "machine/clock.h" +#include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" #include "machine/6850acia.h" +#include "machine/clock.h" #include "machine/meters.h" -#include "cpu/z80/z80.h" -#include "cpu/m6809/m6809.h" -#include "sound/upd7759.h" -#include "sound/ay8910.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "sound/upd7759.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" /* diff --git a/src/mame/drivers/bfm_ad5.cpp b/src/mame/drivers/bfm_ad5.cpp index 0f04d132e40..a40e3782982 100644 --- a/src/mame/drivers/bfm_ad5.cpp +++ b/src/mame/drivers/bfm_ad5.cpp @@ -15,6 +15,7 @@ #include "includes/bfm_ad5.h" #include "machine/mcf5206e.h" #include "machine/bfm_sc45_helper.h" +#include "speaker.h" DRIVER_INIT_MEMBER(adder5_state,ad5) { diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp index 50e78799359..f0c5764dabc 100644 --- a/src/mame/drivers/bfm_sc1.cpp +++ b/src/mame/drivers/bfm_sc1.cpp @@ -101,6 +101,7 @@ Optional (on expansion card) (Viper) #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "machine/bfm_comn.h" +#include "speaker.h" #include "sc1_vfd.lh" #include "sc1_vid.lh" diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index 28fc948f7fd..f684fb88430 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -142,6 +142,7 @@ Adder hardware: ***************************************************************************/ #include "emu.h" + #include "cpu/m6809/m6809.h" #include "machine/nvram.h" @@ -154,11 +155,14 @@ Adder hardware: /* fruit machines only */ #include "video/awpvid.h" -#include "machine/steppers.h" // stepper motor +#include "video/bfm_dm01.h" +#include "machine/steppers.h" #include "machine/bfm_bd1.h" // vfd #include "machine/meters.h" +#include "speaker.h" + #include "sc2_vid.lh" #include "gldncrwn.lh" #include "paradice.lh" @@ -169,8 +173,6 @@ Adder hardware: #include "sltblgtk.lh" #include "slots.lh" -/* fruit machines only */ -#include "video/bfm_dm01.h" #include "sc2_vfd.lh" #include "sc2_dmd.lh" #include "drwho.lh" diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index 2d60baec04b..4fa9a38450c 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -40,6 +40,15 @@ #include "includes/bfm_sc4.h" #include "machine/bfm_sc45_helper.h" +#include "cpu/m68000/m68000.h" +#include "machine/68307.h" +#include "machine/68340.h" +#include "video/awpvid.h" +//DMD01 +#include "cpu/m6809/m6809.h" + +#include "speaker.h" + #include "bfm_sc4.lh" #include "sc4_dmd.lh" @@ -248,13 +257,6 @@ -#include "cpu/m68000/m68000.h" -#include "machine/68307.h" -#include "machine/68340.h" -#include "video/awpvid.h" -//DMD01 -#include "cpu/m6809/m6809.h" - uint8_t sc4_state::read_input_matrix(int row) diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp index bd9b4d2f2a4..6093b486c18 100644 --- a/src/mame/drivers/bfm_sc5.cpp +++ b/src/mame/drivers/bfm_sc5.cpp @@ -12,14 +12,14 @@ #include "emu.h" - #include "includes/bfm_sc5.h" - +#include "machine/bfm_sc45_helper.h" #include "machine/mcf5206e.h" -#include "bfm_sc5.lh" #include "video/awpvid.h" -#include "machine/bfm_sc45_helper.h" +#include "speaker.h" + +#include "bfm_sc5.lh" diff --git a/src/mame/drivers/bfm_swp.cpp b/src/mame/drivers/bfm_swp.cpp index e6240a9ecea..da25b10fedf 100644 --- a/src/mame/drivers/bfm_swp.cpp +++ b/src/mame/drivers/bfm_swp.cpp @@ -104,6 +104,8 @@ TEST.TXT - suggests the content of a prototype version, which was expanded to ma #include "emu.h" #include "machine/68340.h" #include "sound/ymz280b.h" +#include "screen.h" +#include "speaker.h" class bfm_swp_state : public driver_device { diff --git a/src/mame/drivers/bfmsys83.cpp b/src/mame/drivers/bfmsys83.cpp index 2a297628db9..507846cc83c 100644 --- a/src/mame/drivers/bfmsys83.cpp +++ b/src/mame/drivers/bfmsys83.cpp @@ -6,6 +6,7 @@ #include "cpu/m6800/m6800.h" #include "sound/ay8910.h" #include "machine/bfm_comn.h" +#include "speaker.h" class bfmsys83_state : public driver_device diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp index 352d55121ea..af8b8027c53 100644 --- a/src/mame/drivers/bfmsys85.cpp +++ b/src/mame/drivers/bfmsys85.cpp @@ -67,6 +67,7 @@ ___________________________________________________________________________ #include "sound/ay8910.h" #include "machine/nvram.h" #include "machine/bfm_comn.h" +#include "speaker.h" #include "bfmsys85.lh" diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp index 39e27fab893..07de2867879 100644 --- a/src/mame/drivers/big10.cpp +++ b/src/mame/drivers/big10.cpp @@ -64,6 +64,8 @@ #include "video/v9938.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "screen.h" +#include "speaker.h" class big10_state : public driver_device diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 0daaad3156b..796532a4ce5 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -73,14 +73,16 @@ X - change banks #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" +#include "machine/clock.h" +#include "machine/keyboard.h" +#include "machine/wd_fdc.h" #include "machine/z80ctc.h" -#include "machine/z80sio.h" #include "machine/z80dma.h" -#include "video/mc6845.h" -#include "machine/keyboard.h" +#include "machine/z80sio.h" #include "sound/beep.h" -#include "machine/wd_fdc.h" -#include "machine/clock.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class bigbord2_state : public driver_device diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp index d35dbf7ac29..e4346c0ba16 100644 --- a/src/mame/drivers/bigevglf.cpp +++ b/src/mame/drivers/bigevglf.cpp @@ -58,10 +58,12 @@ J1100072A ***************************************************************************/ #include "emu.h" +#include "includes/bigevglf.h" + +#include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "cpu/m6805/m6805.h" -#include "includes/bigevglf.h" +#include "speaker.h" WRITE8_MEMBER(bigevglf_state::beg_banking_w) diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp index 864a0194a0b..77790e633d2 100644 --- a/src/mame/drivers/bigstrkb.cpp +++ b/src/mame/drivers/bigstrkb.cpp @@ -15,9 +15,12 @@ */ #include "emu.h" +#include "includes/bigstrkb.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "includes/bigstrkb.h" +#include "screen.h" +#include "speaker.h" /* diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 63da0224639..ddf5fbace5f 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -54,8 +54,11 @@ #include "bus/rs232/keyboard.h" #include "cpu/s2650/s2650.h" #include "imagedev/cassette.h" -#include "sound/wave.h" #include "imagedev/snapquik.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" + class binbug_state : public driver_device { diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp index 7735444b6c3..aeb1fbc789c 100644 --- a/src/mame/drivers/bingoc.cpp +++ b/src/mame/drivers/bingoc.cpp @@ -35,6 +35,8 @@ SOUND : YM2151 uPD7759C #include "machine/gen_latch.h" #include "sound/ym2151.h" #include "sound/upd7759.h" +#include "screen.h" +#include "speaker.h" class bingoc_state : public driver_device diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp index 3817029ef34..2bfae7e4c33 100644 --- a/src/mame/drivers/bingoman.cpp +++ b/src/mame/drivers/bingoman.cpp @@ -241,6 +241,8 @@ #include "emu.h" #include "cpu/h8/h83002.h" +#include "screen.h" +#include "speaker.h" class bingoman_state : public driver_device diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp index 277452dd760..9dad543d4c6 100644 --- a/src/mame/drivers/bingor.cpp +++ b/src/mame/drivers/bingor.cpp @@ -443,6 +443,8 @@ #include "cpu/i86/i186.h" #include "cpu/pic16c5x/pic16c5x.h" #include "sound/saa1099.h" +#include "screen.h" +#include "speaker.h" class bingor_state : public driver_device diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index c5e74a50220..a455ffcf57f 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -81,10 +81,13 @@ ******************************************************************************************/ #include "emu.h" +#include "includes/bionicc.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/ym2151.h" -#include "includes/bionicc.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp index 77feb8f19be..d309852008a 100644 --- a/src/mame/drivers/bishi.cpp +++ b/src/mame/drivers/bishi.cpp @@ -86,9 +86,12 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/bishi.h" + #include "cpu/m68000/m68000.h" #include "sound/ymz280b.h" -#include "includes/bishi.h" +#include "speaker.h" + READ16_MEMBER(bishi_state::control_r) { diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index eb992b25fa9..e2ce9502253 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -55,6 +55,9 @@ #include "machine/ram.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #include "bitgrpha.lh" #include "bitgrphb.lh" diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp index adb25ef5bc2..85ad0f6387d 100644 --- a/src/mame/drivers/bk.cpp +++ b/src/mame/drivers/bk.cpp @@ -10,14 +10,18 @@ #include "emu.h" +#include "includes/bk.h" + #include "cpu/t11/t11.h" #include "sound/wave.h" -#include "includes/bk.h" -#include "imagedev/cassette.h" #include "formats/rk_cas.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + - /* Address maps */ +/* Address maps */ static ADDRESS_MAP_START(bk0010_mem, AS_PROGRAM, 16, bk_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x3fff ) AM_RAM // RAM diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp index a32dab40bc7..42289be2989 100644 --- a/src/mame/drivers/bking.cpp +++ b/src/mame/drivers/bking.cpp @@ -19,12 +19,14 @@ DIP Locations verified for: #include "emu.h" #include "includes/bking.h" + #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" READ8_MEMBER(bking_state::bking_sndnmi_disable_r) diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp index ebd9fd728e2..8ec6989d997 100644 --- a/src/mame/drivers/blackt96.cpp +++ b/src/mame/drivers/blackt96.cpp @@ -66,6 +66,8 @@ There are some unmapped writes past the end of text ram too #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "video/snk68_spr.h" +#include "speaker.h" + class blackt96_state : public driver_device { diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp index a3d9d00834c..3aa9b337a15 100644 --- a/src/mame/drivers/bladestl.cpp +++ b/src/mame/drivers/bladestl.cpp @@ -29,12 +29,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/bladestl.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6809/hd6309.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/konamipt.h" -#include "includes/bladestl.h" +#include "screen.h" +#include "speaker.h" TIMER_DEVICE_CALLBACK_MEMBER(bladestl_state::bladestl_scanline) diff --git a/src/mame/drivers/blitz.cpp b/src/mame/drivers/blitz.cpp index 51ee39fd0fc..8100078f6d3 100644 --- a/src/mame/drivers/blitz.cpp +++ b/src/mame/drivers/blitz.cpp @@ -254,15 +254,17 @@ ***************************************************************************************************/ -#define MASTER_CLOCK XTAL_10MHz -#define CPU_CLOCK (MASTER_CLOCK/16) - #include "emu.h" #include "cpu/m6502/m6502.h" //#include "cpu/m6805/m6805.h" -#include "video/mc6845.h" #include "machine/6821pia.h" #include "sound/discrete.h" +#include "video/mc6845.h" +#include "screen.h" + + +#define MASTER_CLOCK XTAL_10MHz +#define CPU_CLOCK (MASTER_CLOCK/16) class blitz_state : public driver_device @@ -273,7 +275,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode") + { } required_shared_ptr m_videoram; required_shared_ptr m_colorram; diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index 21dbd7203e4..82b0d16dee7 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -46,10 +46,13 @@ To Do: #include "emu.h" #include "cpu/m68000/m68000.h" -#include "video/mc6845.h" -#include "sound/saa1099.h" #include "machine/nvram.h" +#include "sound/saa1099.h" +#include "video/mc6845.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + class blitz68k_state : public driver_device { diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index 0b18489b55a..ff27e34b5a3 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -16,12 +16,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/blktiger.h" + +#include "cpu/mcs51/mcs51.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "cpu/mcs51/mcs51.h" -#include "includes/blktiger.h" +#include "screen.h" +#include "speaker.h" /************************************************** diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp index 646e610c8f9..fcb641e12f1 100644 --- a/src/mame/drivers/blmbycar.cpp +++ b/src/mame/drivers/blmbycar.cpp @@ -26,9 +26,12 @@ Check game speed, it depends on a bit we toggle.. ***************************************************************************/ #include "emu.h" +#include "includes/blmbycar.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "includes/blmbycar.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp index 6cc2af4ae90..8b4f9ae6d79 100644 --- a/src/mame/drivers/blockade.cpp +++ b/src/mame/drivers/blockade.cpp @@ -11,9 +11,12 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/i8085/i8085.h" -#include "sound/samples.h" #include "sound/discrete.h" +#include "sound/samples.h" +#include "screen.h" +#include "speaker.h" #include "blockade.lh" diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp index f1a77468574..7c460f1238d 100644 --- a/src/mame/drivers/blockhl.cpp +++ b/src/mame/drivers/blockhl.cpp @@ -18,15 +18,18 @@ *******************************************************************************/ #include "emu.h" +#include "includes/konamipt.h" + #include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" #include "machine/bankdev.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" +#include "sound/ym2151.h" #include "video/k052109.h" #include "video/k051960.h" -#include "sound/ym2151.h" -#include "includes/konamipt.h" + +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp index c9c719ed387..d570082f33f 100644 --- a/src/mame/drivers/blockout.cpp +++ b/src/mame/drivers/blockout.cpp @@ -67,11 +67,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/blockout.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/blockout.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_10MHz #define AUDIO_CLOCK XTAL_3_579545MHz diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp index 1e445a31e1b..e11893aef69 100644 --- a/src/mame/drivers/bloodbro.cpp +++ b/src/mame/drivers/bloodbro.cpp @@ -130,12 +130,15 @@ DIP locations verified for Blood Bros. & Sky Smasher via manual & DIP-SW setting **************************************************************************/ #include "emu.h" +#include "includes/bloodbro.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/bloodbro.h" #include "video/seibu_crtc.h" +#include "screen.h" +#include "speaker.h" /* Memory Maps */ diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp index 3f87c2599d4..cbe8a9c9981 100644 --- a/src/mame/drivers/blstroid.cpp +++ b/src/mame/drivers/blstroid.cpp @@ -20,10 +20,12 @@ #include "emu.h" +#include "includes/blstroid.h" +#include "machine/atarigen.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" -#include "machine/atarigen.h" -#include "includes/blstroid.h" +#include "speaker.h" diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp index 6de7c1437a4..c506ca81ecd 100644 --- a/src/mame/drivers/blueprnt.cpp +++ b/src/mame/drivers/blueprnt.cpp @@ -49,10 +49,15 @@ #include "emu.h" +#include "includes/blueprnt.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/blueprnt.h" + +#include "screen.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp index 74c4e122bfe..ac80d19365b 100644 --- a/src/mame/drivers/bmcbowl.cpp +++ b/src/mame/drivers/bmcbowl.cpp @@ -109,6 +109,8 @@ Main board: #include "sound/okim6295.h" #include "sound/ym2413.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" #define NVRAM_HACK diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp index eb60d4c4875..be65f5cc638 100644 --- a/src/mame/drivers/bmcpokr.cpp +++ b/src/mame/drivers/bmcpokr.cpp @@ -22,6 +22,8 @@ Other: BMC B816140 (CPLD) #include "sound/okim6295.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "screen.h" +#include "speaker.h" class bmcpokr_state : public driver_device { diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp index bfce39ad282..ff366367ada 100644 --- a/src/mame/drivers/bmjr.cpp +++ b/src/mame/drivers/bmjr.cpp @@ -16,9 +16,11 @@ #include "emu.h" #include "cpu/m6800/m6800.h" -#include "sound/beep.h" #include "imagedev/cassette.h" +#include "sound/beep.h" #include "sound/wave.h" +#include "screen.h" +#include "speaker.h" class bmjr_state : public driver_device diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp index e4dfe07015f..2d63a712ab0 100644 --- a/src/mame/drivers/bml3.cpp +++ b/src/mame/drivers/bml3.cpp @@ -14,20 +14,25 @@ **************************************************************************************/ #include "emu.h" + #include "cpu/m6809/m6809.h" -#include "video/mc6845.h" +#include "imagedev/cassette.h" #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/clock.h" #include "sound/2203intf.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" -#include "imagedev/cassette.h" +#include "video/mc6845.h" + #include "bus/bml3/bml3bus.h" #include "bus/bml3/bml3mp1802.h" #include "bus/bml3/bml3mp1805.h" #include "bus/bml3/bml3kanji.h" +#include "screen.h" +#include "speaker.h" + // System clock definitions, from the MB-6890 servce manual, p.48: #define MASTER_CLOCK ( 32256000 ) // Master clock crystal (X1) frequency, 32.256 MHz. "fx" in the manual. diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp index 293a1d147c6..f0f26625060 100644 --- a/src/mame/drivers/bnstars.cpp +++ b/src/mame/drivers/bnstars.cpp @@ -89,13 +89,16 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples) */ #include "emu.h" +#include "includes/ms32.h" + #include "cpu/z80/z80.h" #include "cpu/v60/v60.h" -#include "rendlay.h" #include "sound/ymf271.h" -#include "includes/ms32.h" #include "machine/jalcrpt.h" +#include "rendlay.h" +#include "speaker.h" + class bnstars_state : public ms32_state { diff --git a/src/mame/drivers/bntyhunt.cpp b/src/mame/drivers/bntyhunt.cpp index 1bddbd854eb..dd26f58f34c 100644 --- a/src/mame/drivers/bntyhunt.cpp +++ b/src/mame/drivers/bntyhunt.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "cpu/i386/i386.h" +#include "screen.h" class bntyhunt_state : public driver_device diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp index bddda1d5862..21ec9ea846c 100644 --- a/src/mame/drivers/bogeyman.cpp +++ b/src/mame/drivers/bogeyman.cpp @@ -14,9 +14,12 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/bogeyman.h" +#include "cpu/m6502/m6502.h" +#include "screen.h" +#include "speaker.h" + /* Read/Write Handlers */ diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp index e58bc46a8ef..3f0fb247ef6 100644 --- a/src/mame/drivers/bombjack.cpp +++ b/src/mame/drivers/bombjack.cpp @@ -98,9 +98,12 @@ Dip Locations and factory settings verified with manual ***************************************************************************/ #include "emu.h" +#include "includes/bombjack.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/bombjack.h" +#include "screen.h" +#include "speaker.h" TIMER_CALLBACK_MEMBER(bombjack_state::soundlatch_callback) diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp index 9c7d3843621..eafe82e6e18 100644 --- a/src/mame/drivers/boogwing.cpp +++ b/src/mame/drivers/boogwing.cpp @@ -81,14 +81,18 @@ */ #include "emu.h" +#include "includes/boogwing.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" -#include "includes/boogwing.h" #include "machine/deco102.h" #include "machine/decocrpt.h" #include "machine/gen_latch.h" #include "sound/ym2151.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + READ16_MEMBER( boogwing_state::boogwing_protection_region_0_104_r ) { diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index f0a45d49d1e..b3cc769e523 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -15,12 +15,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/bottom9.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" -#include "includes/konamipt.h" -#include "includes/bottom9.h" +#include "speaker.h" + INTERRUPT_GEN_MEMBER(bottom9_state::bottom9_interrupt) { diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp index 742463a4f2d..cd3d2d650a7 100644 --- a/src/mame/drivers/bowltry.cpp +++ b/src/mame/drivers/bowltry.cpp @@ -30,6 +30,7 @@ #include "emu.h" #include "cpu/h8/h83008.h" +#include "screen.h" #define HACK_ENABLED 0 diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp index 2e554dceb29..5ac60774766 100644 --- a/src/mame/drivers/boxer.cpp +++ b/src/mame/drivers/boxer.cpp @@ -13,6 +13,7 @@ #include "emu.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" +#include "screen.h" #define MASTER_CLOCK XTAL_12_096MHz diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp index 81ef7be0161..b24d817be00 100644 --- a/src/mame/drivers/br8641.cpp +++ b/src/mame/drivers/br8641.cpp @@ -28,6 +28,7 @@ ToDo: #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "sound/beep.h" +#include "speaker.h" class brandt8641_state : public driver_device { diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp index 11fb1213db2..d31a6f7a413 100644 --- a/src/mame/drivers/brkthru.cpp +++ b/src/mame/drivers/brkthru.cpp @@ -52,10 +52,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/brkthru.h" + #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" #include "sound/3526intf.h" -#include "includes/brkthru.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_12MHz diff --git a/src/mame/drivers/bsktball.cpp b/src/mame/drivers/bsktball.cpp index 90052c677af..5fcc6bf3cec 100644 --- a/src/mame/drivers/bsktball.cpp +++ b/src/mame/drivers/bsktball.cpp @@ -29,6 +29,8 @@ #include "cpu/m6502/m6502.h" #include "includes/bsktball.h" #include "sound/discrete.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp index 8ef4113c171..6697f58b6a0 100644 --- a/src/mame/drivers/btime.cpp +++ b/src/mame/drivers/btime.cpp @@ -140,12 +140,14 @@ A few notes: ***************************************************************************/ #include "emu.h" +#include "includes/btime.h" + #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" #include "sound/discrete.h" -#include "includes/btime.h" #include "machine/decocpu7.h" #include "machine/deco222.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_12MHz #define HCLK (MASTER_CLOCK/2) diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp index c87a4403079..ca703c7c948 100644 --- a/src/mame/drivers/btoads.cpp +++ b/src/mame/drivers/btoads.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "includes/btoads.h" +#include "speaker.h" + #define CPU_CLOCK XTAL_64MHz #define VIDEO_CLOCK XTAL_20MHz diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp index 8c84a56b31b..458c493e70e 100644 --- a/src/mame/drivers/bublbobl.cpp +++ b/src/mame/drivers/bublbobl.cpp @@ -274,12 +274,15 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/bublbobl.h" + #include "cpu/m6800/m6800.h" +#include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/2203intf.h" #include "sound/3526intf.h" -#include "includes/bublbobl.h" +#include "screen.h" +#include "speaker.h" #define MAIN_XTAL XTAL_24MHz diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp index c202e50609d..af4c211167e 100644 --- a/src/mame/drivers/buggychl.cpp +++ b/src/mame/drivers/buggychl.cpp @@ -78,11 +78,13 @@ Dip locations and factory settings verified from dip listing ***************************************************************************/ #include "emu.h" +#include "includes/buggychl.h" + #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/buggychl.h" +#include "speaker.h" #include "buggychl.lh" diff --git a/src/mame/drivers/busicom.cpp b/src/mame/drivers/busicom.cpp index 5303328c792..338f42d3cf7 100644 --- a/src/mame/drivers/busicom.cpp +++ b/src/mame/drivers/busicom.cpp @@ -9,9 +9,11 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/i4004/i4004.h" #include "includes/busicom.h" +#include "cpu/i4004/i4004.h" +#include "screen.h" + uint8_t busicom_state::get_bit_selected(uint32_t val,int num) { diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp index 75823f90d39..823fe6dfd35 100644 --- a/src/mame/drivers/buster.cpp +++ b/src/mame/drivers/buster.cpp @@ -12,6 +12,8 @@ Video Fruit Machine #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class buster_state : public driver_device diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp index e337cbf7f1b..0d5b6df097b 100644 --- a/src/mame/drivers/bw12.cpp +++ b/src/mame/drivers/bw12.cpp @@ -30,7 +30,9 @@ #include "bus/rs232/rs232.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index 7bf927b074e..a20616600af 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -27,6 +27,7 @@ #include "emu.h" #include "includes/bw2.h" #include "bus/rs232/rs232.h" +#include "screen.h" #include "softlist.h" diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp index e9d7c1c4629..3337d7b043d 100644 --- a/src/mame/drivers/bwidow.cpp +++ b/src/mame/drivers/bwidow.cpp @@ -219,6 +219,8 @@ ***************************************************************************/ #include "emu.h" +#include "includes/bwidow.h" + #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "video/vector.h" @@ -227,7 +229,7 @@ #include "sound/pokey.h" #include "sound/discrete.h" -#include "includes/bwidow.h" +#include "screen.h" diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp index a46def8ecea..c6eb42d9052 100644 --- a/src/mame/drivers/bwing.cpp +++ b/src/mame/drivers/bwing.cpp @@ -26,11 +26,14 @@ Known issues: #include "emu.h" #include "includes/bwing.h" + #include "cpu/m6502/deco16.h" #include "cpu/m6809/m6809.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" //**************************************************************************** diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp index e4f2a0cbbe8..236aa64d2fb 100644 --- a/src/mame/drivers/by35.cpp +++ b/src/mame/drivers/by35.cpp @@ -68,12 +68,16 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "by35.lh" -#include "by35_playboy.lh" #include "sound/discrete.h" #include "render.h" +#include "speaker.h" + +#include "by35.lh" +#include "by35_playboy.lh" + class by35_state : public genpin_class { diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp index 386a6e76bfc..8a76cd98297 100644 --- a/src/mame/drivers/byvid.cpp +++ b/src/mame/drivers/byvid.cpp @@ -40,12 +40,13 @@ ToDo (granny): #include "emu.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" -#include "video/tms9928a.h" #include "machine/6821pia.h" #include "machine/nvram.h" #include "sound/beep.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "video/tms9928a.h" +#include "speaker.h" class by133_state : public driver_device { diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp index 2da43382822..3ec19892346 100644 --- a/src/mame/drivers/bzone.cpp +++ b/src/mame/drivers/bzone.cpp @@ -207,13 +207,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/bzone.h" + #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "video/vector.h" #include "video/avgdvg.h" #include "machine/atari_vg.h" -#include "includes/bzone.h" #include "sound/pokey.h" +#include "screen.h" +#include "speaker.h" #include "bzone.lh" #include "redbaron.lh" diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp index 413569ab0c1..647fed9995d 100644 --- a/src/mame/drivers/c10.cpp +++ b/src/mame/drivers/c10.cpp @@ -14,6 +14,7 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class c10_state : public driver_device @@ -29,7 +30,7 @@ public: , m_maincpu(*this, "maincpu") , m_p_videoram(*this, "videoram") , m_p_chargen(*this, "chargen") - { } + { } uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_DRIVER_INIT(c10); diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp index 2b2791337b0..94476a3f0a0 100644 --- a/src/mame/drivers/c128.cpp +++ b/src/mame/drivers/c128.cpp @@ -9,7 +9,9 @@ */ #include "emu.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "bus/c64/exp.h" #include "bus/cbmiec/cbmiec.h" #include "bus/cbmiec/c1571.h" diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp index d9f7dd31d7e..616a95b1563 100644 --- a/src/mame/drivers/c64.cpp +++ b/src/mame/drivers/c64.cpp @@ -15,7 +15,9 @@ */ #include "emu.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "bus/cbmiec/cbmiec.h" #include "bus/cbmiec/c1541.h" #include "bus/c64/exp.h" diff --git a/src/mame/drivers/c64dtv.cpp b/src/mame/drivers/c64dtv.cpp index 7673b067dcc..bb05a15effa 100644 --- a/src/mame/drivers/c64dtv.cpp +++ b/src/mame/drivers/c64dtv.cpp @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" +#include "screen.h" //************************************************************************** diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp index 0c2362ce6a5..0e6ce438ee7 100644 --- a/src/mame/drivers/c65.cpp +++ b/src/mame/drivers/c65.cpp @@ -21,7 +21,9 @@ Note: #include "emu.h" #include "cpu/m6502/m4510.h" #include "machine/mos6526.h" +#include "screen.h" #include "softlist_dev.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_3_5MHz diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp index bc02ae1513e..2c0f3163f43 100644 --- a/src/mame/drivers/c80.cpp +++ b/src/mame/drivers/c80.cpp @@ -54,9 +54,13 @@ data of next byte, and so on. #include "emu.h" #include "includes/c80.h" + #include "sound/wave.h" +#include "speaker.h" + #include "c80.lh" + /* Memory Maps */ static ADDRESS_MAP_START( c80_mem, AS_PROGRAM, 8, c80_state ) diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 8d4ba39b7af..c902f0c13de 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -44,12 +44,16 @@ Dip locations verified with Fabtek manual for the trackball version ******************************************************************/ #include "emu.h" +#include "includes/cabal.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ym2151.h" #include "sound/msm5205.h" -#include "includes/cabal.h" +#include "screen.h" +#include "speaker.h" + MACHINE_START_MEMBER(cabal_state,cabal) { diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp index 65af500cac9..cc4412f52e2 100644 --- a/src/mame/drivers/cabaret.cpp +++ b/src/mame/drivers/cabaret.cpp @@ -26,6 +26,8 @@ are the same of IGS. AMT may be previous IGS name. #include "emu.h" #include "cpu/z180/z180.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" class cabaret_state : public driver_device diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp index 0f014a7c846..9f557291980 100644 --- a/src/mame/drivers/calchase.cpp +++ b/src/mame/drivers/calchase.cpp @@ -138,6 +138,8 @@ something wrong in the disk geometry reported by calchase.chd (20,255,63) since #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/pc_vga.h" +#include "screen.h" +#include "speaker.h" class calchase_state : public pcat_base_state diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp index ee0636433df..e8b2d46fa88 100644 --- a/src/mame/drivers/calomega.cpp +++ b/src/mame/drivers/calomega.cpp @@ -639,20 +639,24 @@ ***********************************************************************************/ - -#define MASTER_CLOCK XTAL_10MHz -#define CPU_CLOCK (MASTER_CLOCK/16) -#define UART_CLOCK (MASTER_CLOCK/16) -#define SND_CLOCK (MASTER_CLOCK/8) - #include "emu.h" +#include "includes/calomega.h" + #include "cpu/m6502/m6502.h" #include "cpu/m6502/m65c02.h" -#include "video/mc6845.h" #include "machine/6821pia.h" #include "machine/nvram.h" #include "sound/ay8910.h" -#include "includes/calomega.h" +#include "video/mc6845.h" + +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_10MHz +#define CPU_CLOCK (MASTER_CLOCK/16) +#define UART_CLOCK (MASTER_CLOCK/16) +#define SND_CLOCK (MASTER_CLOCK/8) /************************************************** diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp index 46acb198bab..0bae419c172 100644 --- a/src/mame/drivers/calorie.cpp +++ b/src/mame/drivers/calorie.cpp @@ -84,6 +84,8 @@ Notes: #include "machine/gen_latch.h" #include "machine/segacrp2_device.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class calorie_state : public driver_device diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index 2f9207f1e0f..1c4977bd8e8 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -117,16 +117,22 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "video/mc6845.h" #include "imagedev/cassette.h" +#include "machine/wd_fdc.h" #include "sound/dac.h" -#include "sound/wave.h" #include "sound/volt_reg.h" +#include "sound/wave.h" +#include "video/mc6845.h" + #include "formats/camplynx_cas.h" -#include "machine/wd_fdc.h" #include "formats/camplynx_dsk.h" +#include "screen.h" +#include "speaker.h" + + class camplynx_state : public driver_device { public: diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp index 537a736fb57..3af43dc4181 100644 --- a/src/mame/drivers/canyon.cpp +++ b/src/mame/drivers/canyon.cpp @@ -39,9 +39,11 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/canyon.h" +#include "cpu/m6502/m6502.h" #include "sound/discrete.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp index 384b276f3ed..b9874a45ad4 100644 --- a/src/mame/drivers/capbowl.cpp +++ b/src/mame/drivers/capbowl.cpp @@ -88,12 +88,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/capbowl.h" + #include "machine/ticket.h" #include "cpu/m6809/m6809.h" -#include "includes/capbowl.h" #include "sound/2203intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_8MHz diff --git a/src/mame/drivers/capr1.cpp b/src/mame/drivers/capr1.cpp index 8fb6a9e5930..d8c614cb99c 100644 --- a/src/mame/drivers/capr1.cpp +++ b/src/mame/drivers/capr1.cpp @@ -31,6 +31,7 @@ TODO: #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/okim6295.h" +#include "speaker.h" class capr1_state : public driver_device diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp index 705a73bc345..776f1a4da99 100644 --- a/src/mame/drivers/cardline.cpp +++ b/src/mame/drivers/cardline.cpp @@ -25,9 +25,12 @@ #include "cpu/mcs51/mcs51.h" #include "sound/okim6295.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #include "cardline.lh" + #define MASTER_CLOCK XTAL_12MHz class cardline_state : public driver_device diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp index bc067f86cf6..30442716e7b 100644 --- a/src/mame/drivers/carjmbre.cpp +++ b/src/mame/drivers/carjmbre.cpp @@ -41,8 +41,10 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "video/resnet.h" #include "sound/ay8910.h" +#include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class carjmbre_state : public driver_device { diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp index a01cc10da50..c6dcb4efaed 100644 --- a/src/mame/drivers/carpolo.cpp +++ b/src/mame/drivers/carpolo.cpp @@ -19,10 +19,12 @@ ****************************************************************************/ #include "emu.h" +#include "includes/carpolo.h" + #include "cpu/m6502/m6502.h" #include "machine/74153.h" #include "machine/6821pia.h" -#include "includes/carpolo.h" +#include "screen.h" diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp index 004de507e99..73b05f2e635 100644 --- a/src/mame/drivers/carrera.cpp +++ b/src/mame/drivers/carrera.cpp @@ -52,6 +52,8 @@ TODO: #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class carrera_state : public driver_device diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index 6165d1bb437..46de2b0e821 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -151,10 +151,11 @@ PCB 'Z545-1 A240570-1' #include "emu.h" #include "cpu/sh2/sh2.h" -//#include "cpu/v60/v60.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class casloopy_state : public driver_device { diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp index ca62aec9c86..ef2a120315c 100644 --- a/src/mame/drivers/caswin.cpp +++ b/src/mame/drivers/caswin.cpp @@ -71,6 +71,8 @@ TODO: #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" class caswin_state : public driver_device diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index 084c1e6c9a9..7b8cd8a35c9 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -190,6 +190,17 @@ ToDo: ****************************************************************************/ +#include "emu.h" +#include "cpu/m68000/m68000.h" +#include "machine/clock.h" +#include "machine/mc68681.h" +#include "machine/nvram.h" +#include "sound/spkrdev.h" +#include "bus/centronics/ctronics.h" +#include "screen.h" +#include "speaker.h" + + // Defines #undef DEBUG_GA2OPR_W @@ -221,15 +232,6 @@ ToDo: #define DEBUG_SWYFT_VIA1 1 -// Includes -#include "emu.h" -#include "cpu/m68000/m68000.h" -#include "machine/clock.h" -#include "machine/mc68681.h" -#include "machine/nvram.h" -#include "sound/speaker.h" -#include "bus/centronics/ctronics.h" - class cat_state : public driver_device { public: diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index e4f35f9f86f..96d24aba949 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -75,17 +75,20 @@ Versions known to exist but not dumped: ***************************************************************************/ #include "emu.h" +#include "includes/cave.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "cpu/z80/z80.h" -#include "includes/cave.h" #include "sound/2203intf.h" #include "sound/ym2151.h" #include "sound/ymz280b.h" +#include "speaker.h" #include "ppsatan.lh" + /*************************************************************************** diff --git a/src/mame/drivers/cavepc.cpp b/src/mame/drivers/cavepc.cpp index 4854ec018d9..84f915d9be8 100644 --- a/src/mame/drivers/cavepc.cpp +++ b/src/mame/drivers/cavepc.cpp @@ -52,7 +52,7 @@ #include "emu.h" #include "cpu/i386/i386.h" - +#include "screen.h" class cavepc_state : public driver_device diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp index 84e1e615b0c..10d2a83fb3e 100644 --- a/src/mame/drivers/cb2001.cpp +++ b/src/mame/drivers/cb2001.cpp @@ -44,8 +44,10 @@ this seems more like 8-bit hardware, maybe it should be v25, not v35... #include "emu.h" #include "cpu/nec/v25.h" -#include "sound/ay8910.h" #include "machine/i8255.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class cb2001_state : public driver_device diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp index 1a7d204b77f..1df363c46c8 100644 --- a/src/mame/drivers/cball.cpp +++ b/src/mame/drivers/cball.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "cpu/m6800/m6800.h" +#include "screen.h" class cball_state : public driver_device diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp index fa46ad67413..57066cb94db 100644 --- a/src/mame/drivers/cbasebal.cpp +++ b/src/mame/drivers/cbasebal.cpp @@ -15,12 +15,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/cbasebal.h" + #include "cpu/z80/z80.h" #include "machine/kabuki.h" // needed for decoding functions only -#include "includes/cbasebal.h" #include "machine/eepromser.h" #include "sound/okim6295.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index 6899d9e5b77..d77d68f55a0 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -11,7 +11,9 @@ */ #include "emu.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "bus/cbm2/exp.h" #include "bus/cbm2/user.h" #include "bus/ieee488/ieee488.h" diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp index 3cf150aac11..e4361c72f8c 100644 --- a/src/mame/drivers/cbuster.cpp +++ b/src/mame/drivers/cbuster.cpp @@ -32,12 +32,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/cbuster.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" -#include "includes/cbuster.h" #include "sound/2203intf.h" #include "sound/ym2151.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + WRITE16_MEMBER(cbuster_state::twocrude_control_w) { diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index e6b97398ebd..151c67a21a0 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -80,7 +80,10 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/hd44780.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "cc40.lh" diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp index ef9c31078fc..70d3d844d65 100644 --- a/src/mame/drivers/ccastles.cpp +++ b/src/mame/drivers/ccastles.cpp @@ -120,10 +120,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/ccastles.h" + #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "sound/pokey.h" -#include "includes/ccastles.h" +#include "speaker.h" #define MASTER_CLOCK (10000000) diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp index 199631d4f04..f67c8a3e923 100644 --- a/src/mame/drivers/cchance.cpp +++ b/src/mame/drivers/cchance.cpp @@ -35,9 +35,13 @@ cha3 $10d8 #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/tnzs.h" + +#include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + class cchance_state : public tnzs_base_state { diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp index c4124e0c902..2806c648439 100644 --- a/src/mame/drivers/cchasm.cpp +++ b/src/mame/drivers/cchasm.cpp @@ -16,6 +16,7 @@ #include "emu.h" #include "includes/cchasm.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "cpu/m68000/m68000.h" @@ -24,6 +25,7 @@ #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/volt_reg.h" +#include "speaker.h" #define CCHASM_68K_CLOCK (XTAL_8MHz) diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 65f4aca72f1..0e0790b370e 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -238,12 +238,15 @@ Dip location verified from manual for: cclimber, guzzler, swimmer ***************************************************************************/ #include "emu.h" +#include "includes/cclimber.h" +#include "audio/cclimber.h" + #include "cpu/z80/z80.h" #include "machine/segacrpt_device.h" #include "sound/ay8910.h" #include "sound/samples.h" -#include "audio/cclimber.h" -#include "includes/cclimber.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index 3d7b860a464..bed15d8e2ea 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -30,11 +30,13 @@ TODO #include "emu.h" #include "cpu/s2650/s2650.h" -#include "machine/keyboard.h" -#include "imagedev/snapquik.h" #include "imagedev/cassette.h" -#include "sound/wave.h" +#include "imagedev/snapquik.h" +#include "machine/keyboard.h" #include "sound/beep.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" class cd2650_state : public driver_device { diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp index 397f5fa562a..e427048a09f 100644 --- a/src/mame/drivers/cdc721.cpp +++ b/src/mame/drivers/cdc721.cpp @@ -9,9 +9,10 @@ Control Data Corporation CDC 721 Terminal (Viking) *************************************************************************************************************/ - #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" + class cdc721_state : public driver_device { @@ -21,7 +22,8 @@ public: , m_p_videoram(*this, "videoram") , m_maincpu(*this, "maincpu") , m_p_chargen(*this, "chargen") - { } + { + } uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(cdc721); diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp index 0cdcea594ee..f1fca2328fb 100644 --- a/src/mame/drivers/cdi.cpp +++ b/src/mame/drivers/cdi.cpp @@ -26,19 +26,25 @@ TODO: *******************************************************************************/ -#define CLOCK_A XTAL_30MHz -#define CLOCK_B XTAL_19_6608MHz - #include "emu.h" +#include "includes/cdi.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6805/m6805.h" -#include "includes/cdi.h" +#include "imagedev/chd_cd.h" #include "machine/timekpr.h" #include "sound/cdda.h" + +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + #include "cdrom.h" + #include "cdi.lh" -#include "imagedev/chd_cd.h" -#include "softlist.h" + +#define CLOCK_A XTAL_30MHz +#define CLOCK_B XTAL_19_6608MHz #if ENABLE_VERBOSE_LOG static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...) diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp index 09d91496f82..efe3a5e1873 100644 --- a/src/mame/drivers/cedar_magnet.cpp +++ b/src/mame/drivers/cedar_magnet.cpp @@ -115,6 +115,9 @@ I suspect the additional memory was an afterthought. #include "machine/cedar_magnet_sprite.h" #include "machine/cedar_magnet_flop.h" +#include "screen.h" + + #define LOG_IC49_PIO_PB 0 #define LOG_IC48_PIO_PB 0 #define LOG_IC48_PIO_PA 0 diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp index 034f9abdeac..21f395df5fa 100644 --- a/src/mame/drivers/centiped.cpp +++ b/src/mame/drivers/centiped.cpp @@ -415,13 +415,15 @@ each direction to assign the boundries. ***************************************************************************/ #include "emu.h" +#include "includes/centiped.h" + #include "cpu/m6502/m6502.h" #include "cpu/s2650/s2650.h" #include "machine/watchdog.h" #include "machine/atari_vg.h" -#include "includes/centiped.h" #include "sound/sn76496.h" #include "sound/pokey.h" +#include "speaker.h" /************************************* * diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp index 7897f551c1c..48e0a078c7b 100644 --- a/src/mame/drivers/cesclass.cpp +++ b/src/mame/drivers/cesclass.cpp @@ -25,18 +25,21 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "rendlay.h" #include "machine/nvram.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" class cesclassic_state : public driver_device { public: cesclassic_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_oki(*this, "oki"), - m_vram(*this, "vram"), - m_palette(*this, "palette") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_oki(*this, "oki") + , m_vram(*this, "vram") + , m_palette(*this, "palette") + { } DECLARE_WRITE16_MEMBER(irq2_ack_w); DECLARE_WRITE16_MEMBER(irq3_ack_w); diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp index 5c120979a51..64c49741a92 100644 --- a/src/mame/drivers/cfx9850.cpp +++ b/src/mame/drivers/cfx9850.cpp @@ -22,6 +22,7 @@ Debugging information: #include "emu.h" #include "cpu/hcd62121/hcd62121.h" #include "rendlay.h" +#include "screen.h" class cfx9850_state : public driver_device { diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp index c99f7f98c32..3d2df7b32e7 100644 --- a/src/mame/drivers/cgc7900.cpp +++ b/src/mame/drivers/cgc7900.cpp @@ -37,6 +37,7 @@ #include "emu.h" #include "includes/cgc7900.h" +#include "speaker.h" diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp index 95b8b661f65..b8e7f6135ec 100644 --- a/src/mame/drivers/cgenie.cpp +++ b/src/mame/drivers/cgenie.cpp @@ -22,7 +22,10 @@ #include "bus/rs232/rs232.h" #include "bus/cgenie/expansion/expansion.h" #include "bus/cgenie/parallel/parallel.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp index 45d5540c1e9..d88f3ba3420 100644 --- a/src/mame/drivers/chaknpop.cpp +++ b/src/mame/drivers/chaknpop.cpp @@ -110,9 +110,13 @@ Notes: */ #include "emu.h" +#include "includes/chaknpop.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/chaknpop.h" +#include "screen.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/cham24.cpp b/src/mame/drivers/cham24.cpp index 5adcefbd222..a6ad7a89a63 100644 --- a/src/mame/drivers/cham24.cpp +++ b/src/mame/drivers/cham24.cpp @@ -59,6 +59,8 @@ Notes: #include "emu.h" #include "cpu/m6502/n2a03.h" #include "video/ppu2c0x.h" +#include "screen.h" +#include "speaker.h" class cham24_state : public driver_device diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp index 42b6d2f383c..8db48119ce4 100644 --- a/src/mame/drivers/champbas.cpp +++ b/src/mame/drivers/champbas.cpp @@ -86,6 +86,8 @@ TODO: #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp index 5e213440836..f78aa2d96e6 100644 --- a/src/mame/drivers/champbwl.cpp +++ b/src/mame/drivers/champbwl.cpp @@ -154,10 +154,12 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/x1_010.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "sound/x1_010.h" #include "video/seta001.h" +#include "screen.h" +#include "speaker.h" class champbwl_state : public driver_device { diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp index 7303bd08329..d31dc17f154 100644 --- a/src/mame/drivers/chanbara.cpp +++ b/src/mame/drivers/chanbara.cpp @@ -53,6 +53,8 @@ ToDo: #include "emu.h" #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" class chanbara_state : public driver_device diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp index 3b52a804378..1e45c54de6a 100644 --- a/src/mame/drivers/chance32.cpp +++ b/src/mame/drivers/chance32.cpp @@ -22,6 +22,8 @@ #include "cpu/z80/z80.h" #include "sound/okim6295.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #include "chance32.lh" diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp index a05e9d1478f..b439776f39a 100644 --- a/src/mame/drivers/changela.cpp +++ b/src/mame/drivers/changela.cpp @@ -16,6 +16,7 @@ Tomasz Slanina #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "speaker.h" #include "changela.lh" diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp index 9e0e8c6bfa4..e3f545add2d 100644 --- a/src/mame/drivers/channelf.cpp +++ b/src/mame/drivers/channelf.cpp @@ -16,7 +16,9 @@ #include "emu.h" #include "includes/channelf.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #ifndef VERBOSE #define VERBOSE 0 diff --git a/src/mame/drivers/cheekyms.cpp b/src/mame/drivers/cheekyms.cpp index 39c9972c1d1..597df4f82de 100644 --- a/src/mame/drivers/cheekyms.cpp +++ b/src/mame/drivers/cheekyms.cpp @@ -8,8 +8,10 @@ #include "emu.h" #include "includes/cheekyms.h" + #include "cpu/z80/z80.h" #include "sound/volt_reg.h" +#include "speaker.h" INPUT_CHANGED_MEMBER(cheekyms_state::coin_inserted) diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp index 1b4687e0596..9b5fb2c5f69 100644 --- a/src/mame/drivers/chessmst.cpp +++ b/src/mame/drivers/chessmst.cpp @@ -11,17 +11,21 @@ #include "emu.h" + #include "cpu/z80/z80.h" -#include "machine/z80pio.h" #include "machine/clock.h" -#include "sound/speaker.h" +#include "machine/z80pio.h" #include "sound/beep.h" -#include "chessmst.lh" -#include "chessmstdm.lh" +#include "sound/spkrdev.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "speaker.h" + +#include "chessmst.lh" +#include "chessmstdm.lh" + class chessmst_state : public driver_device { diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index 665a234ee12..c33e0b8ea8d 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -17,11 +17,14 @@ Electro-mechanical bubble hockey games: #include "emu.h" #include "cpu/m6502/m6502.h" +#include "machine/6522via.h" #include "sound/ay8910.h" #include "sound/digitalk.h" -#include "machine/6522via.h" +#include "speaker.h" + #include "chexx.lh" + #define MAIN_CLOCK XTAL_4MHz class chexx_state : public driver_device diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index e49b17d38b8..0faeb150bfa 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -373,23 +373,20 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info. */ -#include - #include "emu.h" +#include "includes/xbox.h" + #include "cpu/i386/i386.h" -#include "machine/pic8259.h" -#include "machine/idectrl.h" #include "machine/idehd.h" +#include "machine/jvs13551.h" +#include "machine/jvshost.h" #include "machine/naomigd.h" -#include "video/poly.h" -#include "debug/debugcon.h" + #include "debug/debugcmd.h" +#include "debug/debugcon.h" #include "debugger.h" -#include "includes/xbox_nv2a.h" -#include "includes/xbox.h" -#include "includes/xbox_usb.h" -#include "machine/jvshost.h" -#include "machine/jvs13551.h" + +#include #define LOG_PCI //#define LOG_BASEBOARD @@ -410,7 +407,7 @@ public: int received_packet(uint8_t *buffer); }; -const device_type JVS_MASTER = &device_creator; +const device_type JVS_MASTER = device_creator; jvs_master::jvs_master(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : jvs_host(mconfig, JVS_MASTER, "JVS MASTER", tag, owner, clock, "jvs_master", __FILE__) @@ -496,7 +493,7 @@ private: } jvs; }; -const device_type OHCI_HLEAN2131QC = &device_creator; +const device_type OHCI_HLEAN2131QC = device_creator; extern const device_type OHCI_HLEAN2131SC; @@ -527,7 +524,7 @@ private: uint8_t *region; }; -const device_type OHCI_HLEAN2131SC = &device_creator; +const device_type OHCI_HLEAN2131SC = device_creator; class chihiro_state : public xbox_base_state { @@ -1286,7 +1283,7 @@ protected: //************************************************************************** // device type definition -const device_type IDE_BASEBOARD = &device_creator; +const device_type IDE_BASEBOARD = device_creator; //------------------------------------------------- // ide_baseboard_device - constructor diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index cf794a7eea5..c5159482ae9 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -69,17 +69,18 @@ Input is unique but has a few similarities to DD2 (the coin inputs) Dip locations and factory settings verified with China Gate US manual. */ - - #include "emu.h" +#include "includes/ddragon.h" + #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" -#include "cpu/z80/z80.h" #include "cpu/mcs48/mcs48.h" -#include "sound/ym2151.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/ddragon.h" +#include "sound/ym2151.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_12MHz #define PIXEL_CLOCK MAIN_CLOCK / 2 diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp index f6551dbef10..0ca869a58c5 100644 --- a/src/mame/drivers/chinsan.cpp +++ b/src/mame/drivers/chinsan.cpp @@ -48,6 +48,8 @@ MM63.10N #include "machine/mc8123.h" #include "sound/2203intf.h" #include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" class chinsan_state : public driver_device { diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp index a1a00780ef1..e2f97417977 100644 --- a/src/mame/drivers/chqflag.cpp +++ b/src/mame/drivers/chqflag.cpp @@ -15,12 +15,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/chqflag.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/konami.h" #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/chqflag.h" -#include "includes/konamipt.h" +#include "speaker.h" + #include "chqflag.lh" diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp index 5f201d16a29..32ab18639a2 100644 --- a/src/mame/drivers/chsuper.cpp +++ b/src/mame/drivers/chsuper.cpp @@ -26,8 +26,12 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + #include "chsuper.lh" + class chsuper_state : public driver_device { public: diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp index d6012b4b3df..bae64d2f0d7 100644 --- a/src/mame/drivers/cinemat.cpp +++ b/src/mame/drivers/cinemat.cpp @@ -33,7 +33,6 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/ccpu/ccpu.h" #include "includes/cinemat.h" #include "armora.lh" diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp index 518fb0488e0..facf52901b5 100644 --- a/src/mame/drivers/circus.cpp +++ b/src/mame/drivers/circus.cpp @@ -46,10 +46,12 @@ D000 Paddle Position and Interrupt Reset (where applicable) ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" -#include "sound/samples.h" #include "includes/circus.h" +#include "cpu/m6502/m6502.h" +#include "screen.h" +#include "speaker.h" + #include "circus.lh" #include "crash.lh" diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp index 91d56abb2ce..c2ca81a6df1 100644 --- a/src/mame/drivers/circusc.cpp +++ b/src/mame/drivers/circusc.cpp @@ -53,6 +53,7 @@ This bug is due to 380_r02.6h, it differs from 380_q02.6h by 2 bytes, at #include "emu.h" #include "includes/circusc.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" @@ -61,6 +62,9 @@ This bug is due to 380_r02.6h, it differs from 380_q02.6h by 2 bytes, at #include "sound/discrete.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + void circusc_state::machine_start() { diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp index 186e16c83b6..f458f4570e9 100644 --- a/src/mame/drivers/cischeat.cpp +++ b/src/mame/drivers/cischeat.cpp @@ -170,11 +170,13 @@ Cisco Heat. ***************************************************************************/ #include "emu.h" +#include "includes/cischeat.h" + #include "cpu/m68000/m68000.h" #include "sound/ym2151.h" #include "sound/okim6295.h" #include "machine/jalcrpt.h" -#include "includes/cischeat.h" +#include "speaker.h" #include "cischeat.lh" #include "f1gpstar.lh" diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp index 807898d301c..f78d856f761 100644 --- a/src/mame/drivers/citycon.cpp +++ b/src/mame/drivers/citycon.cpp @@ -10,11 +10,14 @@ Dip locations added from dip listing at crazykong.com ***************************************************************************/ #include "emu.h" +#include "includes/citycon.h" + #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" #include "sound/2203intf.h" -#include "includes/citycon.h" +#include "screen.h" +#include "speaker.h" READ8_MEMBER(citycon_state::citycon_in_r) diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp index 8af858dfcf7..410042c304c 100644 --- a/src/mame/drivers/clayshoo.cpp +++ b/src/mame/drivers/clayshoo.cpp @@ -20,6 +20,7 @@ #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/watchdog.h" +#include "screen.h" class clayshoo_state : public driver_device diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp index 5058ccd5ac0..c8c30cc11f4 100644 --- a/src/mame/drivers/clcd.cpp +++ b/src/mame/drivers/clcd.cpp @@ -22,8 +22,10 @@ #include "machine/msm58321.h" #include "machine/ram.h" #include "machine/nvram.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class clcd_state : public driver_device { diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp index 71a88c07515..71771216d4b 100644 --- a/src/mame/drivers/cliffhgr.cpp +++ b/src/mame/drivers/cliffhgr.cpp @@ -76,13 +76,16 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD) *********************************************************/ #include "emu.h" +#include "audio/cliffhgr.h" + #include "cpu/z80/z80.h" -#include "render.h" #include "machine/ldpr8210.h" #include "video/tms9928a.h" -#include "sound/discrete.h" #include "machine/nvram.h" -#include "audio/cliffhgr.h" + +#include "render.h" +#include "speaker.h" + #define CLIFF_ENABLE_SND_1 NODE_01 #define CLIFF_ENABLE_SND_2 NODE_02 diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp index 137fed27c22..1d2b38bb31f 100644 --- a/src/mame/drivers/cloak.cpp +++ b/src/mame/drivers/cloak.cpp @@ -117,11 +117,14 @@ */ #include "emu.h" +#include "includes/cloak.h" + #include "cpu/m6502/m6502.h" #include "sound/pokey.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/cloak.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp index f080e13730a..a50ff3ad021 100644 --- a/src/mame/drivers/cloud9.cpp +++ b/src/mame/drivers/cloud9.cpp @@ -93,10 +93,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/cloud9.h" + #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "sound/pokey.h" -#include "includes/cloud9.h" +#include "speaker.h" #define MASTER_CLOCK (10000000) diff --git a/src/mame/drivers/clowndwn.cpp b/src/mame/drivers/clowndwn.cpp index 2eacdadfc44..dc1f154534e 100644 --- a/src/mame/drivers/clowndwn.cpp +++ b/src/mame/drivers/clowndwn.cpp @@ -10,6 +10,7 @@ can't find any info on this? */ #include "emu.h" +#include "speaker.h" class clowndwn_state : public driver_device diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp index 82967171193..8ec556b45d4 100644 --- a/src/mame/drivers/clshroad.cpp +++ b/src/mame/drivers/clshroad.cpp @@ -24,9 +24,13 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "audio/wiping.h" #include "includes/clshroad.h" +#include "audio/wiping.h" + +#include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" + void clshroad_state::machine_reset() { diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index 9ee5942e43c..7d8d4e73b2f 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -100,22 +100,28 @@ #include "emu.h" #include "emu.h" -#include "cpu/m6809/m6809.h" + #include "cpu/m6800/m6800.h" +#include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" -#include "machine/clock.h" -#include "machine/7474.h" #include "machine/6821pia.h" #include "machine/6840ptm.h" #include "machine/6850acia.h" -#include "machine/mos6551.h" +#include "machine/7474.h" +#include "machine/clock.h" #include "machine/i8214.h" -#include "machine/wd_fdc.h" -#include "machine/msm5832.h" #include "machine/input_merger.h" +#include "machine/mos6551.h" +#include "machine/msm5832.h" +#include "machine/wd_fdc.h" + #include "video/dl1416.h" +#include "screen.h" +#include "speaker.h" + + #define Q209_CPU_CLOCK 4000000 // ? #define M6809_CLOCK 8000000 // wrong @@ -292,7 +298,7 @@ private: int m_irq_state; }; -const device_type CMI01A_CHANNEL_CARD = &device_creator; +const device_type CMI01A_CHANNEL_CARD = device_creator; cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CMI01A_CHANNEL_CARD, "Fairlight CMI-01A Channel Card", tag, owner, clock, "cmi_01a", __FILE__) diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp index 0a2ccacbcce..9b43af914f3 100644 --- a/src/mame/drivers/cmmb.cpp +++ b/src/mame/drivers/cmmb.cpp @@ -49,6 +49,7 @@ OSC @ 72.576MHz #include "emu.h" #include "cpu/m6502/m65sc02.h" #include "machine/at29x.h" +#include "screen.h" #define MAIN_CLOCK XTAL_72_576MHz diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index 4449f489f2b..eb496bb7ba9 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -43,14 +43,16 @@ Note about version levels using Mutant Fighter as the example: ***************************************************************************/ #include "emu.h" +#include "includes/cninja.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" -#include "includes/cninja.h" #include "machine/decocrpt.h" #include "sound/2203intf.h" #include "sound/ym2151.h" #include "sound/okim6295.h" +#include "speaker.h" WRITE16_MEMBER(cninja_state::cninja_sound_w) { diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp index ee5bbfd6a83..56884656be3 100644 --- a/src/mame/drivers/cntsteer.cpp +++ b/src/mame/drivers/cntsteer.cpp @@ -36,6 +36,8 @@ #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" class cntsteer_state : public driver_device diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index 762d4fcd6bd..97fd810c3ba 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -327,6 +327,7 @@ #include "video/rgbutil.h" #include "sound/rf5c400.h" #include "sound/dmadac.h" +#include "speaker.h" #define GFXFIFO_IN_VERBOSE 0 #define GFXFIFO_OUT_VERBOSE 0 @@ -508,7 +509,7 @@ private: optional_ioport_array<2> m_player_ports; }; -const device_type COBRA_JVS = &device_creator; +const device_type COBRA_JVS = device_creator; cobra_jvs::cobra_jvs(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : jvs_device(mconfig, COBRA_JVS, "JVS (COBRA)", tag, owner, clock, "cobra_jvs", __FILE__), @@ -599,7 +600,7 @@ private: int m_send_ptr; }; -const device_type COBRA_JVS_HOST = &device_creator; +const device_type COBRA_JVS_HOST = device_creator; cobra_jvs_host::cobra_jvs_host(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : jvs_host(mconfig, COBRA_JVS_HOST, "JVS-HOST (COBRA)", tag, owner, clock, "cobra_jvs_host", __FILE__) diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index 5e373f54ba1..10055494949 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -25,18 +25,23 @@ #include "emu.h" #include "includes/coco12.h" -#include "bus/coco/coco_t4426.h" + #include "bus/coco/coco_232.h" -#include "bus/coco/coco_orch90.h" -#include "bus/coco/coco_pak.h" +#include "bus/coco/coco_dwsock.h" #include "bus/coco/coco_fdc.h" #include "bus/coco/coco_multi.h" -#include "bus/coco/coco_dwsock.h" +#include "bus/coco/coco_orch90.h" +#include "bus/coco/coco_pak.h" +#include "bus/coco/coco_t4426.h" + #include "cpu/m6809/m6809.h" -#include "formats/coco_cas.h" #include "imagedev/cassette.h" #include "sound/volt_reg.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/coco_cas.h" //************************************************************************** // ADDRESS MAPS diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp index 2dc58a884a5..e6a4f8b3fdf 100644 --- a/src/mame/drivers/cocoloco.cpp +++ b/src/mame/drivers/cocoloco.cpp @@ -188,18 +188,22 @@ **************************************************************************************/ - -#define MASTER_CLOCK XTAL_20MHz /* confirmed */ -#define CPU_CLOCK MASTER_CLOCK / 16 /* confirmed */ -#define SND_CLOCK MASTER_CLOCK / 8 /* confirmed */ - #include "emu.h" + #include "cpu/m6502/m6502.h" -#include "sound/ay8910.h" #include "machine/netlist.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #include "netlist/devices/net_lib.h" +#define MASTER_CLOCK XTAL_20MHz /* confirmed */ +#define CPU_CLOCK MASTER_CLOCK / 16 /* confirmed */ +#define SND_CLOCK MASTER_CLOCK / 8 /* confirmed */ + + class cocoloco_state : public driver_device { public: diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp index cd36a3a26a7..c8818ad16ae 100644 --- a/src/mame/drivers/coinmstr.cpp +++ b/src/mame/drivers/coinmstr.cpp @@ -127,16 +127,19 @@ ==================================================================================*/ -#define MASTER_CLOCK XTAL_14MHz -#define CPU_CLOCK (MASTER_CLOCK/4) -#define SND_CLOCK (MASTER_CLOCK/8) - #include "emu.h" #include "cpu/z80/z80.h" #include "machine/6821pia.h" #include "video/mc6845.h" #include "sound/ay8910.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_14MHz +#define CPU_CLOCK (MASTER_CLOCK/4) +#define SND_CLOCK (MASTER_CLOCK/8) class coinmstr_state : public driver_device diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp index 63470c88a52..2cbb4927d0c 100644 --- a/src/mame/drivers/coinmvga.cpp +++ b/src/mame/drivers/coinmvga.cpp @@ -216,17 +216,19 @@ *******************************************************************************/ - -#define CPU_CLOCK XTAL_14_7456MHz -#define MACH_CLOCK XTAL_50MHz // 50.35 -#define COM_CLOCK XTAL_20MHz -#define SND_CLOCK XTAL_16_9344MHz - #include "emu.h" #include "cpu/h8/h83006.h" #include "sound/ymz280b.h" #include "machine/nvram.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + + +#define CPU_CLOCK XTAL_14_7456MHz +#define MACH_CLOCK XTAL_50MHz // 50.35 +#define COM_CLOCK XTAL_20MHz +#define SND_CLOCK XTAL_16_9344MHz class coinmvga_state : public driver_device diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp index a673fb42e28..f52baf74d2f 100644 --- a/src/mame/drivers/coleco.cpp +++ b/src/mame/drivers/coleco.cpp @@ -65,7 +65,9 @@ #include "emu.h" #include "includes/coleco.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* Read/Write Handlers */ diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index e07de84e377..6db944fc147 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -121,11 +121,13 @@ Dip location and recommended settings verified with the US manual ***************************************************************************/ #include "emu.h" +#include "includes/combatsc.h" + #include "cpu/m6809/hd6309.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/combatsc.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/comebaby.cpp b/src/mame/drivers/comebaby.cpp index 10f3f11d820..8437f6282fa 100644 --- a/src/mame/drivers/comebaby.cpp +++ b/src/mame/drivers/comebaby.cpp @@ -182,6 +182,7 @@ Nearly everything. #include "emu.h" #include "cpu/i386/i386.h" +#include "screen.h" class comebaby_state : public driver_device diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp index d7f29bc85d4..f48e5565a92 100644 --- a/src/mame/drivers/commando.cpp +++ b/src/mame/drivers/commando.cpp @@ -45,10 +45,13 @@ Note : there is an ingame typo bug that doesn't display the bonus life values ***************************************************************************/ #include "emu.h" +#include "includes/commando.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "includes/commando.h" +#include "screen.h" +#include "speaker.h" /* Memory Maps */ diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp index 54e364c9ebc..ba6f2db68b7 100644 --- a/src/mame/drivers/compgolf.cpp +++ b/src/mame/drivers/compgolf.cpp @@ -15,6 +15,9 @@ #include "emu.h" #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" + #include "includes/compgolf.h" diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp index 60ff050a06b..73c565c7359 100644 --- a/src/mame/drivers/compucolor.cpp +++ b/src/mame/drivers/compucolor.cpp @@ -19,11 +19,6 @@ */ -#define I8080_TAG "ua2" -#define TMS5501_TAG "ud2" -#define CRT5027_TAG "uf9" -#define RS232_TAG "rs232" - #include "emu.h" #include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" @@ -31,8 +26,14 @@ #include "machine/ram.h" #include "machine/tms5501.h" #include "video/tms9927.h" +#include "screen.h" #include "softlist.h" +#define I8080_TAG "ua2" +#define TMS5501_TAG "ud2" +#define CRT5027_TAG "uf9" +#define RS232_TAG "rs232" + class compucolor2_state : public driver_device { public: diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp index 34982b777cb..4c9d82e83fc 100644 --- a/src/mame/drivers/comquest.cpp +++ b/src/mame/drivers/comquest.cpp @@ -42,9 +42,12 @@ icq3250a-d */ #include "emu.h" -#include "cpu/m6805/m6805.h" #include "includes/comquest.h" +#include "cpu/m6805/m6805.h" +#include "screen.h" + + #ifdef UNUSED_FUNCTION READ8_MEMBER(comquest_state::comquest_read) { diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index f23d58f2120..c1925f003ef 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -14,6 +14,7 @@ #include "emu.h" #include "includes/comx35.h" #include "formats/imageutl.h" +#include "screen.h" #include "softlist.h" /*************************************************************************** diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp index 97ba4ffbf5d..0bfa6f452d2 100644 --- a/src/mame/drivers/concept.cpp +++ b/src/mame/drivers/concept.cpp @@ -32,12 +32,15 @@ */ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/concept.h" + +#include "cpu/m68000/m68000.h" #include "bus/a2bus/a2corvus.h" #include "bus/a2bus/corvfdc01.h" #include "bus/a2bus/corvfdc02.h" #include "bus/rs232/rs232.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START(concept_memmap, AS_PROGRAM, 16, concept_state ) AM_RANGE(0x000000, 0x000007) AM_ROM AM_REGION("maincpu", 0x010000) /* boot ROM mirror */ diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp index 38a659b8ed1..70872bf8363 100644 --- a/src/mame/drivers/contra.cpp +++ b/src/mame/drivers/contra.cpp @@ -19,12 +19,14 @@ Dip locations and factory settings verified with manual ***************************************************************************/ #include "emu.h" +#include "includes/contra.h" +#include "includes/konamipt.h" + #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/contra.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(contra_state::contra_interrupt) diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp index e6e0929fbff..f92ee4a445b 100644 --- a/src/mame/drivers/coolpool.cpp +++ b/src/mame/drivers/coolpool.cpp @@ -28,11 +28,14 @@ #include "emu.h" #include "includes/coolpool.h" + #include "cpu/tms32010/tms32010.h" #include "cpu/tms32025/tms32025.h" #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index 5e841a16011..3b4a1d70199 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/src/mame/drivers/coolridr.cpp @@ -282,13 +282,17 @@ to the same bank as defined through A20. #include "emu.h" -#include "cpu/sh2/sh2.h" #include "cpu/m68000/m68000.h" -#include "sound/scsp.h" +#include "cpu/sh2/sh2.h" #include "machine/nvram.h" +#include "sound/scsp.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + #include "aquastge.lh" + #define CLIPMAXX_FULL (496-1) #define CLIPMAXY_FULL (384-1) #define CLIPMINX_FULL (0) diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp index 2c31bb55ed8..d39649f0faa 100644 --- a/src/mame/drivers/cop01.cpp +++ b/src/mame/drivers/cop01.cpp @@ -54,10 +54,13 @@ Mighty Guy board layout: ***************************************************************************/ #include "emu.h" +#include "includes/cop01.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/3526intf.h" -#include "includes/cop01.h" +#include "screen.h" +#include "speaker.h" #define MIGHTGUY_HACK 0 diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp index 36320353ead..2ca28f682db 100644 --- a/src/mame/drivers/cops.cpp +++ b/src/mame/drivers/cops.cpp @@ -36,8 +36,8 @@ #include "sound/sn76496.h" #include "machine/msm6242.h" #include "machine/ldp1450.h" - #include "machine/mos6551.h" +#include "speaker.h" #include "cops.lh" diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp index 92177ecaea6..5081902011f 100644 --- a/src/mame/drivers/copsnrob.cpp +++ b/src/mame/drivers/copsnrob.cpp @@ -57,8 +57,11 @@ Added Dip locations according to manual. ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/copsnrob.h" + +#include "cpu/m6502/m6502.h" +#include "speaker.h" + #include "copsnrob.lh" diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp index ca0818f2ee4..7f6a48fdc22 100644 --- a/src/mame/drivers/corona.cpp +++ b/src/mame/drivers/corona.cpp @@ -300,6 +300,18 @@ **************************************************************************/ +#include "emu.h" +#include "cpu/z80/z80.h" +#include "machine/gen_latch.h" +#include "machine/nvram.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + +#include "re800.lh" +#include "luckyrlt.lh" + + #define WC81_MAIN_XTAL XTAL_24MHz /* Main crystal for Winners Circle 28*28 pins PCB's */ #define WC82_MAIN_XTAL XTAL_18_432MHz /* Main crystal for Winners Circle 18*22 pins PCB's */ #define RE_MAIN_XTAL XTAL_16MHz /* Main for roulette boards */ @@ -309,15 +321,6 @@ #define VIDEOBUF_SIZE 512*512 -#include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/ay8910.h" -#include "machine/gen_latch.h" -#include "machine/nvram.h" -#include "re800.lh" -#include "luckyrlt.lh" - - class corona_state : public driver_device { public: diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp index 51a20cff4b5..9fc7f551b86 100644 --- a/src/mame/drivers/cosmic.cpp +++ b/src/mame/drivers/cosmic.cpp @@ -36,10 +36,12 @@ cosmicg - board can operate in b&w mode if there is no PROM, in this case #include "emu.h" #include "includes/cosmic.h" + #include "cpu/tms9900/tms9980a.h" #include "cpu/z80/z80.h" #include "sound/samples.h" #include "sound/volt_reg.h" +#include "speaker.h" /* Schematics show 12 triggers for discrete sound circuits */ diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp index a92f57f7307..7ab8aa1e817 100644 --- a/src/mame/drivers/cosmicos.cpp +++ b/src/mame/drivers/cosmicos.cpp @@ -35,8 +35,12 @@ #include "emu.h" #include "includes/cosmicos.h" + +#include "speaker.h" + #include "cosmicos.lh" + enum { MODE_RUN, diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 3d9dd7946dd..b375440c97c 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -238,6 +238,8 @@ Stephh's log (2006.09.20) : ***************************************************************************/ #include "emu.h" +#include "includes/cps1.h" + #include "cpu/z80/z80.h" #include "cpu/pic16c5x/pic16c5x.h" #include "cpu/m68000/m68000.h" @@ -246,7 +248,7 @@ Stephh's log (2006.09.20) : #include "sound/okim6295.h" #include "sound/qsound.h" #include "machine/kabuki.h" -#include "includes/cps1.h" +#include "speaker.h" diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index d2be82309e7..6b066c24b50 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -632,6 +632,7 @@ Stephh's inputs notes (based on some tests on the "parent" set) : #include "cpu/m68000/m68000.h" #include "sound/qsound.h" #include "sound/okim6295.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index d313d5959f0..1983758a118 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -467,6 +467,8 @@ hardware modification to the security cart..... #include "bus/scsi/scsi.h" #include "bus/scsi/scsicd.h" #include "machine/wd33c93.h" +#include "screen.h" +#include "speaker.h" #include "sfiii2.lh" diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp index 1c85d5a90ea..0693991486f 100644 --- a/src/mame/drivers/craft.cpp +++ b/src/mame/drivers/craft.cpp @@ -12,6 +12,8 @@ #include "cpu/avr8/avr8.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #define VERBOSE_LEVEL (0) diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp index e7e4c3e4257..034acc2d81f 100644 --- a/src/mame/drivers/crbaloon.cpp +++ b/src/mame/drivers/crbaloon.cpp @@ -15,9 +15,11 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/crbaloon.h" +#include "cpu/z80/z80.h" +#include "screen.h" + /************************************* * diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp index 47492e66061..90687667347 100644 --- a/src/mame/drivers/crgolf.cpp +++ b/src/mame/drivers/crgolf.cpp @@ -90,10 +90,13 @@ protected or a snippet should do the aforementioned string copy. ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/crgolf.h" + +#include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index 6458cce8a71..c35f32de4fb 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -14,12 +14,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/konamipt.h" +#include "includes/crimfght.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/crimfght.h" +#include "speaker.h" WRITE8_MEMBER(crimfght_state::crimfght_coin_w) diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp index b2702b871ca..827e20ac4bf 100644 --- a/src/mame/drivers/crospang.cpp +++ b/src/mame/drivers/crospang.cpp @@ -33,11 +33,14 @@ */ #include "emu.h" +#include "includes/crospang.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "sound/3812intf.h" -#include "includes/crospang.h" +#include "screen.h" +#include "speaker.h" /* main cpu */ diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp index b4ad32f78c0..fb4c3dc74dd 100644 --- a/src/mame/drivers/crshrace.cpp +++ b/src/mame/drivers/crshrace.cpp @@ -129,10 +129,12 @@ Dip locations verified with Service Mode. ***************************************************************************/ #include "emu.h" +#include "includes/crshrace.h" + #include "cpu/m68000/m68000.h" #include "sound/2610intf.h" - -#include "includes/crshrace.h" +#include "screen.h" +#include "speaker.h" #define CRSHRACE_3P_HACK 0 diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp index ea2cd71a269..2222abc56fd 100644 --- a/src/mame/drivers/crvision.cpp +++ b/src/mame/drivers/crvision.cpp @@ -129,7 +129,10 @@ CN1 - main board connector (17x2 pin header) #include "emu.h" #include "includes/crvision.h" + #include "softlist.h" +#include "speaker.h" + /*************************************************************************** MEMORY MAPS diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 6dc5ec1e7ae..c0a7a39d24d 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -184,10 +184,12 @@ GUN_xP are 6 pin gun connectors (pins 1-4 match the UNICO sytle guns): #include "emu.h" #include "cpu/se3208/se3208.h" -#include "video/vrender0.h" #include "machine/ds1302.h" -#include "sound/vrender0.h" #include "machine/nvram.h" +#include "sound/vrender0.h" +#include "video/vrender0.h" +#include "screen.h" +#include "speaker.h" #define IDLE_LOOP_SPEEDUP @@ -206,7 +208,7 @@ public: m_vr0(*this, "vr0"), m_ds1302(*this, "rtc"), m_screen(*this, "screen") - { } + { } /* memory pointers */ required_shared_ptr m_sysregs; diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index 6c88bad56e4..7fb98fc1c9d 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -34,6 +34,7 @@ #include "sound/3812intf.h" #include "sound/volt_reg.h" #include "video/v9938.h" +#include "speaker.h" class csplayh5_state : public driver_device diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp index 0b8fa738fe9..4dec7886d9a 100644 --- a/src/mame/drivers/cswat.cpp +++ b/src/mame/drivers/cswat.cpp @@ -22,9 +22,11 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "audio/namco52.h" + #include "cpu/m6809/m6809.h" #include "cpu/mb88xx/mb88xx.h" -#include "audio/namco52.h" +#include "screen.h" class cswat_state : public driver_device diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp index 781f1ded72e..2d7e0e7c5ac 100644 --- a/src/mame/drivers/ct486.cpp +++ b/src/mame/drivers/ct486.cpp @@ -7,16 +7,21 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/i386/i386.h" -#include "machine/ram.h" -#include "machine/cs4031.h" #include "machine/at_keybc.h" -#include "bus/pc_kbd/pc_kbdc.h" -#include "bus/pc_kbd/keyboards.h" +#include "machine/cs4031.h" +#include "machine/ram.h" +#include "sound/spkrdev.h" + #include "bus/isa/isa.h" #include "bus/isa/isa_cards.h" -#include "sound/speaker.h" +#include "bus/pc_kbd/keyboards.h" +#include "bus/pc_kbd/pc_kbdc.h" + #include "softlist.h" +#include "speaker.h" + //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp index 73abd3dcaf3..02b3de025ff 100644 --- a/src/mame/drivers/cubeqst.cpp +++ b/src/mame/drivers/cubeqst.cpp @@ -26,6 +26,7 @@ #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" class cubeqst_state : public driver_device { diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp index f6d8809b021..1d79bfd89b8 100644 --- a/src/mame/drivers/cubo.cpp +++ b/src/mame/drivers/cubo.cpp @@ -314,6 +314,7 @@ routines : #include "includes/amiga.h" #include "imagedev/chd_cd.h" #include "machine/microtch.h" +#include "speaker.h" /* set to 0 to use control panel with only buttons (as in quiz games) - joy is default in dispenser setup */ diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp index 98582e6d02f..75ab788546b 100644 --- a/src/mame/drivers/cultures.cpp +++ b/src/mame/drivers/cultures.cpp @@ -12,8 +12,10 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/okim6295.h" #include "machine/bankdev.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" #define MCLK 16000000 diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp index c1af7777bb2..2ecdcf66932 100644 --- a/src/mame/drivers/cupidon.cpp +++ b/src/mame/drivers/cupidon.cpp @@ -15,7 +15,8 @@ #include "emu.h" #include "machine/68340.h" - +#include "screen.h" +#include "speaker.h" class cupidon_state : public driver_device diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index 361ee318e92..3cc021fecae 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -172,13 +172,17 @@ Blitter Timing */ #include "emu.h" -#include "cpu/sh4/sh4.h" + #include "cpu/sh4/sh3comn.h" -#include "profiler.h" +#include "cpu/sh4/sh4.h" #include "machine/rtc9701.h" +#include "machine/serflash.h" #include "sound/ymz770.h" #include "video/epic12.h" -#include "machine/serflash.h" + +#include "profiler.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp index d331ed50507..df7d4f5b068 100644 --- a/src/mame/drivers/cvs.cpp +++ b/src/mame/drivers/cvs.cpp @@ -96,6 +96,7 @@ Todo & FIXME: #include "includes/cvs.h" #include "cpu/s2650/s2650.h" #include "sound/volt_reg.h" +#include "speaker.h" /* Turn to 1 so all inputs are always available (this shall only be a debug feature) */ diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp index 730b61fbe00..78f8bdf58b2 100644 --- a/src/mame/drivers/cxgz80.cpp +++ b/src/mame/drivers/cxgz80.cpp @@ -27,6 +27,7 @@ Chess 2001: #include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" // internal artwork #include "cxg_ch2001.lh" // clickable diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp index 77c055bbd91..d09cf159c53 100644 --- a/src/mame/drivers/cxhumax.cpp +++ b/src/mame/drivers/cxhumax.cpp @@ -15,6 +15,9 @@ #include "emu.h" #include "includes/cxhumax.h" +#include "screen.h" + + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...) diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp index bbcb02505aa..6d5ce2752f3 100644 --- a/src/mame/drivers/cyberbal.cpp +++ b/src/mame/drivers/cyberbal.cpp @@ -23,9 +23,12 @@ #include "emu.h" #include "includes/cyberbal.h" + #include "machine/watchdog.h" #include "sound/ym2151.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "rendlay.h" diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp index aaa7d82eddc..b33b2231b5e 100644 --- a/src/mame/drivers/cybertnk.cpp +++ b/src/mame/drivers/cybertnk.cpp @@ -170,11 +170,13 @@ lev 7 : 0x7c : 0000 07e0 - input device clear? *******************************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/8950intf.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class cybertnk_state : public driver_device diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index 03c385675b4..a9989184623 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -20,8 +20,11 @@ ToDo: #include "emu.h" #include "includes/cybiko.h" -#include "rendlay.h" + #include "bus/rs232/rs232.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" // +------------------------------------------------------+ // | Cybiko Classic (CY6411) | V2 | diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp index 9365e2b0b72..449366280b4 100644 --- a/src/mame/drivers/cyclemb.cpp +++ b/src/mame/drivers/cyclemb.cpp @@ -72,10 +72,13 @@ Dumped by Chack'n ****************************************************************************************************/ #include "emu.h" +#include "machine/tait8741.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "machine/tait8741.h" +#include "screen.h" +#include "speaker.h" class cyclemb_state : public driver_device diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 800d7c4a4c5..d3d91ca9c92 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -40,11 +40,13 @@ #include "emu.h" #include "cpu/m6800/m6800.h" -#include "sound/beep.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "sound/wave.h" #include "machine/6821pia.h" +#include "sound/beep.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" class d6800_state : public driver_device diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp index f076490d0bc..7223405f627 100644 --- a/src/mame/drivers/d9final.cpp +++ b/src/mame/drivers/d9final.cpp @@ -29,6 +29,8 @@ #include "machine/msm6242.h" #include "sound/es8712.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" class d9final_state : public driver_device diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index 9dbf09247d1..6c328d238b7 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -38,6 +38,8 @@ #include "sound/msm5205.h" #include "sound/ay8910.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class dacholer_state : public driver_device { diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp index f4840b97104..9975834117a 100644 --- a/src/mame/drivers/dai.cpp +++ b/src/mame/drivers/dai.cpp @@ -62,7 +62,9 @@ Timings: #include "emu.h" #include "includes/dai.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* I/O ports */ static ADDRESS_MAP_START( dai_io , AS_IO, 8, dai_state ) diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp index f92884ea9ae..664b9e7a421 100644 --- a/src/mame/drivers/dai3wksi.cpp +++ b/src/mame/drivers/dai3wksi.cpp @@ -38,10 +38,14 @@ Driver Notes: */ #include "emu.h" + #include "cpu/z80/z80.h" -#include "sound/samples.h" #include "machine/rescap.h" +#include "sound/samples.h" #include "sound/sn76477.h" +#include "screen.h" +#include "speaker.h" + #define USE_SAMPLES (1) diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp index 73b83e92ffd..a1273562894 100644 --- a/src/mame/drivers/dambustr.cpp +++ b/src/mame/drivers/dambustr.cpp @@ -51,11 +51,12 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "emu.h" +#include "includes/galaxold.h" +#include "audio/galaxian.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" -#include "audio/galaxian.h" -#include "includes/galaxold.h" +#include "speaker.h" class dambustr_state : public galaxold_state diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 933e06e1666..12a4f4b8ec9 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -130,14 +130,18 @@ sounds. ***************************************************************************/ #include "emu.h" +#include "includes/darius.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" -#include "audio/taitosnd.h" #include "sound/2203intf.h" -#include "sound/msm5205.h" #include "sound/flt_vol.h" -#include "includes/darius.h" +#include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" + #include "darius.lh" diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp index b08e2357013..e14f1e4ebd6 100644 --- a/src/mame/drivers/darkmist.cpp +++ b/src/mame/drivers/darkmist.cpp @@ -29,8 +29,9 @@ TODO: */ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/darkmist.h" +#include "cpu/z80/z80.h" +#include "speaker.h" void darkmist_state::machine_start() { diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp index ddf00ff9679..b2c8c08d9ee 100644 --- a/src/mame/drivers/darkseal.cpp +++ b/src/mame/drivers/darkseal.cpp @@ -18,12 +18,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/darkseal.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "sound/2203intf.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/darkseal.h" +#include "screen.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp index 33f3226230c..5290821c49a 100644 --- a/src/mame/drivers/daruma.cpp +++ b/src/mame/drivers/daruma.cpp @@ -17,7 +17,8 @@ #include "emu.h" #include "cpu/mcs51/mcs51.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "speaker.h" //TODO: #include "ds348.lh" class daruma_state : public driver_device diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp index 0758844c80c..5248221a79f 100644 --- a/src/mame/drivers/dassault.cpp +++ b/src/mame/drivers/dassault.cpp @@ -207,11 +207,15 @@ Dip locations verified with US conversion kit manual. ***************************************************************************/ #include "emu.h" +#include "includes/dassault.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" -#include "includes/dassault.h" #include "sound/2203intf.h" #include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" + /**********************************************************************************/ diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp index 9ba9a8c1525..e4fe267f8fd 100644 --- a/src/mame/drivers/dblcrown.cpp +++ b/src/mame/drivers/dblcrown.cpp @@ -50,6 +50,8 @@ #include "machine/i8255.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "screen.h" +#include "speaker.h" #include "dblcrown.lh" #define DEBUG_VRAM diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp index ce68c5e7336..f5d0265696c 100644 --- a/src/mame/drivers/dblewing.cpp +++ b/src/mame/drivers/dblewing.cpp @@ -67,16 +67,18 @@ Notes: */ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" -#include "machine/decocrpt.h" +#include "cpu/z80/z80.h" #include "machine/deco102.h" -#include "sound/ym2151.h" +#include "machine/deco104.h" +#include "machine/decocrpt.h" +#include "machine/gen_latch.h" #include "sound/okim6295.h" +#include "sound/ym2151.h" #include "video/deco16ic.h" #include "video/decospr.h" -#include "machine/deco104.h" -#include "machine/gen_latch.h" +#include "screen.h" +#include "speaker.h" class dblewing_state : public driver_device { diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp index 18c8bf5bc77..3a7b9deab8d 100644 --- a/src/mame/drivers/dbz.cpp +++ b/src/mame/drivers/dbz.cpp @@ -53,11 +53,13 @@ Notes: */ #include "emu.h" +#include "includes/dbz.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/dbz.h" +#include "speaker.h" TIMER_DEVICE_CALLBACK_MEMBER(dbz_state::dbz_scanline) diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index cb96b4c7f88..a1e677aeaa1 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -261,17 +261,20 @@ */ #include "emu.h" +#include "includes/dccons.h" + #include "cpu/arm7/arm7.h" -#include "cpu/sh4/sh4.h" #include "cpu/arm7/arm7core.h" -#include "sound/aica.h" -#include "machine/aicartc.h" -#include "includes/dc.h" -#include "includes/dccons.h" +#include "cpu/sh4/sh4.h" #include "imagedev/chd_cd.h" +#include "machine/aicartc.h" #include "machine/dc-ctrl.h" #include "machine/gdrom.h" +#include "screen.h" +#include "speaker.h" + + #define CPU_CLOCK (200000000) READ64_MEMBER(dc_cons_state::dcus_idle_skip_r ) diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp index 59d07364a06..2d3a4d0b93d 100644 --- a/src/mame/drivers/dcheese.cpp +++ b/src/mame/drivers/dcheese.cpp @@ -31,12 +31,14 @@ #include "emu.h" -#include "cpu/m6809/m6809.h" +#include "includes/dcheese.h" + #include "cpu/m68000/m68000.h" +#include "cpu/m6809/m6809.h" #include "machine/eepromser.h" #include "machine/ticket.h" #include "machine/watchdog.h" -#include "includes/dcheese.h" +#include "speaker.h" #define MAIN_OSC 14318180 diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp index 9a9aca38a4f..7bed52872e1 100644 --- a/src/mame/drivers/dcon.cpp +++ b/src/mame/drivers/dcon.cpp @@ -15,14 +15,17 @@ ***************************************************************************/ #include "emu.h" +#include "includes/dcon.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/3812intf.h" #include "sound/ym2151.h" #include "sound/okim6295.h" #include "audio/seibu.h" -#include "includes/dcon.h" #include "video/seibu_crtc.h" +#include "screen.h" +#include "speaker.h" /***************************************************************************/ diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp index 3241d2ca7be..0c17a23b282 100644 --- a/src/mame/drivers/dct11em.cpp +++ b/src/mame/drivers/dct11em.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "cpu/t11/t11.h" +#include "screen.h" + class dct11em_state : public driver_device { diff --git a/src/mame/drivers/dday.cpp b/src/mame/drivers/dday.cpp index a9fbe5cd085..941572aa623 100644 --- a/src/mame/drivers/dday.cpp +++ b/src/mame/drivers/dday.cpp @@ -52,9 +52,11 @@ write: ***************************************************************************/ #include "emu.h" +#include "includes/dday.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/dday.h" +#include "speaker.h" static ADDRESS_MAP_START( dday_map, AS_PROGRAM, 8, dday_state ) diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp index 916f7d981ea..d8c389d181b 100644 --- a/src/mame/drivers/ddayjlc.cpp +++ b/src/mame/drivers/ddayjlc.cpp @@ -57,6 +57,8 @@ $842f = lives #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class ddayjlc_state : public driver_device diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp index 6ecf09b766a..5ec30e5d35f 100644 --- a/src/mame/drivers/ddealer.cpp +++ b/src/mame/drivers/ddealer.cpp @@ -116,6 +116,8 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" class ddealer_state : public driver_device { diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 96f7bdead39..f31472f5909 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -113,13 +113,16 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/dynax.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/gen_latch.h" #include "machine/msm6242.h" #include "machine/nvram.h" -#include "includes/dynax.h" + +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index 0ceccf6eec9..37c11373147 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -53,13 +53,16 @@ Dip locations verified with manual for ddragon & ddragon2 ***************************************************************************/ #include "emu.h" +#include "includes/ddragon.h" + #include "cpu/m6809/hd6309.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/ddragon.h" +#include "sound/ym2151.h" + +#include "speaker.h" #define MAIN_CLOCK XTAL_12MHz diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 46d9993b585..db6e118c371 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -183,10 +183,13 @@ ROMs (All ROMs are 27C010 EPROM. - means not populated) #include "emu.h" +#include "includes/ddragon3.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/ym2151.h" -#include "includes/ddragon3.h" + +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp index 54f269efa4e..b4067ab0fd3 100644 --- a/src/mame/drivers/ddribble.cpp +++ b/src/mame/drivers/ddribble.cpp @@ -12,11 +12,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/ddribble.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/konamipt.h" -#include "includes/ddribble.h" +#include "screen.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(ddribble_state::ddribble_interrupt_0) diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index 628e46554de..51e9f3303de 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -11,15 +11,19 @@ #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" -#include "machine/decopincpu.h" #include "machine/6821pia.h" -#include "sound/ym2151.h" +#include "machine/decopincpu.h" #include "sound/msm5205.h" +#include "sound/ym2151.h" +#include "speaker.h" + #include "de2.lh" #include "de2a3.lh" + // To start Secret Service, hold I, O and Left ALT while pressing Start. // To start Laser War, hold S, D, and F while pressing Start. // To start Back to the Future, hold D and F while pressing Start. diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp index b3eccfcd52f..d5612a06d73 100644 --- a/src/mame/drivers/deadang.cpp +++ b/src/mame/drivers/deadang.cpp @@ -41,11 +41,14 @@ Dip locations and factory settings verified with US manual */ #include "emu.h" +#include "includes/deadang.h" + #include "cpu/nec/nec.h" #include "machine/watchdog.h" #include "sound/2203intf.h" #include "sound/msm5205.h" -#include "includes/deadang.h" +#include "screen.h" +#include "speaker.h" /* Read/Write Handlers */ diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index 0e42f6eea9b..45be093de3d 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -329,16 +329,19 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/dec0.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "cpu/h6280/h6280.h" #include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" #include "cpu/m6805/m68705.h" -#include "includes/dec0.h" #include "sound/2203intf.h" #include "sound/3812intf.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index 3912641269c..e1d95f58bb8 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -42,16 +42,20 @@ To do: ***************************************************************************/ #include "emu.h" +#include "includes/dec8.h" + +#include "cpu/m6502/m6502.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" -#include "cpu/m6502/m6502.h" #include "cpu/mcs51/mcs51.h" +#include "machine/deco222.h" #include "sound/2203intf.h" -#include "sound/3812intf.h" #include "sound/3526intf.h" +#include "sound/3812intf.h" #include "sound/msm5205.h" -#include "includes/dec8.h" -#include "machine/deco222.h" + +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp index f273a4ad6a2..a837dc960f7 100644 --- a/src/mame/drivers/deco156.cpp +++ b/src/mame/drivers/deco156.cpp @@ -22,6 +22,8 @@ #include "sound/ymz280b.h" #include "video/deco16ic.h" #include "video/decospr.h" +#include "screen.h" +#include "speaker.h" class deco156_state : public driver_device { diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 65d833c0b87..ffb6d966dd5 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -363,6 +363,8 @@ NOTE: There are several unpopulated locations (denoted by *) for additional rom ***************************************************************************/ #include "emu.h" +#include "includes/deco32.h" + #include "cpu/z80/z80.h" #include "cpu/arm/arm.h" #include "cpu/h6280/h6280.h" @@ -370,7 +372,7 @@ NOTE: There are several unpopulated locations (denoted by *) for additional rom #include "cpu/z80/z80.h" #include "machine/decocrpt.h" #include "machine/deco156.h" -#include "includes/deco32.h" +#include "speaker.h" /**********************************************************************************/ diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp index 85c297161c6..b9736735627 100644 --- a/src/mame/drivers/deco_ld.cpp +++ b/src/mame/drivers/deco_ld.cpp @@ -114,6 +114,7 @@ Sound processor - 6502 #include "machine/ldp1000.h" #include "machine/gen_latch.h" #include "machine/6850acia.h" +#include "speaker.h" class deco_ld_state : public driver_device diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index e9761f99b75..a2a5b530991 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/src/mame/drivers/deco_mlc.cpp @@ -100,11 +100,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/deco_mlc.h" + #include "machine/deco156.h" #include "machine/eepromser.h" #include "cpu/arm/arm.h" #include "cpu/sh2/sh2.h" -#include "includes/deco_mlc.h" +#include "speaker.h" /***************************************************************************/ diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp index 0a4748abb1f..4bc706db9c2 100644 --- a/src/mame/drivers/decocass.cpp +++ b/src/mame/drivers/decocass.cpp @@ -42,12 +42,14 @@ ***********************************************************************/ #include "emu.h" +#include "includes/decocass.h" + #include "cpu/m6502/m6502.h" #include "cpu/mcs48/mcs48.h" -#include "includes/decocass.h" +#include "machine/deco222.h" #include "machine/decocass_tape.h" #include "sound/ay8910.h" -#include "machine/deco222.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_12MHz #define HCLK (MASTER_CLOCK/2) diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp index cebcc1a64a2..9a7dfa56a52 100644 --- a/src/mame/drivers/dectalk.cpp +++ b/src/mame/drivers/dectalk.cpp @@ -267,6 +267,7 @@ dgc (dg(no!spam)cx@mac.com) #include "machine/x2212.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" class dectalk_state : public driver_device diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp index 5a0f621f801..9a7087ec88e 100644 --- a/src/mame/drivers/decwritr.cpp +++ b/src/mame/drivers/decwritr.cpp @@ -11,10 +11,12 @@ // tech manual: http://manx.classiccmp.org/mirror/vt100.net/docs/la120-tm/la120tm1.pdf #include "emu.h" -#include "render.h" #include "cpu/i8085/i8085.h" #include "machine/i8251.h" #include "sound/beep.h" +#include "render.h" +#include "speaker.h" + #define KBD_VERBOSE 1 #define LED_VERBOSE 1 diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp index 363b31bdaa9..ea4969c5a8e 100644 --- a/src/mame/drivers/deniam.cpp +++ b/src/mame/drivers/deniam.cpp @@ -44,11 +44,14 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/deniam.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" #include "sound/3812intf.h" -#include "includes/deniam.h" +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(deniam_state::sound_command_w) diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp index 23bd00f1de7..52669b33d80 100644 --- a/src/mame/drivers/deshoros.cpp +++ b/src/mame/drivers/deshoros.cpp @@ -33,6 +33,8 @@ TODO: #include "cpu/m6809/m6809.h" #include "sound/beep.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class destiny_state : public driver_device { diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp index a63683c23e6..01bcc499706 100644 --- a/src/mame/drivers/destroyr.cpp +++ b/src/mame/drivers/destroyr.cpp @@ -15,6 +15,7 @@ TODO: #include "emu.h" #include "cpu/m6800/m6800.h" #include "machine/watchdog.h" +#include "screen.h" #include "destroyr.lh" diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp index db33b51decd..4b74475dd79 100644 --- a/src/mame/drivers/dfruit.cpp +++ b/src/mame/drivers/dfruit.cpp @@ -19,9 +19,11 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/2203intf.h" -#include "machine/tc009xlvc.h" #include "machine/i8255.h" +#include "machine/tc009xlvc.h" +#include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" class dfruit_state : public driver_device { @@ -30,7 +32,7 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vdp(*this, "tc0091lvc") - { } + { } required_device m_maincpu; required_device m_vdp; diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp index 9763d6467b4..a1a82b3af9c 100644 --- a/src/mame/drivers/dgn_beta.cpp +++ b/src/mame/drivers/dgn_beta.cpp @@ -41,15 +41,18 @@ documentation still exists. ***************************************************************************/ #include "emu.h" +#include "includes/dgn_beta.h" + #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" -#include "includes/dgn_beta.h" #include "machine/mos6551.h" +#include "machine/ram.h" +#include "video/mc6845.h" +#include "screen.h" + #include "formats/vdk_dsk.h" #include "formats/dmk_dsk.h" #include "imagedev/flopdrv.h" -#include "machine/ram.h" -#include "video/mc6845.h" /* diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp index d6d3c1e6c90..46aaaed084f 100644 --- a/src/mame/drivers/dgpix.cpp +++ b/src/mame/drivers/dgpix.cpp @@ -152,8 +152,9 @@ Notes: *********************************************************************/ #include "emu.h" -#include "machine/nvram.h" #include "cpu/e132xs/e132xs.h" +#include "machine/nvram.h" +#include "screen.h" class dgpix_state : public driver_device diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp index 3a71f1a790d..59067b10c2f 100644 --- a/src/mame/drivers/didact.cpp +++ b/src/mame/drivers/didact.cpp @@ -45,20 +45,24 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/m6800/m6800.h" // For mp68a, md6802 and e100 #include "cpu/m6809/m6809.h" // For candela #include "machine/6821pia.h" // For all boards #include "machine/6840ptm.h" // For candela #include "machine/6850acia.h"// For candela -#include "video/mc6845.h" // For candela -#include "machine/wd_fdc.h" // For candela +#include "machine/74145.h" // For the md6802 and e100 #include "machine/clock.h" // For candela #include "machine/ram.h" // For candela +#include "machine/wd_fdc.h" // For candela #include "video/dm9368.h" // For the mp68a -#include "machine/74145.h" // For the md6802 and e100 +#include "video/mc6845.h" // For candela // Features #include "imagedev/cassette.h" #include "bus/rs232/rs232.h" + +#include "screen.h" + // Generated artwork includes #include "mp68a.lh" #include "md6802.lh" diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp index 7c2cf0b489e..b19aa584ac4 100644 --- a/src/mame/drivers/dietgo.cpp +++ b/src/mame/drivers/dietgo.cpp @@ -21,6 +21,8 @@ PAL16R6A 11H */ #include "emu.h" +#include "includes/dietgo.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "sound/ym2151.h" @@ -28,7 +30,8 @@ PAL16R6A 11H #include "machine/decocrpt.h" #include "machine/deco102.h" #include "machine/gen_latch.h" -#include "includes/dietgo.h" +#include "screen.h" +#include "speaker.h" READ16_MEMBER( dietgo_state::dietgo_protection_region_0_104_r ) diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp index b92ade882fc..50dbb4fa138 100644 --- a/src/mame/drivers/digel804.cpp +++ b/src/mame/drivers/digel804.cpp @@ -27,6 +27,20 @@ * ******************************************************************************/ +/* Core includes */ +#include "emu.h" +#include "bus/rs232/rs232.h" +#include "cpu/z80/z80.h" +#include "machine/mm74c922.h" +#include "machine/mos6551.h" +#include "machine/ram.h" +#include "machine/roc10937.h" +#include "sound/spkrdev.h" +#include "speaker.h" + +#include "digel804.lh" + + // port 40 read reads eprom socket pins 11-13, 15-19 (i.e. eprom pin D0 to pin D7) // port 40 write writes eprom socket pins 11-13, 15-19 (i.e. eprom pin D0 to pin D7) @@ -53,18 +67,6 @@ // port 47 write is tim0-tim7 -/* Core includes */ -#include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/speaker.h" -#include "machine/roc10937.h" -#include "machine/mos6551.h" -#include "machine/mm74c922.h" -#include "machine/ram.h" -#include "bus/rs232/rs232.h" -#include "digel804.lh" - - class digel804_state : public driver_device { public: diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index b935b9769d7..bf528eeff99 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -35,11 +35,13 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#include "sound/speaker.h" -#include "video/mc6845.h" #include "machine/keyboard.h" #include "machine/upd765.h" +#include "sound/spkrdev.h" +#include "video/mc6845.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class dim68k_state : public driver_device { diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp index afbf0c69d10..67c630b2995 100644 --- a/src/mame/drivers/discoboy.cpp +++ b/src/mame/drivers/discoboy.cpp @@ -43,10 +43,12 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/gen_latch.h" #include "machine/74157.h" +#include "machine/gen_latch.h" #include "sound/msm5205.h" #include "sound/3812intf.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp index 77d189daa20..e06dc334728 100644 --- a/src/mame/drivers/divebomb.cpp +++ b/src/mame/drivers/divebomb.cpp @@ -92,6 +92,8 @@ To verify against original HW: #include "emu.h" #include "includes/divebomb.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp index 7f726d3f827..0f6195056f4 100644 --- a/src/mame/drivers/diverboy.cpp +++ b/src/mame/drivers/diverboy.cpp @@ -53,6 +53,8 @@ #include "cpu/m68000/m68000.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp index c3f1fe73019..b0b88fc8ba4 100644 --- a/src/mame/drivers/djboy.cpp +++ b/src/mame/drivers/djboy.cpp @@ -139,11 +139,14 @@ Notes: */ #include "emu.h" +#include "includes/djboy.h" + #include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/djboy.h" +#include "screen.h" +#include "speaker.h" /* KANEKO BEAST state */ diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp index cff47d0f6d6..c38d9060599 100644 --- a/src/mame/drivers/djmain.cpp +++ b/src/mame/drivers/djmain.cpp @@ -66,13 +66,15 @@ hard drive 3.5 adapter long 3.5 IDE cable 3.5 adapter PCB */ #include "emu.h" +#include "includes/djmain.h" + #include "cpu/m68000/m68000.h" #include "machine/ataintf.h" #include "sound/k054539.h" -#include "includes/djmain.h" #include "machine/idehd.h" - +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index a871124363e..6f3bee6af35 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -407,12 +407,14 @@ Donkey Kong Notes ***************************************************************************/ #include "emu.h" +#include "includes/dkong.h" + #include "cpu/z80/z80.h" #include "cpu/s2650/s2650.h" #include "cpu/m6502/m6502.h" -#include "includes/dkong.h" #include "machine/eepromser.h" + /************************************* * * Defines diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index 802a2af1c3c..bfc45ed180c 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -35,7 +35,7 @@ *************************************************************************/ #include "emu.h" -#include "render.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "machine/ldv1000.h" @@ -44,7 +44,10 @@ #include "machine/z80ctc.h" #include "machine/z80dart.h" #include "sound/ay8910.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "render.h" +#include "speaker.h" + #include "dlair.lh" diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp index 05d95111598..4a590f8d824 100644 --- a/src/mame/drivers/dlair2.cpp +++ b/src/mame/drivers/dlair2.cpp @@ -32,6 +32,8 @@ http://www.dragons-lair-project.com/tech/pages/dl2.asp #include "emu.h" #include "cpu/i86/i86.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_30MHz diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp index fa7ea856385..239a0e5c895 100644 --- a/src/mame/drivers/dm7000.cpp +++ b/src/mame/drivers/dm7000.cpp @@ -40,6 +40,7 @@ #include "emu.h" #include "includes/dm7000.h" +#include "screen.h" #define VERBOSE_LEVEL ( 9 ) diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp index 77d521a461a..6c69ef087c5 100644 --- a/src/mame/drivers/dmndrby.cpp +++ b/src/mame/drivers/dmndrby.cpp @@ -53,10 +53,12 @@ DD10 DD14 DD18 H5 DD21 #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/gen_latch.h" #include "machine/nvram.h" +#include "sound/ay8910.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class dmndrby_state : public driver_device diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp index ca4cbc7f732..72a4d2f64cb 100644 --- a/src/mame/drivers/dms5000.cpp +++ b/src/mame/drivers/dms5000.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "cpu/i86/i86.h" +#include "screen.h" class dms5000_state : public driver_device diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index 16dcaaab62e..a999ab1e9d3 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -10,15 +10,15 @@ #include "emu.h" -#include "cpu/z80/z80.h" + #include "cpu/mcs48/mcs48.h" -#include "machine/upd765.h" +#include "cpu/z80/z80.h" #include "machine/am9517a.h" -#include "machine/pit8253.h" #include "machine/dmv_keyb.h" -#include "sound/speaker.h" +#include "machine/pit8253.h" +#include "machine/upd765.h" +#include "sound/spkrdev.h" #include "video/upd7220.h" -#include "formats/dmv_dsk.h" // expansion slots #include "bus/dmv/dmvbus.h" @@ -31,7 +31,11 @@ #include "bus/dmv/k806.h" #include "bus/dmv/ram.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/dmv_dsk.h" #include "dmv.lh" diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp index 55d63c40872..b68e02187d2 100644 --- a/src/mame/drivers/docastle.cpp +++ b/src/mame/drivers/docastle.cpp @@ -156,10 +156,13 @@ Dip locations verified with manual for docastle, dorunrun and dowild. ***************************************************************************/ #include "emu.h" +#include "includes/docastle.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/sn76496.h" -#include "includes/docastle.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp index 2b829e47369..ff3ff5bd835 100644 --- a/src/mame/drivers/dogfgt.cpp +++ b/src/mame/drivers/dogfgt.cpp @@ -10,9 +10,11 @@ driver by Nicola Salmoria ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/dogfgt.h" + +#include "cpu/m6502/m6502.h" #include "sound/ay8910.h" +#include "speaker.h" READ8_MEMBER(dogfgt_state::sharedram_r) diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp index eaa053ce26c..df86f67e501 100644 --- a/src/mame/drivers/dolphunk.cpp +++ b/src/mame/drivers/dolphunk.cpp @@ -82,9 +82,11 @@ #include "emu.h" #include "cpu/s2650/s2650.h" -#include "sound/speaker.h" #include "imagedev/cassette.h" +#include "sound/spkrdev.h" #include "sound/wave.h" +#include "speaker.h" + #include "dolphunk.lh" diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp index b2ea6cd2c0f..e0a9ab7f6a0 100644 --- a/src/mame/drivers/dominob.cpp +++ b/src/mame/drivers/dominob.cpp @@ -65,6 +65,8 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class dominob_state : public driver_device { diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index bbe3dbbd544..2caa7dab626 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -72,13 +72,17 @@ are almost identical, except for much darker BG layer colors). ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/dooyong.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/dooyong.h" +#include "sound/ym2151.h" + +#include "speaker.h" + WRITE8_MEMBER(dooyong_z80_state::bankswitch_w) { diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp index e4fb72a615c..0d53cd09e56 100644 --- a/src/mame/drivers/dorachan.cpp +++ b/src/mame/drivers/dorachan.cpp @@ -12,6 +12,7 @@ Todo: #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class dorachan_state : public driver_device diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp index a06ebd7ffcc..76441f045b5 100644 --- a/src/mame/drivers/dotrikun.cpp +++ b/src/mame/drivers/dotrikun.cpp @@ -28,6 +28,7 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" #include "dotrikun.lh" diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp index a540f882473..07c40176dd5 100644 --- a/src/mame/drivers/dragrace.cpp +++ b/src/mame/drivers/dragrace.cpp @@ -7,9 +7,10 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6800/m6800.h" #include "includes/dragrace.h" +#include "cpu/m6800/m6800.h" #include "sound/discrete.h" +#include "speaker.h" #include "dragrace.lh" diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp index 59b95ffca12..12ea37fb4c2 100644 --- a/src/mame/drivers/dreambal.cpp +++ b/src/mame/drivers/dreambal.cpp @@ -21,14 +21,16 @@ lamps? */ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/deco104.h" #include "machine/decocrpt.h" +#include "machine/eepromser.h" #include "sound/okim6295.h" #include "video/deco16ic.h" #include "video/decospr.h" -#include "machine/eepromser.h" -#include "machine/deco104.h" +#include "screen.h" +#include "speaker.h" class dreambal_state : public driver_device { diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp index 1d3d7580b4b..a712c70a08d 100644 --- a/src/mame/drivers/dreamwld.cpp +++ b/src/mame/drivers/dreamwld.cpp @@ -99,6 +99,8 @@ Stephh's notes (based on the game M68EC020 code and some tests) : #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class dreamwld_state : public driver_device diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp index 3454528c6ee..03a8e521f2c 100644 --- a/src/mame/drivers/drgnmst.cpp +++ b/src/mame/drivers/drgnmst.cpp @@ -37,10 +37,13 @@ Notes: */ #include "emu.h" +#include "includes/drgnmst.h" + #include "cpu/m68000/m68000.h" #include "cpu/pic16c5x/pic16c5x.h" #include "sound/okim6295.h" -#include "includes/drgnmst.h" +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(drgnmst_state::drgnmst_coin_w) diff --git a/src/mame/drivers/dribling.cpp b/src/mame/drivers/dribling.cpp index 2ac6caa7181..ac8504aae24 100644 --- a/src/mame/drivers/dribling.cpp +++ b/src/mame/drivers/dribling.cpp @@ -28,9 +28,11 @@ ***************************************************************************/ #include "emu.h" +#include "includes/dribling.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "includes/dribling.h" +#include "screen.h" diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp index 63a018254a0..71aa57fbe06 100644 --- a/src/mame/drivers/drmicro.cpp +++ b/src/mame/drivers/drmicro.cpp @@ -11,10 +11,13 @@ Quite similar to Appoooh *****************************************************************************/ #include "emu.h" +#include "includes/drmicro.h" + #include "cpu/z80/z80.h" #include "sound/msm5205.h" #include "sound/sn76496.h" -#include "includes/drmicro.h" +#include "screen.h" +#include "speaker.h" #define MCLK 18432000 diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp index 62fb80d5498..827d5645e4f 100644 --- a/src/mame/drivers/drtomy.cpp +++ b/src/mame/drivers/drtomy.cpp @@ -12,6 +12,8 @@ similar hardware. #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class drtomy_state : public driver_device { diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp index 5e785c75a24..01f5f3f0f09 100644 --- a/src/mame/drivers/drw80pkr.cpp +++ b/src/mame/drivers/drw80pkr.cpp @@ -28,9 +28,11 @@ ***********************************************************************************/ #include "emu.h" +#include "cpu/mcs48/mcs48.h" #include "machine/nvram.h" #include "sound/ay8910.h" -#include "cpu/mcs48/mcs48.h" +#include "screen.h" +#include "speaker.h" class drw80pkr_state : public driver_device diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index 8fb863008e8..a81d7a672dd 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -57,6 +57,9 @@ Notes: #include "sound/ay8910.h" #include "sound/okim6295.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" + #define DUNHUANG_DEBUG 0 diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index c5e544cb166..a6d1717b72e 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -21,6 +21,8 @@ #include "cpu/t11/t11.h" #include "machine/clock.h" #include "machine/ms7004.h" +#include "screen.h" + #define KCGD_TOTAL_HORZ 1000 // XXX verify #define KCGD_DISP_HORZ 800 diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp index 994bddb8a48..d4d7cfec0a7 100644 --- a/src/mame/drivers/dvk_ksm.cpp +++ b/src/mame/drivers/dvk_ksm.cpp @@ -68,6 +68,8 @@ ksm|DVK KSM, #include "machine/i8255.h" #include "machine/ms7004.h" #include "machine/pic8259.h" +#include "screen.h" + #define SCREEN_PAGE (80*48) diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp index 3c648817290..fb2675c07b4 100644 --- a/src/mame/drivers/dwarfd.cpp +++ b/src/mame/drivers/dwarfd.cpp @@ -301,6 +301,8 @@ uPC1352C @ N3 #include "cpu/i8085/i8085.h" #include "sound/ay8910.h" #include "video/i8275.h" +#include "screen.h" +#include "speaker.h" class dwarfd_state : public driver_device { @@ -312,7 +314,7 @@ public: m_crtc(*this, "i8275"), m_charmap(*this, "gfx1"), m_dsw2(*this, "DSW2") - { } + { } /* video-related */ int m_crt_access; diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp index b2964b84082..ed8becac6ca 100644 --- a/src/mame/drivers/dynadice.cpp +++ b/src/mame/drivers/dynadice.cpp @@ -34,11 +34,13 @@ dy_6.bin (near Z80) */ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" -#include "sound/ay8910.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class dynadice_state : public driver_device diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index 71b245e8fe4..6c69d517e20 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -77,14 +77,18 @@ TODO: *********************************************************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/dynax.h" + #include "cpu/tlcs90/tlcs90.h" +#include "cpu/z80/z80.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/2203intf.h" #include "sound/3812intf.h" -#include "machine/nvram.h" + #include "rendlay.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp index 1c61c6a743a..b87f98df007 100644 --- a/src/mame/drivers/dynduke.cpp +++ b/src/mame/drivers/dynduke.cpp @@ -68,11 +68,14 @@ Also, implemented conditional port for Coin Mode (SW1:1) ***************************************************************************/ #include "emu.h" +#include "includes/dynduke.h" + #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/dynduke.h" +#include "screen.h" +#include "speaker.h" /* Memory Maps */ diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp index c2ae59d01e8..c38efea6062 100644 --- a/src/mame/drivers/ec65.cpp +++ b/src/mame/drivers/ec65.cpp @@ -17,6 +17,7 @@ #include "machine/mos6551.h" #include "machine/6850acia.h" #include "machine/keyboard.h" +#include "screen.h" #define PIA6821_TAG "pia6821" #define ACIA6850_TAG "acia6850" diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp index 55a972cab68..3cb5a6b844c 100644 --- a/src/mame/drivers/ecoinf3.cpp +++ b/src/mame/drivers/ecoinf3.cpp @@ -13,12 +13,16 @@ // 2 of the sets contain program scrambled roms (where the last 0x2000 bytes match between games) why, badly dumped? #include "emu.h" + #include "cpu/z180/z180.h" #include "machine/i8255.h" -#include "ecoinf3.lh" #include "machine/steppers.h" // stepper motor -#include "video/awpvid.h" // drawing reels #include "sound/sn76496.h" +#include "video/awpvid.h" // drawing reels +#include "speaker.h" + +#include "ecoinf3.lh" + class ecoinf3_state : public driver_device { diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp index dda408b1058..56848cd393c 100644 --- a/src/mame/drivers/egghunt.cpp +++ b/src/mame/drivers/egghunt.cpp @@ -47,6 +47,8 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class egghunt_state : public driver_device { diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index bc6e026aa62..60f1648454c 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -55,13 +55,17 @@ ******************************************************************************/ #include "emu.h" -#include "machine/z80pio.h" +#include "includes/einstein.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" +#include "machine/z80pio.h" #include "sound/ay8910.h" + #include "rendlay.h" -#include "includes/einstein.h" #include "softlist.h" +#include "speaker.h" + #define VERBOSE_KEYBOARD 0 #define VERBOSE_DISK 0 diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp index 5a3076e0a68..d2e90142081 100644 --- a/src/mame/drivers/electron.cpp +++ b/src/mame/drivers/electron.cpp @@ -72,7 +72,9 @@ Missing: #include "formats/uef_cas.h" #include "formats/csw_cas.h" #include "sound/beep.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" static const rgb_t electron_palette[8]= { diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index a711c0d559b..8711f3177ea 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -21,7 +21,6 @@ #include "cpu/z80/z80.h" #include "machine/upd765.h" /* for floppy disc controller */ #include "machine/i8255.h" -#include "sound/speaker.h" #include "sound/wave.h" #include "bus/centronics/ctronics.h" #include "machine/i8251.h" @@ -30,7 +29,9 @@ #include "imagedev/cassette.h" #include "formats/tzx_cas.h" #include "machine/bankdev.h" -#include "machine/ram.h" + +#include "screen.h" +#include "speaker.h" class elwro800_state : public spectrum_state diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp index cab678421da..c783102994c 100644 --- a/src/mame/drivers/embargo.cpp +++ b/src/mame/drivers/embargo.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "cpu/s2650/s2650.h" +#include "screen.h" class embargo_state : public driver_device diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index 017eb8cceb0..0e9ea57593e 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -27,6 +27,8 @@ TODO: #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" #define LOG_PROT (0) diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp index 4ab0c6c2379..01a4ca30f77 100644 --- a/src/mame/drivers/enmirage.cpp +++ b/src/mame/drivers/enmirage.cpp @@ -50,6 +50,7 @@ #include "machine/wd_fdc.h" #include "formats/esq8_dsk.h" #include "sound/es5503.h" +#include "speaker.h" #include "mirage.lh" diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index 96244b23775..7aeb33a8f28 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -101,11 +101,13 @@ *********************************************************************/ #include "emu.h" +#include "includes/eolith.h" + #include "cpu/e132xs/e132xs.h" #include "cpu/mcs51/mcs51.h" - #include "machine/eepromser.h" -#include "includes/eolith.h" + +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/eolith16.cpp b/src/mame/drivers/eolith16.cpp index 15e5fb7ac8c..d2f8d273ad0 100644 --- a/src/mame/drivers/eolith16.cpp +++ b/src/mame/drivers/eolith16.cpp @@ -12,11 +12,13 @@ **********************************************************************/ #include "emu.h" +#include "includes/eolith.h" + #include "cpu/e132xs/e132xs.h" #include "machine/eepromser.h" - #include "sound/okim6295.h" -#include "includes/eolith.h" + +#include "speaker.h" class eolith16_state : public eolith_state diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp index f094b9dba0d..9f26f2642eb 100644 --- a/src/mame/drivers/ep64.cpp +++ b/src/mame/drivers/ep64.cpp @@ -150,18 +150,22 @@ Notes: (All IC's shown) */ #include "emu.h" -#include "softlist.h" -#include "sound/dave.h" -#include "bus/rs232/rs232.h" + +#include "bus/centronics/ctronics.h" #include "bus/ep64/exp.h" +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "bus/centronics/ctronics.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" #include "machine/ram.h" +#include "sound/dave.h" #include "video/nick.h" +#include "softlist.h" +#include "speaker.h" + + #define Z80_TAG "u1" #define DAVE_TAG "u3" #define NICK_TAG "u4" diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp index 70844a39775..9d6dfb9b410 100644 --- a/src/mame/drivers/epos.cpp +++ b/src/mame/drivers/epos.cpp @@ -33,11 +33,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/epos.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/epos.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(epos_state::dealer_decrypt_rom) { diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp index 15e6cc96bbd..d0e7da98a55 100644 --- a/src/mame/drivers/eprom.cpp +++ b/src/mame/drivers/eprom.cpp @@ -26,9 +26,11 @@ #include "emu.h" +#include "includes/eprom.h" #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" -#include "includes/eprom.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index c07d0c42c7d..2fd26137390 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -360,6 +360,7 @@ D #include "emu.h" #include "includes/equites.h" + #include "cpu/alph8201/alph8201.h" #include "cpu/i8085/i8085.h" #include "cpu/m68000/m68000.h" @@ -368,6 +369,7 @@ D #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/volt_reg.h" +#include "speaker.h" #define FRQ_ADJUSTER_TAG "FRQ" diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp index 416f2ce0d16..d08cfda714d 100644 --- a/src/mame/drivers/ertictac.cpp +++ b/src/mame/drivers/ertictac.cpp @@ -27,6 +27,7 @@ PCB has a single OSC at 24MHz #include "machine/aakart.h" #include "machine/i2cmem.h" #include "sound/volt_reg.h" +#include "speaker.h" class ertictac_state : public archimedes_state diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp index 5dad197c838..97a97ae4c88 100644 --- a/src/mame/drivers/esd16.cpp +++ b/src/mame/drivers/esd16.cpp @@ -69,11 +69,14 @@ ToDo: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/esd16.h" + #include "cpu/m68000/m68000.h" -#include "sound/okim6295.h" +#include "cpu/z80/z80.h" #include "sound/3812intf.h" -#include "includes/esd16.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp index c1966c1e119..7349ef53ad6 100644 --- a/src/mame/drivers/esh.cpp +++ b/src/mame/drivers/esh.cpp @@ -30,6 +30,7 @@ Todo: #include "machine/ldv1000.h" #include "machine/nvram.h" #include "sound/beep.h" +#include "speaker.h" class esh_state : public driver_device diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp index bb4a8abe7fb..8595c9d8b87 100644 --- a/src/mame/drivers/espial.cpp +++ b/src/mame/drivers/espial.cpp @@ -40,10 +40,12 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "emu.h" #include "includes/espial.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" - +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp index 5f559cf0da3..a7702513507 100644 --- a/src/mame/drivers/esq1.cpp +++ b/src/mame/drivers/esq1.cpp @@ -183,10 +183,12 @@ NOTES: #include "emu.h" #include "bus/midi/midi.h" #include "cpu/m6809/m6809.h" -#include "sound/es5503.h" #include "machine/mc68681.h" #include "machine/wd_fdc.h" #include "machine/esqpanel.h" +#include "sound/es5503.h" +#include "speaker.h" + #define WD1772_TAG "wd1772" @@ -224,7 +226,7 @@ private: void recalc_filter(filter &f); }; -static const device_type ESQ1_FILTERS = &device_creator; +static const device_type ESQ1_FILTERS = device_creator; esq1_filters::esq1_filters(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ESQ1_FILTERS, "ESQ1 Filters stage", tag, owner, clock, "esq1-filters", __FILE__), diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index 59a44729f47..d9aaaf6e576 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -127,20 +127,24 @@ ***************************************************************************/ #include "emu.h" -#include #include "bus/midi/midi.h" -#include "cpu/m68000/m68000.h" -#include "sound/es5506.h" -#include "sound/esqpump.h" -#include "machine/mc68681.h" #include "cpu/es5510/es5510.h" -#include "machine/wd_fdc.h" -#include "machine/hd63450.h" // compatible with MC68450, which is what these really have +#include "cpu/m68000/m68000.h" #include "formats/esq16_dsk.h" -#include "machine/esqvfd.h" #include "machine/esqlcd.h" #include "machine/esqpanel.h" +#include "machine/esqvfd.h" +#include "machine/hd63450.h" // compatible with MC68450, which is what these really have +#include "machine/mc68681.h" +#include "machine/wd_fdc.h" +#include "sound/es5506.h" +#include "sound/esqpump.h" + +#include "speaker.h" + +#include + #define GENERIC (0) #define EPS (1) diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp index 7bdcc11d521..aa70e250b48 100644 --- a/src/mame/drivers/esqasr.cpp +++ b/src/mame/drivers/esqasr.cpp @@ -38,12 +38,15 @@ ***************************************************************************/ #include "emu.h" -#include "machine/68340.h" -#include "sound/es5506.h" + #include "cpu/es5510/es5510.h" +#include "machine/68340.h" +#include "machine/esqvfd.h" #include "machine/upd765.h" +#include "sound/es5506.h" + +#include "speaker.h" -#include "machine/esqvfd.h" class esqasr_state : public driver_device { diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp index dd08a9438a5..3eb8e014c65 100644 --- a/src/mame/drivers/esqkt.cpp +++ b/src/mame/drivers/esqkt.cpp @@ -89,23 +89,27 @@ ***************************************************************************/ #include "emu.h" +#include "machine/esqpanel.h" + #include "bus/midi/midi.h" -#include "cpu/m68000/m68000.h" #include "cpu/es5510/es5510.h" -#include "sound/es5506.h" +#include "cpu/m68000/m68000.h" #include "machine/mc68681.h" -#include "machine/esqpanel.h" +#include "sound/es5506.h" + +#include "speaker.h" + class esqkt_state : public driver_device { public: esqkt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_esp(*this, "esp"), - m_duart(*this, "duart"), - m_sq1panel(*this, "sq1panel"), - m_mdout(*this, "mdout") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_esp(*this, "esp") + , m_duart(*this, "duart") + , m_sq1panel(*this, "sq1panel") + , m_mdout(*this, "mdout") { } required_device m_maincpu; diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp index 1de6b16b3a4..c0c44843a6a 100644 --- a/src/mame/drivers/esqmr.cpp +++ b/src/mame/drivers/esqmr.cpp @@ -200,18 +200,21 @@ ***************************************************************************/ #include "emu.h" +#include "machine/esqvfd.h" + #include "machine/68340.h" #include "sound/es5506.h" -#include "machine/esqvfd.h" +#include "speaker.h" + class esqmr_state : public driver_device { public: esqmr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_sq1vfd(*this, "sq1vfd") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_sq1vfd(*this, "sq1vfd") { } required_device m_maincpu; diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp index e8dc1a1e4e6..19f56d7371f 100644 --- a/src/mame/drivers/esripsys.cpp +++ b/src/mame/drivers/esripsys.cpp @@ -28,11 +28,13 @@ #include "emu.h" #include "includes/esripsys.h" + #include "cpu/esrip/esrip.h" #include "cpu/m6809/m6809.h" #include "machine/6840ptm.h" #include "machine/nvram.h" #include "sound/volt_reg.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index eb3c5515ad5..c32df7506db 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -29,6 +29,8 @@ #include "bus/rs232/rs232.h" #include "imagedev/cassette.h" #include "sound/wave.h" +#include "speaker.h" + #include "et3400.lh" diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index ddf6610f8ed..dad8f38b48c 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -38,6 +38,8 @@ #include "emu.h" #include "includes/eti660.h" +#include "speaker.h" + /* Read/Write Handlers */ diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp index 1caee74215b..eacb5c5f4c3 100644 --- a/src/mame/drivers/ettrivia.cpp +++ b/src/mame/drivers/ettrivia.cpp @@ -28,9 +28,11 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/nvram.h" +#include "sound/ay8910.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class ettrivia_state : public driver_device diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index 9d7579a7ba9..ae830119a7e 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -30,23 +30,28 @@ ToDo: #include "emu.h" + +#include "bus/centronics/ctronics.h" +#include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" +#include "imagedev/cassette.h" +#include "machine/74123.h" #include "machine/i8251.h" -#include "bus/rs232/rs232.h" -//#include "machine/clock.h" -#include "machine/pit8253.h" #include "machine/i8255.h" -#include "bus/centronics/ctronics.h" -#include "imagedev/cassette.h" -#include "sound/wave.h" -#include "sound/speaker.h" -#include "machine/z80dma.h" +#include "machine/pit8253.h" #include "machine/rescap.h" -#include "machine/74123.h" #include "machine/wd_fdc.h" +#include "machine/z80dma.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "video/mc6845.h" + +#include "screen.h" +#include "speaker.h" + #include "formats/excali64_dsk.h" + class excali64_state : public driver_device { public: diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp index 8b740d73825..3be63007d7f 100644 --- a/src/mame/drivers/exedexes.cpp +++ b/src/mame/drivers/exedexes.cpp @@ -12,11 +12,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/exedexes.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" #include "sound/sn76496.h" -#include "includes/exedexes.h" +#include "screen.h" +#include "speaker.h" TIMER_DEVICE_CALLBACK_MEMBER(exedexes_state::exedexes_scanline) diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp index b28baa0c1d5..65f98ca3915 100644 --- a/src/mame/drivers/exelv.cpp +++ b/src/mame/drivers/exelv.cpp @@ -53,14 +53,20 @@ TODO: #include "emu.h" + #include "cpu/tms7000/tms7000.h" -#include "video/tms3556.h" -#include "sound/tms5220.h" +//#include "imagedev/cassette.h" #include "machine/spchrom.h" +#include "sound/tms5220.h" +#include "video/tms3556.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" -//#include "imagedev/cassette.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class exelv_state : public driver_device { diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp index bd73af6b6ac..fd30847f034 100644 --- a/src/mame/drivers/exerion.cpp +++ b/src/mame/drivers/exerion.cpp @@ -120,10 +120,12 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/exerion.h" + +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp index 56849f2d3c3..9b09545fe13 100644 --- a/src/mame/drivers/exp85.cpp +++ b/src/mame/drivers/exp85.cpp @@ -31,10 +31,12 @@ #include "emu.h" #include "includes/exp85.h" + #include "cpu/i8085/i8085.h" #include "machine/i8155.h" #include "machine/i8355.h" #include "machine/ram.h" +#include "speaker.h" /* Memory Maps */ diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index 71fb2139dc9..f18f09f308c 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -205,13 +205,17 @@ TODO: */ #include "emu.h" +#include "includes/galpnipt.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "machine/kaneko_hit.h" #include "machine/watchdog.h" #include "video/kaneko_tmap.h" #include "video/kaneko_spr.h" -#include "includes/galpnipt.h" +#include "screen.h" +#include "speaker.h" + class expro02_state : public driver_device { diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp index b04ab813bfc..53529696c91 100644 --- a/src/mame/drivers/exprraid.cpp +++ b/src/mame/drivers/exprraid.cpp @@ -206,12 +206,15 @@ Stephh's notes (based on the games M6502 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/exprraid.h" + #include "cpu/m6502/deco16.h" #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" #include "sound/3526intf.h" -#include "includes/exprraid.h" +#include "screen.h" +#include "speaker.h" /*****************************************************************************************/ diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp index fa85d9eb7c5..7c072b6cd4d 100644 --- a/src/mame/drivers/exterm.cpp +++ b/src/mame/drivers/exterm.cpp @@ -64,6 +64,7 @@ #include "emu.h" #include "includes/exterm.h" + #include "cpu/m6502/m6502.h" #include "machine/nvram.h" #include "machine/watchdog.h" @@ -71,6 +72,8 @@ #include "sound/volt_reg.h" #include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index dfa837d47f8..1ca41be0465 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -36,11 +36,14 @@ TODO: ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/exzisus.h" #include "includes/taitoipt.h" #include "audio/taitosnd.h" + +#include "cpu/z80/z80.h" #include "sound/ym2151.h" -#include "includes/exzisus.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp index c2cdd487bdc..e1d966fa8a8 100644 --- a/src/mame/drivers/f-32.cpp +++ b/src/mame/drivers/f-32.cpp @@ -32,6 +32,9 @@ f5 #include "machine/eepromser.h" #include "sound/ym2151.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + class mosaicf2_state : public driver_device { diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp index 869630702fe..aefd269ba62 100644 --- a/src/mame/drivers/f1gp.cpp +++ b/src/mame/drivers/f1gp.cpp @@ -25,12 +25,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/f1gp.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2610intf.h" #include "sound/okim6295.h" -#include "includes/f1gp.h" + +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(f1gp_state::f1gp_sh_bankswitch_w) diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp index e46d1b26855..31ba4eca55d 100644 --- a/src/mame/drivers/famibox.cpp +++ b/src/mame/drivers/famibox.cpp @@ -63,6 +63,8 @@ Notes/ToDo: #include "video/ppu2c0x.h" #include "cpu/m6502/n2a03.h" #include "debugger.h" +#include "screen.h" +#include "speaker.h" class famibox_state : public driver_device diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index 16fedf498ee..bb0ceb9c5c3 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -47,6 +47,7 @@ Year + Game Main CPU Sound CPU Sound Video #include "emu.h" #include "includes/fantland.h" + #include "cpu/i86/i86.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" @@ -54,6 +55,8 @@ Year + Game Main CPU Sound CPU Sound Video #include "sound/dac.h" #include "sound/volt_reg.h" #include "sound/ym2151.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp index 4918eb88a84..14b47870293 100644 --- a/src/mame/drivers/fanucspmg.cpp +++ b/src/mame/drivers/fanucspmg.cpp @@ -528,18 +528,23 @@ the keypad symbols seem to use a different matrix pattern from the rest? ****************************************************************************/ #include "emu.h" -#include "cpu/i86/i86.h" + #include "cpu/i8085/i8085.h" -#include "machine/ram.h" +#include "cpu/i86/i86.h" #include "machine/i8251.h" #include "machine/i8257.h" -#include "machine/upd765.h" #include "machine/pic8259.h" #include "machine/pit8253.h" +#include "machine/ram.h" +#include "machine/upd765.h" #include "machine/upd765.h" #include "video/mc6845.h" + +#include "screen.h" + #include "formats/imd_dsk.h" + #define MAINCPU_TAG "maincpu" #define SUBCPU_TAG "subcpu" #define USART0_TAG "usart0" diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp index c0e59a2f237..580e8cd5e07 100644 --- a/src/mame/drivers/fastfred.cpp +++ b/src/mame/drivers/fastfred.cpp @@ -11,12 +11,15 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/fastfred.h" + +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "speaker.h" + void fastfred_state::machine_start() { diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp index 74970ccfabf..b08b0deaebe 100644 --- a/src/mame/drivers/fastinvaders.cpp +++ b/src/mame/drivers/fastinvaders.cpp @@ -11,12 +11,13 @@ http://www.citylan.it/wiki/index.php/Fast_Invaders_%288275_version%29 ***************************************************************************/ #include "emu.h" -#include "cpu/i8085/i8085.h" +#include "cpu/i8085/i8085.h" +#include "machine/i8257.h" +#include "machine/pic8259.h" #include "video/i8275.h" #include "video/mc6845.h" -#include "machine/pic8259.h" -#include "machine/i8257.h" +#include "screen.h" class fastinvaders_state : public driver_device diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp index a0a2cd7bc45..f65fcd5f1ad 100644 --- a/src/mame/drivers/fastlane.cpp +++ b/src/mame/drivers/fastlane.cpp @@ -12,10 +12,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/fastlane.h" +#include "includes/konamipt.h" + #include "cpu/m6809/hd6309.h" #include "machine/watchdog.h" -#include "includes/konamipt.h" -#include "includes/fastlane.h" + +#include "speaker.h" + TIMER_DEVICE_CALLBACK_MEMBER(fastlane_state::fastlane_scanline) { diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp index e344c87fbe5..e712ac0f546 100644 --- a/src/mame/drivers/fb01.cpp +++ b/src/mame/drivers/fb01.cpp @@ -7,14 +7,19 @@ ***************************************************************************/ #include "emu.h" + +#include "bus/midi/midi.h" #include "cpu/z80/z80.h" -#include "sound/ym2151.h" +#include "machine/clock.h" +#include "machine/i8251.h" #include "machine/nvram.h" +#include "sound/ym2151.h" #include "video/hd44780.h" -#include "machine/i8251.h" -#include "machine/clock.h" -#include "bus/midi/midi.h" + #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + #include "fb01.lh" diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp index 66cc7d74c4b..5f4d8deedfa 100644 --- a/src/mame/drivers/fc100.cpp +++ b/src/mame/drivers/fc100.cpp @@ -32,18 +32,22 @@ TODO: #include "emu.h" + +#include "bus/centronics/ctronics.h" +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" #include "cpu/z80/z80.h" -#include "video/mc6847.h" -#include "machine/i8251.h" +#include "imagedev/cassette.h" +#include "machine/buffer.h" #include "machine/clock.h" +#include "machine/i8251.h" #include "sound/ay8910.h" -#include "imagedev/cassette.h" #include "sound/wave.h" +#include "video/mc6847.h" + +#include "speaker.h" + #include "formats/fc100_cas.h" -#include "machine/buffer.h" -#include "bus/centronics/ctronics.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" class fc100_state : public driver_device diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp index 74b0ebb6fbf..d0b76df12cd 100644 --- a/src/mame/drivers/fcombat.cpp +++ b/src/mame/drivers/fcombat.cpp @@ -32,10 +32,13 @@ inputs + notes by stephh */ #include "emu.h" +#include "includes/fcombat.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" -#include "includes/fcombat.h" +#include "screen.h" +#include "speaker.h" INPUT_CHANGED_MEMBER(fcombat_state::coin_inserted) diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index 3f747612e76..123c060e418 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -86,14 +86,17 @@ slampic: no sound. A priority problem between sprites and crowd. */ #include "emu.h" +#include "includes/cps1.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" -#include "includes/cps1.h" #include "sound/2203intf.h" #include "sound/msm5205.h" #include "sound/ym2151.h" #include "sound/okim6295.h" #include "machine/eepromser.h" +#include "speaker.h" + WRITE16_MEMBER( cps_state::fcrash_soundlatch_w ) { diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp index ce9aa0d5e4a..75ce67684b1 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/src/mame/drivers/feversoc.cpp @@ -72,6 +72,8 @@ U0564 LH28F800SU OBJ4-1 #include "machine/eepromser.h" #include "machine/rtc4543.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" class feversoc_state : public driver_device diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index b7f3f7b9669..a186bf8a9e8 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -404,6 +404,7 @@ I/O is via TTL, very similar to Designer Display #include "emu.h" #include "includes/fidelbase.h" + #include "cpu/m6502/m6502.h" #include "cpu/m6502/r65c02.h" #include "cpu/m6502/m65sc02.h" @@ -411,6 +412,7 @@ I/O is via TTL, very similar to Designer Display #include "machine/i8255.h" #include "machine/nvram.h" #include "sound/volt_reg.h" +#include "speaker.h" // internal artwork #include "fidel_chesster.lh" // clickable diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index 3269d6d0c10..056928c3058 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -155,10 +155,12 @@ B0000x-xxxxxx: see V7, -800000 #include "emu.h" #include "includes/fidelbase.h" + #include "cpu/m68000/m68000.h" #include "machine/ram.h" #include "machine/nvram.h" #include "sound/volt_reg.h" +#include "speaker.h" // internal artwork #include "fidel_ex_68k.lh" // clickable diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index 254d3fc8fb8..3e0c2e18ed7 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -491,6 +491,7 @@ expect that the software reads these once on startup only. #include "emu.h" #include "includes/fidelbase.h" + #include "cpu/z80/z80.h" #include "cpu/mcs48/mcs48.h" #include "machine/i8255.h" @@ -498,6 +499,7 @@ expect that the software reads these once on startup only. #include "machine/z80pio.h" #include "sound/beep.h" #include "sound/volt_reg.h" +#include "speaker.h" // internal artwork #include "fidel_cc.lh" // clickable diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp index 6fc8a45d826..dc71a032558 100644 --- a/src/mame/drivers/finalizr.cpp +++ b/src/mame/drivers/finalizr.cpp @@ -15,6 +15,7 @@ #include "emu.h" #include "includes/finalizr.h" #include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "cpu/mcs48/mcs48.h" #include "machine/gen_latch.h" @@ -24,6 +25,9 @@ #include "sound/sn76496.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + TIMER_DEVICE_CALLBACK_MEMBER(finalizr_state::finalizr_scanline) { diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp index bb8385e6cc5..f1c6ac2f2c6 100644 --- a/src/mame/drivers/fireball.cpp +++ b/src/mame/drivers/fireball.cpp @@ -17,9 +17,12 @@ #include "emu.h" #include "cpu/mcs51/mcs51.h" +#include "machine/eepromser.h" #include "sound/ay8910.h" +#include "speaker.h" + #include "fireball.lh" -#include "machine/eepromser.h" + /**************************** * LOG defines * diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index e6c9c37629a..888d0bc33e6 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -137,18 +137,23 @@ Keyboard Mania 2nd Mix - dongle, program CD, audio CD */ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "cpu/powerpc/ppc.h" #include "machine/ataintf.h" -#include "machine/intelfsh.h" -#include "machine/rtc65271.h" +#include "machine/atapicdr.h" #include "machine/ins8250.h" +#include "machine/intelfsh.h" #include "machine/midikbd.h" -#include "machine/atapicdr.h" -#include "sound/ymz280b.h" +#include "machine/rtc65271.h" #include "sound/cdda.h" #include "sound/rf5c400.h" +#include "sound/ymz280b.h" #include "video/k057714.h" + +#include "screen.h" +#include "speaker.h" + #include "firebeat.lh" diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp index 3a99b06518b..f4c337c75aa 100644 --- a/src/mame/drivers/firefox.cpp +++ b/src/mame/drivers/firefox.cpp @@ -38,6 +38,7 @@ but requires a special level III player for proper control. Video: CAV. Audio: A #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "machine/x2212.h" +#include "speaker.h" class firefox_state : public driver_device diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp index 300e65084b6..ddcf4f0850a 100644 --- a/src/mame/drivers/firetrap.cpp +++ b/src/mame/drivers/firetrap.cpp @@ -169,10 +169,13 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/firetrap.h" + #include "cpu/z80/z80.h" #include "cpu/m6502/m6502.h" #include "sound/3526intf.h" -#include "includes/firetrap.h" +#include "screen.h" +#include "speaker.h" #define FIRETRAP_XTAL XTAL_12MHz diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp index 7a465d04edd..a9500e8919e 100644 --- a/src/mame/drivers/firetrk.cpp +++ b/src/mame/drivers/firetrk.cpp @@ -7,9 +7,10 @@ Atari Fire Truck + Super Bug + Monte Carlo driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6800/m6800.h" #include "includes/firetrk.h" +#include "cpu/m6800/m6800.h" #include "sound/discrete.h" +#include "speaker.h" #include "superbug.lh" diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp index 56e79aec2d8..da1ddd3e295 100644 --- a/src/mame/drivers/fitfight.cpp +++ b/src/mame/drivers/fitfight.cpp @@ -84,10 +84,14 @@ Stephh's notes : */ #include "emu.h" +#include "includes/fitfight.h" + #include "cpu/m68000/m68000.h" #include "cpu/upd7810/upd7810.h" #include "sound/okim6295.h" -#include "includes/fitfight.h" +#include "screen.h" +#include "speaker.h" + READ16_MEMBER( fitfight_state::hotmindff_unk_r ) { diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp index 6ebc7dc719f..61ba3ffdf0f 100644 --- a/src/mame/drivers/fk1.cpp +++ b/src/mame/drivers/fk1.cpp @@ -14,6 +14,7 @@ #include "machine/pit8253.h" #include "machine/i8251.h" #include "machine/ram.h" +#include "screen.h" class fk1_state : public driver_device diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp index 63d63b9803e..70bdc3f059f 100644 --- a/src/mame/drivers/flipjack.cpp +++ b/src/mame/drivers/flipjack.cpp @@ -81,6 +81,9 @@ ________________________|___________________________ #include "machine/i8255.h" #include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_16MHz #define VIDEO_CLOCK XTAL_6MHz diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index 51f03c95d88..11bfa29b78d 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -13,11 +13,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/flkatck.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/hd6309.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/flkatck.h" +#include "screen.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(flkatck_state::flkatck_interrupt) diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index 3b895ac8af8..63bfbfa3289 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -75,6 +75,7 @@ CHIP # POSITION TYPE #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class flower_state : public driver_device { diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp index 3d4aeff77ef..006bf279c6d 100644 --- a/src/mame/drivers/flstory.cpp +++ b/src/mame/drivers/flstory.cpp @@ -13,11 +13,15 @@ #include "emu.h" #include "includes/flstory.h" -#include "cpu/z80/z80.h" + #include "cpu/m6805/m6805.h" +#include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + READ8_MEMBER(flstory_state::from_snd_r) { diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index 43ea05f477e..05c7d9b5b87 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -20,6 +20,7 @@ TODO: #include "emu.h" #include "cpu/m6502/m6502.h" +#include "screen.h" #define MASTER_CLOCK XTAL_12_096MHz #define PIXEL_CLOCK (MASTER_CLOCK / 2) diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index 2bb98c7c881..67811dc60b5 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -38,20 +38,28 @@ ************************************************************************************************/ #include "emu.h" +#include "includes/fm7.h" + #include "cpu/m6809/m6809.h" #include "cpu/i86/i86.h" #include "cpu/z80/z80.h" + #include "sound/ay8910.h" #include "sound/2203intf.h" #include "sound/wave.h" #include "sound/beep.h" +#include "bus/centronics/dsjoy.h" + #include "imagedev/cassette.h" -#include "formats/fm7_cas.h" #include "imagedev/flopdrv.h" -#include "bus/centronics/dsjoy.h" -#include "includes/fm7.h" + +#include "formats/fm7_cas.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + /* key scancode conversion table * The FM-7 expects different scancodes when shift,ctrl or graph is held, or diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index 183199157f1..bb2f2c7cd44 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -178,9 +178,13 @@ Notes: #include "emu.h" #include "includes/fmtowns.h" + #include "bus/scsi/scsi.h" #include "bus/scsi/scsihd.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" // CD controller IRQ types diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp index a9ff781cd18..3ad8678a66e 100644 --- a/src/mame/drivers/foodf.cpp +++ b/src/mame/drivers/foodf.cpp @@ -76,11 +76,12 @@ #include "emu.h" +#include "includes/foodf.h" #include "cpu/m68000/m68000.h" #include "machine/atarigen.h" #include "machine/watchdog.h" #include "sound/pokey.h" -#include "includes/foodf.h" +#include "speaker.h" #define MASTER_CLOCK 12096000 diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp index 1e0d02f5920..8968e8b3307 100644 --- a/src/mame/drivers/forte2.cpp +++ b/src/mame/drivers/forte2.cpp @@ -40,6 +40,8 @@ found/dumped yet. */ #include "cpu/z80/z80.h" #include "video/tms9928a.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class forte2_state : public driver_device diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp index 3975a3cbeb9..b39d8ad14b7 100644 --- a/src/mame/drivers/fortecar.cpp +++ b/src/mame/drivers/fortecar.cpp @@ -308,26 +308,28 @@ **************************************************************************************************/ - -#define MASTER_CLOCK XTAL_12MHz -#define CPU_CLOCK (MASTER_CLOCK/4) -#define CRTC_CLOCK (MASTER_CLOCK/8) -#define AY_CLOCK (MASTER_CLOCK/8) - #include "emu.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" -#include "machine/watchdog.h" -#include "sound/ay8910.h" #include "machine/i8255.h" +#include "machine/nvram.h" #include "machine/v3021.h" +#include "machine/watchdog.h" +#include "sound/ay8910.h" #include "video/mc6845.h" -#include "machine/nvram.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" #include "fortecrd.lh" +#define MASTER_CLOCK XTAL_12MHz +#define CPU_CLOCK (MASTER_CLOCK/4) +#define CRTC_CLOCK (MASTER_CLOCK/8) +#define AY_CLOCK (MASTER_CLOCK/8) + + class fortecar_state : public driver_device { public: diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index 0f473e169a2..536dd69b5fb 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -59,6 +59,8 @@ #include "sound/beep.h" #include "bus/centronics/ctronics.h" #include "imagedev/cassette.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK 15974400 #define LOG 0 diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp index 2c6608a3eef..38f228b773f 100644 --- a/src/mame/drivers/fp200.cpp +++ b/src/mame/drivers/fp200.cpp @@ -22,6 +22,8 @@ #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_6_144MHz diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp index a2fd2098fa6..200dd9df10f 100644 --- a/src/mame/drivers/fp6000.cpp +++ b/src/mame/drivers/fp6000.cpp @@ -21,6 +21,7 @@ #include "emu.h" #include "cpu/i86/i86.h" #include "video/mc6845.h" +#include "screen.h" class fp6000_state : public driver_device diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index 8ba1be91476..5e67ee8f78d 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -42,11 +42,14 @@ TODO: */ #include "emu.h" +#include "includes/freekick.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/mc8123.h" #include "sound/sn76496.h" -#include "includes/freekick.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp index cbedc623176..15057673c66 100644 --- a/src/mame/drivers/fresh.cpp +++ b/src/mame/drivers/fresh.cpp @@ -23,7 +23,7 @@ rom 5 and 6 are prg roms #include "emu.h" #include "cpu/m68000/m68000.h" - +#include "screen.h" diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index b6b85fe9670..da1c4422fbf 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -19,11 +19,14 @@ ******************************************************************************/ #include "emu.h" +#include "includes/fromanc2.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/2610intf.h" -#include "includes/fromanc2.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index 6c52c93ab69..90bfaeefab9 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -80,11 +80,13 @@ with the following code: ******************************************************************************/ #include "emu.h" +#include "includes/fromance.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "sound/ym2413.h" #include "sound/msm5205.h" -#include "includes/fromance.h" +#include "sound/ym2413.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp index 589fb22b1e3..66940c5843c 100644 --- a/src/mame/drivers/funkball.cpp +++ b/src/mame/drivers/funkball.cpp @@ -71,14 +71,15 @@ Notes: #include "emu.h" #include "cpu/i386/i386.h" +#include "machine/bankdev.h" +#include "machine/idectrl.h" +#include "machine/intelfsh.h" #include "machine/lpci.h" #include "machine/pckeybrd.h" -#include "machine/idectrl.h" -#include "video/voodoo.h" #include "machine/pcshare.h" -#include "machine/bankdev.h" -#include "machine/intelfsh.h" #include "machine/terminal.h" +#include "video/voodoo.h" +#include "screen.h" class funkball_state : public pcat_base_state diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp index fb41cc40e5a..3f237c9c38c 100644 --- a/src/mame/drivers/funkybee.cpp +++ b/src/mame/drivers/funkybee.cpp @@ -74,9 +74,12 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/funkybee.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/funkybee.h" +#include "screen.h" +#include "speaker.h" READ8_MEMBER(funkybee_state::funkybee_input_port_0_r) diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp index f49468be8e1..d3e6b4476ae 100644 --- a/src/mame/drivers/funkyjet.cpp +++ b/src/mame/drivers/funkyjet.cpp @@ -90,13 +90,16 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/funkyjet.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "machine/decocrpt.h" #include "machine/gen_latch.h" -#include "includes/funkyjet.h" #include "sound/ym2151.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp index 626859ae1f7..dcd6263c6db 100644 --- a/src/mame/drivers/funtech.cpp +++ b/src/mame/drivers/funtech.cpp @@ -21,10 +21,14 @@ and an unpopulated position for a YM2413 or UM3567 */ #include "emu.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "screen.h" +#include "speaker.h" + #include "fts2in1.lh" diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 2baf272ad77..a45cded895f 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -991,17 +991,21 @@ #define CRTC_CLOCK (MASTER_CLOCK/8) #include "emu.h" -#include "cpu/m6502/r65c02.h" +#include "includes/funworld.h" + #include "cpu/m6502/m65sc02.h" -#include "video/mc6845.h" +#include "cpu/m6502/r65c02.h" #include "machine/6821pia.h" -#include "sound/ay8910.h" #include "machine/nvram.h" -#include "jollycrd.lh" +#include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #include "bonuscrd.lh" +#include "jollycrd.lh" #include "novoplay.lh" #include "royalcrd.lh" -#include "includes/funworld.h" /********************** diff --git a/src/mame/drivers/funybubl.cpp b/src/mame/drivers/funybubl.cpp index f961f6faf3b..2a353ac37b8 100644 --- a/src/mame/drivers/funybubl.cpp +++ b/src/mame/drivers/funybubl.cpp @@ -51,9 +51,12 @@ Note: SW2, SW3 & SW4 not populated #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/funybubl.h" +#include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(funybubl_state::funybubl_vidram_bank_w) { diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp index 083a8123a56..fd9edf74689 100644 --- a/src/mame/drivers/fuukifg2.cpp +++ b/src/mame/drivers/fuukifg2.cpp @@ -46,11 +46,13 @@ To Do: ***************************************************************************/ #include "emu.h" +#include "includes/fuukifg2.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" #include "sound/3812intf.h" -#include "includes/fuukifg2.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp index f2baa6c37ee..89e1003381a 100644 --- a/src/mame/drivers/fuukifg3.cpp +++ b/src/mame/drivers/fuukifg3.cpp @@ -157,10 +157,12 @@ FG-3J ROM-J 507KA0301P04 Rev:1.3 ***************************************************************************/ #include "emu.h" +#include "includes/fuukifg3.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/ymf278b.h" -#include "includes/fuukifg3.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp index 27ae304b3b9..66c0919f050 100644 --- a/src/mame/drivers/g627.cpp +++ b/src/mame/drivers/g627.cpp @@ -40,10 +40,13 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" #include "cpu/z80/z80.h" +#include "machine/genpin.h" #include "machine/i8155.h" #include "sound/astrocde.h" +#include "screen.h" +#include "speaker.h" + #include "g627.lh" diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index d339a03b0d5..d073b99ef58 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -19,12 +19,17 @@ Year Game PCB NOTES ***************************************************************************/ #include "emu.h" +#include "includes/gaelco.h" + +#include "includes/gaelcrpt.h" + #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "sound/3812intf.h" -#include "includes/gaelcrpt.h" -#include "includes/gaelco.h" + +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index ce2da07d012..6e5b3f82fe1 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -27,10 +27,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/gaelco2.h" + #include "machine/eepromser.h" #include "sound/gaelco.h" + #include "rendlay.h" -#include "includes/gaelco2.h" +#include "screen.h" +#include "speaker.h" + #define TILELAYOUT16(NUM) static const gfx_layout tilelayout16_##NUM = \ { \ diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp index 14cfeb30156..aaa1aaee09a 100644 --- a/src/mame/drivers/gaelco3d.cpp +++ b/src/mame/drivers/gaelco3d.cpp @@ -145,16 +145,17 @@ REF. 970429 **************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/gaelco3d.h" -#include "cpu/tms32031/tms32031.h" + #include "cpu/adsp2100/adsp2100.h" +#include "cpu/m68000/m68000.h" +#include "cpu/tms32031/tms32031.h" #include "machine/eepromser.h" -#define LOG 0 - +#include "speaker.h" +#define LOG 0 WRITE_LINE_MEMBER(gaelco3d_state::ser_irq) diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index 838d879056a..e984e8fc034 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -131,13 +131,16 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/gaiden.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/gaiden.h" +#include "sound/ym2151.h" +#include "speaker.h" + WRITE16_MEMBER(gaiden_state::gaiden_sound_command_w) { diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 1004063b06e..2e8ac930b6d 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -127,13 +127,15 @@ better notes (complete chip lists) for each board still needed */ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/namcos2.h" -#include "cpu/tms32025/tms32025.h" #include "includes/namcoic.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/tms32025/tms32025.h" #include "machine/nvram.h" #include "sound/c140.h" #include "rendlay.h" +#include "speaker.h" class gal3_state : public namcos2_shared_state diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index bca05374642..432d0e171c2 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -699,23 +699,26 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/bosco.h" +#include "includes/digdug.h" +#include "includes/galaga.h" +#include "includes/xevious.h" +#include "audio/namco52.h" +#include "audio/namco54.h" + #include "cpu/mb88xx/mb88xx.h" +#include "cpu/z80/z80.h" #include "machine/atari_vg.h" #include "machine/namco06.h" #include "machine/namco50.h" #include "machine/namco51.h" #include "machine/namco53.h" -#include "includes/galaga.h" -#include "includes/xevious.h" -#include "includes/bosco.h" -#include "includes/digdug.h" -#include "audio/namco52.h" #include "machine/rescap.h" #include "machine/watchdog.h" #include "sound/samples.h" -#include "audio/namco54.h" + +#include "speaker.h" + #define MASTER_CLOCK (XTAL_18_432MHz) diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp index 8fbdf6b1dea..6332928c77b 100644 --- a/src/mame/drivers/galaxi.cpp +++ b/src/mame/drivers/galaxi.cpp @@ -33,15 +33,18 @@ ***************************************************************************/ -#define CPU_CLOCK (XTAL_10MHz) -#define SND_CLOCK (XTAL_16MHz)/16 - #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + #include "galaxi.lh" +#define CPU_CLOCK (XTAL_10MHz) +#define SND_CLOCK (XTAL_16MHz)/16 + class galaxi_state : public driver_device { public: diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp index ce83a5e81d2..bc775353c04 100644 --- a/src/mame/drivers/galaxia.cpp +++ b/src/mame/drivers/galaxia.cpp @@ -69,9 +69,11 @@ TODO: */ #include "emu.h" +#include "includes/galaxia.h" + #include "machine/s2636.h" #include "cpu/s2650/s2650.h" -#include "includes/galaxia.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(galaxia_state::galaxia_interrupt) diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 482208de0ed..059b71cb0a0 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -658,12 +658,15 @@ TODO: #include "includes/galaxian.h" #include "audio/cclimber.h" #include "audio/galaxian.h" + #include "cpu/s2650/s2650.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/discrete.h" #include "sound/sn76496.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #define KONAMI_SOUND_CLOCK XTAL_14_31818MHz diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index fcd0caa8923..782622ae9dc 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -100,13 +100,15 @@ Stephh's notes (based on the games Z80 code and some tests) for other games : ***************************************************************************/ #include "emu.h" +#include "includes/galaxold.h" +#include "audio/galaxian.h" + #include "cpu/z80/z80.h" #include "cpu/s2650/s2650.h" #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/sn76496.h" -#include "audio/galaxian.h" -#include "includes/galaxold.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp index 79f3b47ee61..d941e53809c 100644 --- a/src/mame/drivers/galaxy.cpp +++ b/src/mame/drivers/galaxy.cpp @@ -24,15 +24,19 @@ Galaksija driver by Krzysztof Strzecha and Miodrag Milanovic ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/wave.h" #include "includes/galaxy.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" -#include "sound/ay8910.h" + +#include "cpu/z80/z80.h" #include "formats/gtp_cas.h" +#include "imagedev/cassette.h" +#include "imagedev/snapquik.h" #include "machine/ram.h" +#include "sound/ay8910.h" +#include "sound/wave.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + static ADDRESS_MAP_START (galaxyp_io, AS_IO, 8, galaxy_state ) ADDRESS_MAP_GLOBAL_MASK(0x01) diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp index 9faf0b73a54..3b7c629f0d0 100644 --- a/src/mame/drivers/galeb.cpp +++ b/src/mame/drivers/galeb.cpp @@ -15,8 +15,12 @@ #include "emu.h" #include "includes/galeb.h" + #include "cpu/m6502/m6502.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + static GFXDECODE_START( galeb ) GFXDECODE_ENTRY( "gfx1", 0x0000, galeb_charlayout, 0, 1 ) diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp index fe400cf9d64..79640e233c6 100644 --- a/src/mame/drivers/galgame.cpp +++ b/src/mame/drivers/galgame.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "cpu/t11/t11.h" +#include "screen.h" #define MAX_POINTS 2048 diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp index 0bd2bc8fa95..67d71171c56 100644 --- a/src/mame/drivers/galgames.cpp +++ b/src/mame/drivers/galgames.cpp @@ -40,6 +40,8 @@ Notes: #include "machine/watchdog.h" #include "sound/okim6295.h" #include "video/cesblit.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** @@ -113,7 +115,7 @@ protected: }; // device type definition -const device_type GALGAMES_CART = &device_creator; +const device_type GALGAMES_CART = device_creator; #define MCFG_GALGAMES_CART_INDEX(_cart) \ galgames_cart_device::static_set_cart(*device, _cart); @@ -145,7 +147,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(bios); } }; -const device_type GALGAMES_BIOS_CART = &device_creator; +const device_type GALGAMES_BIOS_CART = device_creator; #define MCFG_GALGAMES_BIOS_CART_ADD(_tag, _cart) \ MCFG_DEVICE_ADD(_tag, GALGAMES_BIOS_CART, 0) \ @@ -175,7 +177,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak2); } }; -const device_type GALGAMES_STARPAK2_CART = &device_creator; +const device_type GALGAMES_STARPAK2_CART = device_creator; #define MCFG_GALGAMES_STARPAK2_CART_ADD(_tag, _cart) \ MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK2_CART, 0) \ @@ -207,7 +209,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak3); } }; -const device_type GALGAMES_STARPAK3_CART = &device_creator; +const device_type GALGAMES_STARPAK3_CART = device_creator; #define MCFG_GALGAMES_STARPAK3_CART_ADD(_tag, _cart) \ MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK3_CART, 0) \ @@ -289,7 +291,7 @@ protected: }; // device type definition -const device_type GALGAMES_SLOT = &device_creator; +const device_type GALGAMES_SLOT = device_creator; #define MCFG_GALGAMES_SLOT_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, GALGAMES_SLOT, 0) diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 6e2a1e4202e..1b434edd8a4 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -35,10 +35,13 @@ TODO #include "emu.h" #include "includes/galivan.h" + #include "cpu/z80/z80.h" #include "sound/3526intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(galivan_state::galivan_sound_command_w) diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp index 80e5ac5b9fc..6d9fb7a5692 100644 --- a/src/mame/drivers/galpani2.cpp +++ b/src/mame/drivers/galpani2.cpp @@ -79,9 +79,13 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/galpani2.h" +#include "cpu/m68000/m68000.h" +#include "screen.h" +#include "speaker.h" + + /*************************************************************************** diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp index a048fa9ba34..30f068024a9 100644 --- a/src/mame/drivers/galpani3.cpp +++ b/src/mame/drivers/galpani3.cpp @@ -65,12 +65,14 @@ Dumped by Uki #include "emu.h" #include "cpu/m68000/m68000.h" -#include "sound/ymz280b.h" -#include "video/sknsspr.h" #include "machine/eepromser.h" -#include "machine/watchdog.h" #include "machine/kaneko_toybox.h" +#include "machine/watchdog.h" +#include "sound/ymz280b.h" #include "video/kaneko_grap2.h" +#include "video/sknsspr.h" +#include "screen.h" +#include "speaker.h" class galpani3_state : public driver_device { diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp index f855b3f25e0..a4ef62d4241 100644 --- a/src/mame/drivers/galpanic.cpp +++ b/src/mame/drivers/galpanic.cpp @@ -66,14 +66,17 @@ Stephh's additional notes : ***************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" +#include "includes/galpanic.h" +#include "includes/galpnipt.h" #include "includes/kaneko16.h" + +#include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "sound/okim6295.h" #include "video/kan_pand.h" #include "machine/kaneko_hit.h" -#include "includes/galpanic.h" -#include "includes/galpnipt.h" +#include "speaker.h" + void galpanic_state::machine_start() { diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp index 31af356a85a..66bfb33ebab 100644 --- a/src/mame/drivers/galspnbl.cpp +++ b/src/mame/drivers/galspnbl.cpp @@ -38,11 +38,13 @@ Manuals for both games define the controls as 4 push buttons: ***************************************************************************/ #include "emu.h" +#include "includes/galspnbl.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" #include "sound/3812intf.h" -#include "includes/galspnbl.h" +#include "speaker.h" WRITE16_MEMBER(galspnbl_state::soundcommand_w) diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp index b9d2dc11957..edf56c3761d 100644 --- a/src/mame/drivers/gamate.cpp +++ b/src/mame/drivers/gamate.cpp @@ -15,9 +15,11 @@ #include "emu.h" #include "includes/gamate.h" -#include "ui/uimain.h" + #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class gamate_state : public driver_device { @@ -208,7 +210,7 @@ READ8_MEMBER( gamate_state::gamate_video_r ) return 0; uint8_t data = video.bitmap.data[video.bitmap.page2][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]; // if (m_maincpu->pc()<0xf000) -// machine().ui().popup_time(2, "lcd read x:%x y:%x mode:%x data:%x\n", video.x, video.y, video.reg[1], data); +// popmessage("lcd read x:%x y:%x mode:%x data:%x\n", video.x, video.y, video.reg[1], data); if (video.y_increment) video.y++; else @@ -220,7 +222,7 @@ READ8_MEMBER( gamate_state::gamate_video_r ) READ8_MEMBER( gamate_state::gamate_nmi_r ) { uint8_t data=0; - machine().ui().popup_time(2, "nmi/4800 read\n"); + popmessage("nmi/4800 read\n"); return data; } diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp index 09e874d792c..b9d896ea5e3 100644 --- a/src/mame/drivers/gambl186.cpp +++ b/src/mame/drivers/gambl186.cpp @@ -50,9 +50,10 @@ TODO: #include "emu.h" #include "cpu/i86/i186.h" -#include "video/clgd542x.h" -#include "sound/upd7759.h" #include "machine/nvram.h" +#include "sound/upd7759.h" +#include "video/clgd542x.h" +#include "speaker.h" class gambl186_state : public driver_device diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp index 5f0d2ef985b..468abc79744 100644 --- a/src/mame/drivers/gamecom.cpp +++ b/src/mame/drivers/gamecom.cpp @@ -25,10 +25,15 @@ Game Status: #include "emu.h" #include "includes/gamecom.h" + #include "sound/volt_reg.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #include "gamecom.lh" + static ADDRESS_MAP_START(gamecom_mem_map, AS_PROGRAM, 8, gamecom_state) AM_RANGE( 0x0000, 0x0013 ) AM_RAM AM_REGION("maincpu", 0x00) AM_RANGE( 0x0014, 0x0017 ) AM_READWRITE( gamecom_pio_r, gamecom_pio_w ) // buttons diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index f08e3836597..19f16bd744a 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -66,10 +66,11 @@ #include "emu.h" #include "cpu/i386/i386.h" +#include "machine/idectrl.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" -#include "machine/idectrl.h" +#include "machine/pcshare.h" +#include "screen.h" class gamecstl_state : public pcat_base_state diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp index 97cb7c93273..6ec2dc1d045 100644 --- a/src/mame/drivers/gameking.cpp +++ b/src/mame/drivers/gameking.cpp @@ -25,13 +25,15 @@ Datasheet: http://www.generalplus.com/doc/ds/GPL133AV10_spec.pdf */ -#include #include "emu.h" #include "cpu/m6502/r65c02.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" +#include + class gameking_state : public driver_device { public: diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp index a59919edc7c..6b7d4101535 100644 --- a/src/mame/drivers/gameplan.cpp +++ b/src/mame/drivers/gameplan.cpp @@ -77,9 +77,11 @@ TODO: ****************************************************************************/ #include "emu.h" +#include "includes/gameplan.h" + #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" -#include "includes/gameplan.h" +#include "speaker.h" diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp index 041633e3a01..50325e3ca79 100644 --- a/src/mame/drivers/gamepock.cpp +++ b/src/mame/drivers/gamepock.cpp @@ -3,12 +3,16 @@ #include "emu.h" -#include "cpu/upd7810/upd7810.h" -#include "sound/speaker.h" -#include "bus/generic/carts.h" #include "includes/gamepock.h" + +#include "bus/generic/carts.h" +#include "cpu/upd7810/upd7810.h" + #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + static ADDRESS_MAP_START(gamepock_mem, AS_PROGRAM, 8, gamepock_state) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp index 46fe85f1d2f..2b7aa1ca10a 100644 --- a/src/mame/drivers/gamtor.cpp +++ b/src/mame/drivers/gamtor.cpp @@ -28,8 +28,10 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#include "video/pc_vga.h" #include "machine/mcf5206e.h" +#include "video/pc_vga.h" +#include "speaker.h" + class gaminator_state : public driver_device { diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index b0fffcc7bda..a4b0fc366cf 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -152,11 +152,13 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/gaplus.h" + #include "cpu/m6809/m6809.h" #include "machine/namco62.h" #include "machine/watchdog.h" #include "sound/samples.h" -#include "includes/gaplus.h" +#include "speaker.h" WRITE8_MEMBER(gaplus_state::irq_1_ctrl_w) diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp index b7e54dc6eb2..2dcef27e1e0 100644 --- a/src/mame/drivers/gatron.cpp +++ b/src/mame/drivers/gatron.cpp @@ -321,19 +321,23 @@ *****************************************************************************************/ -#define MASTER_CLOCK XTAL_16MHz - #include "emu.h" +#include "includes/gatron.h" + #include "cpu/z80/z80.h" -#include "sound/sn76496.h" #include "machine/i8255.h" #include "machine/nvram.h" +#include "sound/sn76496.h" +#include "screen.h" +#include "speaker.h" + +#include "bingo.lh" #include "poker41.lh" #include "pulltabs.lh" -#include "bingo.lh" -#include "includes/gatron.h" +#define MASTER_CLOCK XTAL_16MHz + /**************************** * Read/Write Handlers * ****************************/ diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp index cabe3ec5e8e..a1eb2ba0c42 100644 --- a/src/mame/drivers/gauntlet.cpp +++ b/src/mame/drivers/gauntlet.cpp @@ -121,13 +121,14 @@ #include "emu.h" +#include "includes/gauntlet.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "sound/tms5220.h" #include "sound/ym2151.h" #include "sound/pokey.h" -#include "includes/gauntlet.h" +#include "speaker.h" diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp index f7e21388537..928668dea91 100644 --- a/src/mame/drivers/gb.cpp +++ b/src/mame/drivers/gb.cpp @@ -299,7 +299,9 @@ space. This mapper uses 32KB sized banks. #include "includes/gb.h" #include "bus/gameboy/rom.h" #include "bus/gameboy/mbc.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #define DMG_FRAMES_PER_SECOND 59.732155 diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp index 65f2bfe8efa..a2c4f35ff8b 100644 --- a/src/mame/drivers/gba.cpp +++ b/src/mame/drivers/gba.cpp @@ -12,12 +12,15 @@ #include "emu.h" #include "includes/gba.h" + #include "bus/gba/rom.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "sound/gb.h" #include "sound/volt_reg.h" #include "softlist.h" +#include "speaker.h" + /* Sound Registers */ #define SOUNDCNT_L HWLO(0x080) /* 0x4000080 2 R/W Control Stereo/Volume/Enable */ diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index 275c40b59e2..63c8e06c465 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -73,11 +73,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/gberet.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/sn76496.h" -#include "includes/konamipt.h" -#include "includes/gberet.h" + +#include "screen.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index 52dc6740326..ffda8f064cc 100644 --- a/src/mame/drivers/gcpinbal.cpp +++ b/src/mame/drivers/gcpinbal.cpp @@ -82,10 +82,13 @@ NOTE: Mask roms from Power Flipper Pinball Shooting have not been dumped, but as ***************************************************************************/ #include "emu.h" +#include "includes/gcpinbal.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "sound/msm5205.h" -#include "includes/gcpinbal.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp index e253782dc07..532c2ca46a7 100644 --- a/src/mame/drivers/gei.cpp +++ b/src/mame/drivers/gei.cpp @@ -78,6 +78,8 @@ NOTE: Trivia Question rom names are the internal names used. IE: read from the f #include "machine/ticket.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" class gei_state : public driver_device diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp index 89a3699d2e2..3e319004d3b 100644 --- a/src/mame/drivers/geneve.cpp +++ b/src/mame/drivers/geneve.cpp @@ -214,6 +214,9 @@ #include "bus/ti99_peb/peribox.h" +#include "speaker.h" + + #define TRACE_READY 0 #define TRACE_LINES 0 #define TRACE_CRU 0 diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp index 93a626db3d6..2817b9362c0 100644 --- a/src/mame/drivers/geniusiq.cpp +++ b/src/mame/drivers/geniusiq.cpp @@ -239,6 +239,7 @@ TMP47C241MG = TCLS-47 series 4-bit CPU with 2048x8 internal ROM #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" #define KEYBOARD_QUEUE_SIZE 0x80 diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp index 7b80bb746e4..e89dd7d1748 100644 --- a/src/mame/drivers/ggconnie.cpp +++ b/src/mame/drivers/ggconnie.cpp @@ -20,6 +20,7 @@ #include "emu.h" #include "machine/pcecommn.h" + #include "video/huc6270.h" #include "video/huc6260.h" #include "video/huc6202.h" @@ -27,16 +28,18 @@ #include "sound/c6280.h" #include "sound/okim6295.h" #include "machine/msm6242.h" +#include "screen.h" +#include "speaker.h" class ggconnie_state : public pce_common_state { public: ggconnie_state(const machine_config &mconfig, device_type type, const char *tag) - : pce_common_state(mconfig, type, tag), - m_rtc(*this, "rtc"), - m_oki(*this, "oki") - { } + : pce_common_state(mconfig, type, tag) + , m_rtc(*this, "rtc") + , m_oki(*this, "oki") + { } required_device m_rtc; required_device m_oki; diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp index 282486b96cb..9e2e070df2f 100644 --- a/src/mame/drivers/ghosteo.cpp +++ b/src/mame/drivers/ghosteo.cpp @@ -64,6 +64,8 @@ ToDo: verify QS1000 hook-up //#include "machine/smartmed.h" #include "machine/i2cmem.h" #include "sound/qs1000.h" +#include "screen.h" +#include "speaker.h" #define NAND_LOG 0 diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp index 5b0368bde6b..94e0b981c89 100644 --- a/src/mame/drivers/gijoe.cpp +++ b/src/mame/drivers/gijoe.cpp @@ -105,12 +105,15 @@ Known Issues ***************************************************************************/ #include "emu.h" +#include "includes/gijoe.h" +#include "includes/konamipt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/k054539.h" -#include "includes/konamipt.h" -#include "includes/gijoe.h" +#include "speaker.h" + #define JOE_DEBUG 0 #define JOE_DMADELAY (attotime::from_nsec(42700 + 341300)) diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp index 1e5c2fe4e06..ffa0acd5a46 100644 --- a/src/mame/drivers/ginganin.cpp +++ b/src/mame/drivers/ginganin.cpp @@ -53,12 +53,16 @@ f5d6 print 7 digit BCD number: d0.l to (a1)+ color $3000 ***************************************************************************/ #include "emu.h" +#include "includes/ginganin.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6809/m6809.h" +#include "machine/6840ptm.h" #include "sound/ay8910.h" #include "sound/8950intf.h" -#include "includes/ginganin.h" -#include "machine/6840ptm.h" + +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_6MHz diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp index ecfc2f97276..33c1aefb832 100644 --- a/src/mame/drivers/gizmondo.cpp +++ b/src/mame/drivers/gizmondo.cpp @@ -35,6 +35,8 @@ SYSINTR_GPS = INT_EINT3, INT_EINT8_23 (EINT18) #include "machine/s3c2440.h" #include "video/gf4500.h" #include "rendlay.h" +#include "screen.h" + #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index b7f536f13a5..8297782b0d6 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -85,8 +85,11 @@ More chips (from eBay auction): #include "emu.h" #include "cpu/i960/i960.h" -#include "sound/ymz280b.h" #include "machine/nvram.h" +#include "sound/ymz280b.h" +#include "screen.h" +#include "speaker.h" + class igt_gameking_state : public driver_device { diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index 7b915a13739..cdc5cf0208a 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -201,6 +201,9 @@ TODO: #include "sound/2203intf.h" #include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(gladiatr_state::gladiatr_bankswitch_w) { diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp index a08150ac9ca..29e70448073 100644 --- a/src/mame/drivers/glasgow.cpp +++ b/src/mame/drivers/glasgow.cpp @@ -44,8 +44,11 @@ ToDo: #include "emu.h" #include "cpu/m68000/m68000.h" -#include "glasgow.lh" #include "sound/beep.h" +#include "speaker.h" + +#include "glasgow.lh" + class glasgow_state : public driver_device { diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp index a770362abef..866056a7359 100644 --- a/src/mame/drivers/glass.cpp +++ b/src/mame/drivers/glass.cpp @@ -12,9 +12,13 @@ except for the Promat licensed Korean version which is unprotected. ***************************************************************************/ #include "emu.h" +#include "includes/glass.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "includes/glass.h" +#include "screen.h" +#include "speaker.h" + WRITE16_MEMBER(glass_state::clr_int_w) { diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp index a2b46f8ebe8..cf3f3b5af6f 100644 --- a/src/mame/drivers/gluck2.cpp +++ b/src/mame/drivers/gluck2.cpp @@ -189,16 +189,18 @@ *******************************************************************************/ - -#define MASTER_CLOCK XTAL_10MHz -#define SND_CLOCK XTAL_3_579545MHz - #include "emu.h" #include "cpu/m6502/m6502.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/ym2413.h" #include "video/mc6845.h" -#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_10MHz +#define SND_CLOCK XTAL_3_579545MHz class gluck2_state : public driver_device diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp index 0cbcb0c84cb..ecc0083885b 100644 --- a/src/mame/drivers/gmaster.cpp +++ b/src/mame/drivers/gmaster.cpp @@ -5,12 +5,18 @@ ******************************************************************************/ #include "emu.h" + #include "cpu/upd7810/upd7810.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" + #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class gmaster_state : public driver_device { diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index 656aa49b122..ce93aa172a9 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -23,11 +23,14 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/gng.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "includes/gng.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(gng_state::gng_bankswitch_w) diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp index 2eccde30471..e7bb2bf49d9 100644 --- a/src/mame/drivers/go2000.cpp +++ b/src/mame/drivers/go2000.cpp @@ -37,6 +37,9 @@ Notes: #include "machine/gen_latch.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + class go2000_state : public driver_device { diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp index 1e3f99e4f9c..0b9783f4cf3 100644 --- a/src/mame/drivers/goal92.cpp +++ b/src/mame/drivers/goal92.cpp @@ -10,11 +10,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/goal92.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/goal92.h" +#include "screen.h" +#include "speaker.h" + WRITE16_MEMBER(goal92_state::goal92_sound_command_w) { diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp index 72dd3c7fed0..119c76192bb 100644 --- a/src/mame/drivers/goindol.cpp +++ b/src/mame/drivers/goindol.cpp @@ -20,10 +20,13 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/goindol.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "includes/goindol.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(goindol_state::goindol_bankswitch_w) diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp index 4fe59c830b4..b1989ad8a6d 100644 --- a/src/mame/drivers/goldngam.cpp +++ b/src/mame/drivers/goldngam.cpp @@ -230,13 +230,15 @@ *******************************************************************************/ - -#define MASTER_CLOCK XTAL_8MHz /* from CPU Board */ -#define SECONDARY_CLOCK XTAL_6MHz /* from GFX Board */ - #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_8MHz /* from CPU Board */ +#define SECONDARY_CLOCK XTAL_6MHz /* from GFX Board */ class goldngam_state : public driver_device diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index 8ca168162d6..37edaa077be 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1071,26 +1071,28 @@ ************************************************************************************/ - -#define MASTER_CLOCK XTAL_10MHz -#define CPU_CLOCK (MASTER_CLOCK/16) - #include "emu.h" + #include "cpu/m6502/m6502.h" -#include "video/mc6845.h" +#include "cpu/z80/z80.h" #include "machine/6821pia.h" -#include "sound/discrete.h" #include "machine/nvram.h" - -/* Extra CPUs, MCUs, devices, etc... */ -#include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "sound/discrete.h" +#include "video/mc6845.h" + +#include "screen.h" +#include "speaker.h" #include "pmpoker.lh" #include "goldnpkr.lh" #include "upndown.lh" +#define MASTER_CLOCK XTAL_10MHz +#define CPU_CLOCK (MASTER_CLOCK/16) + + class goldnpkr_state : public driver_device { public: diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 173b04f54c1..e0603cbd732 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -219,14 +219,18 @@ #define OKI_CLOCK 1056000 /* unverified resonator */ #include "emu.h" +#include "includes/goldstar.h" + #include "cpu/z80/z80.h" +#include "machine/i8255.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/okim6295.h" #include "sound/sn76496.h" -#include "machine/i8255.h" -#include "machine/nvram.h" #include "video/ramdac.h" -#include "includes/goldstar.h" + +#include "screen.h" +#include "speaker.h" #include "bingowng.lh" #include "cherryb3.lh" diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp index 4a425759fa3..32d2412485e 100644 --- a/src/mame/drivers/gomoku.cpp +++ b/src/mame/drivers/gomoku.cpp @@ -24,9 +24,11 @@ todo: ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/gomoku.h" +#include "cpu/z80/z80.h" +#include "speaker.h" + /* input ports are rotated 90 degrees */ READ8_MEMBER(gomoku_state::input_port_r) diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp index a82e454f376..3000fa23278 100644 --- a/src/mame/drivers/good.cpp +++ b/src/mame/drivers/good.cpp @@ -35,6 +35,8 @@ voice.rom - VOICE ROM #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class good_state : public driver_device diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index 9b0dfac068a..a05a7f8bad8 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -71,11 +71,14 @@ Secret menu hack [totmejan only] (I couldn't find official way to enter, so it's *******************************************************************************************/ #include "emu.h" -#include "cpu/nec/nec.h" #include "audio/seibu.h" + +#include "cpu/nec/nec.h" #include "sound/3812intf.h" #include "sound/okim6295.h" #include "video/seibu_crtc.h" +#include "screen.h" +#include "speaker.h" class goodejan_state : public driver_device diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp index b0ab9b2a504..0196ce8a7d3 100644 --- a/src/mame/drivers/gotcha.cpp +++ b/src/mame/drivers/gotcha.cpp @@ -60,12 +60,17 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/gotcha.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/gotcha.h" +#include "sound/ym2151.h" + +#include "screen.h" +#include "speaker.h" + WRITE16_MEMBER(gotcha_state::gotcha_lamps_w) { diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index dd482a398c2..038f4927883 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -198,8 +198,10 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us #include "emu.h" #include "includes/gottlieb.h" + #include "machine/nvram.h" #include "machine/watchdog.h" +#include "speaker.h" #define LOG_AUDIO_DECODE (0) diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp index f546b157885..ca07e25bac6 100644 --- a/src/mame/drivers/gotya.cpp +++ b/src/mame/drivers/gotya.cpp @@ -36,10 +36,13 @@ TODO: Emulated sound ****************************************************************************/ #include "emu.h" +#include "includes/gotya.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/samples.h" -#include "includes/gotya.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( gotya_map, AS_PROGRAM, 8, gotya_state ) diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp index c518e96783a..645c9f9a913 100644 --- a/src/mame/drivers/goupil.cpp +++ b/src/mame/drivers/goupil.cpp @@ -22,16 +22,19 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/m6800/m6800.h" #include "machine/6522via.h" +#include "machine/6850acia.h" #include "machine/i8279.h" +#include "machine/wd_fdc.h" #include "video/ef9364.h" #include "video/mc6845.h" -#include "machine/6850acia.h" -#include "machine/wd_fdc.h" +#include "screen.h" #include "softlist.h" + #define MAIN_CLOCK XTAL_4MHz #define VIDEO_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */ #define CPU_CLOCK MAIN_CLOCK / 4 /* 1 Mhz */ diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp index 78ecdfb2545..3c1e9fabbcd 100644 --- a/src/mame/drivers/gp2x.cpp +++ b/src/mame/drivers/gp2x.cpp @@ -21,6 +21,8 @@ #include "emu.h" #include "cpu/arm7/arm7.h" +#include "screen.h" +#include "speaker.h" class gp2x_state : public driver_device diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp index dc2db05bca6..abe3966d1d6 100644 --- a/src/mame/drivers/gp32.cpp +++ b/src/mame/drivers/gp32.cpp @@ -18,11 +18,16 @@ #include "emu.h" #include "includes/gp32.h" + #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "sound/volt_reg.h" + #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp index 061e70e2fe6..d8f3a4f282f 100644 --- a/src/mame/drivers/gp_1.cpp +++ b/src/mame/drivers/gp_1.cpp @@ -21,11 +21,14 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "machine/i8255.h" #include "machine/z80ctc.h" #include "sound/sn76477.h" +#include "speaker.h" + #include "gp_1.lh" class gp_1_state : public genpin_class diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index eb216e085ba..926c60d7625 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -44,6 +44,7 @@ Dumping Notes: #include "emu.h" #include "cpu/z80/z80.h" #include "machine/ldv1000.h" +#include "speaker.h" class gpworld_state : public driver_device diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp index 3e4da6283e7..7ee8624a245 100644 --- a/src/mame/drivers/gradius3.cpp +++ b/src/mame/drivers/gradius3.cpp @@ -23,14 +23,17 @@ ***************************************************************************/ #include "emu.h" +#include "includes/gradius3.h" +#include "includes/konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/gradius3.h" + +#include "speaker.h" + READ16_MEMBER(gradius3_state::k052109_halfword_r) { diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp index c5cc36ece7a..9a854405c87 100644 --- a/src/mame/drivers/grchamp.cpp +++ b/src/mame/drivers/grchamp.cpp @@ -44,9 +44,11 @@ ***************************************************************************/ #include "emu.h" +#include "includes/grchamp.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/grchamp.h" +#include "speaker.h" #include "grchamp.lh" diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp index 7362af49c07..c277766e1ea 100644 --- a/src/mame/drivers/grfd2301.cpp +++ b/src/mame/drivers/grfd2301.cpp @@ -30,9 +30,10 @@ A sticker on the back panel says: GenRad, Culver City CA, Model 2301-9001 *************************************************************************************************************/ - #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" + class grfd2301_state : public driver_device { diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp index 23d20ad86ba..87f60fde51f 100644 --- a/src/mame/drivers/gridlee.cpp +++ b/src/mame/drivers/gridlee.cpp @@ -80,11 +80,13 @@ #include "emu.h" +#include "includes/gridlee.h" + #include "cpu/m6809/m6809.h" #include "sound/samples.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/gridlee.h" +#include "speaker.h" /* constants */ diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp index 74faf324ed7..d97f23a7910 100644 --- a/src/mame/drivers/groundfx.cpp +++ b/src/mame/drivers/groundfx.cpp @@ -65,11 +65,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/groundfx.h" +#include "audio/taito_en.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "sound/es5506.h" -#include "audio/taito_en.h" -#include "includes/groundfx.h" +#include "screen.h" /*********************************************************** diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp index 1eb7da63744..70537bb2bd9 100644 --- a/src/mame/drivers/gstream.cpp +++ b/src/mame/drivers/gstream.cpp @@ -136,6 +136,8 @@ RAM4 is HMC HM6264LP-70 #include "cpu/e132xs/e132xs.h" #include "sound/okim6295.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" class gstream_state : public driver_device { diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp index a56b4ae3cd3..1018d0e60ab 100644 --- a/src/mame/drivers/gstriker.cpp +++ b/src/mame/drivers/gstriker.cpp @@ -34,10 +34,13 @@ Missing mixer registers (mainly layer enable/disable) ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" #include "includes/gstriker.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/2610intf.h" +#include "speaker.h" + /*** README INFO ************************************************************** diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp index 3232cf2eb29..b0bbff0a297 100644 --- a/src/mame/drivers/gsword.cpp +++ b/src/mame/drivers/gsword.cpp @@ -150,6 +150,8 @@ reg: 0->1 (main->2nd) / : (1->0) 2nd->main : #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/tait8741.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp index 400f364e127..5f392819340 100644 --- a/src/mame/drivers/gticlub.cpp +++ b/src/mame/drivers/gticlub.cpp @@ -236,8 +236,9 @@ Hang Pilot (uses an unknown but similar video board) 12W #include "video/k001006.h" #include "video/k001604.h" - #include "rendlay.h" +#include "speaker.h" + class gticlub_state : public driver_device { diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp index 8dece23ecf8..7041ad77a4e 100644 --- a/src/mame/drivers/gts3a.cpp +++ b/src/mame/drivers/gts3a.cpp @@ -20,9 +20,12 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6502/m65c02.h" #include "machine/6522via.h" #include "video/mc6845.h" +#include "screen.h" + class gts3a_state : public driver_device { diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp index 22ad342b9a0..1bb92bf44e8 100644 --- a/src/mame/drivers/gts80.cpp +++ b/src/mame/drivers/gts80.cpp @@ -27,6 +27,7 @@ ToDO: #include "emu.h" #include "machine/genpin.h" #include "audio/gottlieb.h" +#include "speaker.h" #include "gts80.lh" class gts80_state : public genpin_class diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp index 0521c7986a3..b3fece393f4 100644 --- a/src/mame/drivers/gts80a.cpp +++ b/src/mame/drivers/gts80a.cpp @@ -15,6 +15,9 @@ #include "machine/genpin.h" #include "audio/gottlieb.h" #include "cpu/i86/i86.h" +#include "screen.h" +#include "speaker.h" + #include "gts80a.lh" #include "gts80a_caveman.lh" diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp index d4fef36b9df..ad9b87979e2 100644 --- a/src/mame/drivers/gts80b.cpp +++ b/src/mame/drivers/gts80b.cpp @@ -16,9 +16,13 @@ #include "emu.h" #include "machine/genpin.h" #include "audio/gottlieb.h" + #include "cpu/i86/i86.h" +#include "speaker.h" + #include "gts80b.lh" + class gts80b_state : public genpin_class { public: diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index 3fae6e696cc..7ef39617c86 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -38,16 +38,20 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/m68000/m68000.h" +#include "formats/guab_dsk.h" #include "machine/6840ptm.h" -#include "machine/i8255.h" #include "machine/6850acia.h" -#include "video/tms34061.h" -#include "video/ef9369.h" -#include "sound/sn76496.h" +#include "machine/i8255.h" #include "machine/wd_fdc.h" -#include "formats/guab_dsk.h" +#include "sound/sn76496.h" +#include "video/ef9369.h" +#include "video/tms34061.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #include "guab.lh" diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp index 99509e8ab1f..d0f9450a544 100644 --- a/src/mame/drivers/gumbo.cpp +++ b/src/mame/drivers/gumbo.cpp @@ -44,9 +44,13 @@ PCB Layout */ #include "emu.h" +#include "includes/gumbo.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "includes/gumbo.h" +#include "screen.h" +#include "speaker.h" + static ADDRESS_MAP_START( gumbo_map, AS_PROGRAM, 16, gumbo_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp index b5e1d38b314..5fa812e813f 100644 --- a/src/mame/drivers/gunbustr.cpp +++ b/src/mame/drivers/gunbustr.cpp @@ -44,11 +44,13 @@ ***************************************************************************/ #include "emu.h" +#include "audio/taito_en.h" +#include "includes/gunbustr.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "sound/es5506.h" -#include "audio/taito_en.h" -#include "includes/gunbustr.h" +#include "screen.h" /*********************************************************************/ diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp index 37eb95f4a91..957968f49f9 100644 --- a/src/mame/drivers/gundealr.cpp +++ b/src/mame/drivers/gundealr.cpp @@ -59,9 +59,13 @@ Z80 CPU - 12MHz/2 ***************************************************************************/ #include "emu.h" +#include "includes/gundealr.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/gundealr.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(gundealr_state::yamyam_bankswitch_w) { diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp index 78422ba6fb5..e9becf43084 100644 --- a/src/mame/drivers/gunpey.cpp +++ b/src/mame/drivers/gunpey.cpp @@ -192,6 +192,8 @@ Release: November 1999 #include "cpu/nec/nec.h" #include "sound/okim6295.h" #include "sound/ymz280b.h" +#include "screen.h" +#include "speaker.h" class gunpey_state : public driver_device diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp index 107b871a323..fc62ca64daf 100644 --- a/src/mame/drivers/gunsmoke.cpp +++ b/src/mame/drivers/gunsmoke.cpp @@ -70,11 +70,14 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/gunsmoke.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/gunsmoke.h" +#include "screen.h" +#include "speaker.h" /* Read/Write Handlers */ diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp index c9edc5c9640..9dee79b4581 100644 --- a/src/mame/drivers/gyruss.cpp +++ b/src/mame/drivers/gyruss.cpp @@ -58,15 +58,18 @@ and 1 SFX channel controlled by an 8039: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/gyruss.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" +#include "cpu/mcs48/mcs48.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/konami1.h" -#include "cpu/mcs48/mcs48.h" #include "sound/ay8910.h" #include "sound/discrete.h" -#include "includes/konamipt.h" -#include "includes/gyruss.h" + +#include "speaker.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index d30363409fb..e45d4d7049e 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -53,10 +53,13 @@ Address Description #include "emu.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "sound/beep.h" #include "machine/ins8250.h" #include "machine/mm5740.h" +#include "sound/beep.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + // Standard H19 used a 2.048 MHz clock #define H19_CLOCK (XTAL_12_288MHz / 6) diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp index 709363ed144..c9efaed1d60 100644 --- a/src/mame/drivers/h8.cpp +++ b/src/mame/drivers/h8.cpp @@ -47,12 +47,15 @@ TODO: ****************************************************************************/ #include "emu.h" + #include "cpu/i8085/i8085.h" #include "machine/i8251.h" #include "machine/clock.h" #include "imagedev/cassette.h" #include "sound/beep.h" #include "sound/wave.h" +#include "speaker.h" + #include "h8.lh" diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp index f94c9616cbd..392cd9d0960 100644 --- a/src/mame/drivers/halleys.cpp +++ b/src/mame/drivers/halleys.cpp @@ -162,11 +162,15 @@ Video sync 6 F Video sync Post 6 F Post // Compiler Directives #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/taitoipt.h" -#include "machine/gen_latch.h" + #include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" +#include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #define HALLEYS_DEBUG 0 diff --git a/src/mame/drivers/hanaawas.cpp b/src/mame/drivers/hanaawas.cpp index b45ef16435b..9ca0ec9bb0e 100644 --- a/src/mame/drivers/hanaawas.cpp +++ b/src/mame/drivers/hanaawas.cpp @@ -28,9 +28,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/hanaawas.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/hanaawas.h" +#include "screen.h" +#include "speaker.h" + READ8_MEMBER(hanaawas_state::hanaawas_input_port_0_r) { diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp index bb33f715794..10c46d70915 100644 --- a/src/mame/drivers/hankin.cpp +++ b/src/mame/drivers/hankin.cpp @@ -17,10 +17,13 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "hankin.lh" class hankin_state : public genpin_class diff --git a/src/mame/drivers/hapyfish.cpp b/src/mame/drivers/hapyfish.cpp index 1d57c35c35a..cd41f22da9f 100644 --- a/src/mame/drivers/hapyfish.cpp +++ b/src/mame/drivers/hapyfish.cpp @@ -20,6 +20,7 @@ #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" +#include "screen.h" class hapyfish_state : public driver_device diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 76a0c668f9b..602046581e4 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -326,9 +326,12 @@ Notes: #include "emu.h" #include "includes/harddriv.h" + #include "includes/slapstic.h" #include "machine/watchdog.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "racedrivpan.lh" /************************************* @@ -337,7 +340,7 @@ Notes: * *************************************/ -const device_type HARDDRIV_DEVICE = &device_creator; +const device_type HARDDRIV_DEVICE = device_creator; harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, HARDDRIV_DEVICE, "Hard Drivin' PCB Family", tag, owner, clock, "harddriv_pcb", __FILE__), @@ -1748,7 +1751,7 @@ static MACHINE_CONFIG_FRAGMENT( hdrivair ) MCFG_FRAGMENT_ADD( dsk2 ) /* DSK II board */ MACHINE_CONFIG_END -const device_type HARDDRIV_BOARD_DEVICE = &device_creator; +const device_type HARDDRIV_BOARD_DEVICE = device_creator; harddriv_board_device_state::harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) @@ -1774,7 +1777,7 @@ void harddrivc_board_device_state::device_start() harddriv_state::device_start(); } -const device_type HARDDRIVC_BOARD_DEVICE = &device_creator; +const device_type HARDDRIVC_BOARD_DEVICE = device_creator; harddrivc_board_device_state::harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) @@ -1801,8 +1804,8 @@ void racedrivb1_board_device_state::device_start() harddriv_state::device_start(); } -const device_type RACEDRIV_BOARD_DEVICE = &device_creator; -const device_type RACEDRIVB1_BOARD_DEVICE = &device_creator; +const device_type RACEDRIV_BOARD_DEVICE = device_creator; +const device_type RACEDRIVB1_BOARD_DEVICE = device_creator; racedriv_board_device_state::racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) @@ -1837,9 +1840,9 @@ void racedrivc_panorama_side_board_device_state::device_start() -const device_type RACEDRIVC_BOARD_DEVICE = &device_creator; -const device_type RACEDRIVC1_BOARD_DEVICE = &device_creator; -const device_type RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE = &device_creator; +const device_type RACEDRIVC_BOARD_DEVICE = device_creator; +const device_type RACEDRIVC1_BOARD_DEVICE = device_creator; +const device_type RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE = device_creator; racedrivc_board_device_state::racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) @@ -1865,7 +1868,7 @@ void stunrun_board_device_state::device_start() harddriv_state::device_start(); } -const device_type STUNRUN_BOARD_DEVICE = &device_creator; +const device_type STUNRUN_BOARD_DEVICE = device_creator; stunrun_board_device_state::stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) @@ -1897,9 +1900,9 @@ void steeltalp_board_device_state::device_start() harddriv_state::device_start(); } -const device_type STEELTAL_BOARD_DEVICE = &device_creator; -const device_type STEELTAL1_BOARD_DEVICE = &device_creator; -const device_type STEELTALP_BOARD_DEVICE = &device_creator; +const device_type STEELTAL_BOARD_DEVICE = device_creator; +const device_type STEELTAL1_BOARD_DEVICE = device_creator; +const device_type STEELTALP_BOARD_DEVICE = device_creator; steeltal_board_device_state::steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) @@ -1919,7 +1922,7 @@ void strtdriv_board_device_state::device_start() harddriv_state::device_start(); } -const device_type STRTDRIV_BOARD_DEVICE = &device_creator; +const device_type STRTDRIV_BOARD_DEVICE = device_creator; strtdriv_board_device_state::strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) @@ -1945,8 +1948,8 @@ void hdrivairp_board_device_state::device_start() harddriv_state::device_start(); } -const device_type HDRIVAIR_BOARD_DEVICE = &device_creator; -const device_type HDRIVAIRP_BOARD_DEVICE = &device_creator; +const device_type HDRIVAIR_BOARD_DEVICE = device_creator; +const device_type HDRIVAIRP_BOARD_DEVICE = device_creator; hdrivair_board_device_state::hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : harddriv_state(mconfig, tag, owner, clock) diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp index 1ef3b96c0c2..b3d9dec6a74 100644 --- a/src/mame/drivers/harriet.cpp +++ b/src/mame/drivers/harriet.cpp @@ -11,10 +11,11 @@ ***************************************************************************/ - #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/terminal.h" +#include "speaker.h" + #define TERMINAL_TAG "terminal" diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index c72d9c87c42..69f067f8312 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -24,6 +24,7 @@ References: ****************************************************************************/ #include "emu.h" + #include "cpu/i8085/i8085.h" #include "machine/ay31015.h" #include "machine/clock.h" @@ -33,6 +34,9 @@ References: #include "machine/nl_hazelvid.h" #include "netlist/devices/net_lib.h" +#include "screen.h" + + #define CPU_TAG "maincpu" #define NETLIST_TAG "videobrd" #define UART_TAG "uart" diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp index 9f69f78f072..7125a710ba2 100644 --- a/src/mame/drivers/hcastle.cpp +++ b/src/mame/drivers/hcastle.cpp @@ -9,14 +9,18 @@ ***************************************************************************/ #include "emu.h" +#include "includes/hcastle.h" +#include "includes/konamipt.h" + #include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/3812intf.h" #include "sound/k051649.h" -#include "includes/konamipt.h" -#include "includes/hcastle.h" + +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(hcastle_state::hcastle_bankswitch_w) diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp index 0cf030d632f..ccbb0bad2b6 100644 --- a/src/mame/drivers/headonb.cpp +++ b/src/mame/drivers/headonb.cpp @@ -30,6 +30,7 @@ Other outs: #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class headonb_state : public driver_device diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp index 012b852d1cc..7b990ed4edd 100644 --- a/src/mame/drivers/hec2hrp.cpp +++ b/src/mame/drivers/hec2hrp.cpp @@ -72,17 +72,22 @@ */ #include "emu.h" +#include "includes/hec2hrp.h" +#include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "formats/hect_tap.h" #include "imagedev/printer.h" -#include "sound/wave.h" /* for K7 sound*/ -#include "sound/discrete.h" /* for 1 Bit sound*/ #include "machine/upd765.h" /* for floppy disc controller */ -#include "cpu/z80/z80.h" +#include "sound/discrete.h" /* for 1 Bit sound*/ +#include "sound/wave.h" /* for K7 sound*/ + +#include "screen.h" +#include "speaker.h" + #include "formats/hect_dsk.h" +#include "formats/hect_tap.h" #include "formats/hector_minidisc.h" -#include "includes/hec2hrp.h" + /*****************************************************************************/ static ADDRESS_MAP_START(hecdisc2_mem, AS_PROGRAM, 8, hec2hrp_state ) diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp index c2959a33711..837ce1f253a 100644 --- a/src/mame/drivers/hexion.cpp +++ b/src/mame/drivers/hexion.cpp @@ -79,12 +79,16 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/hexion.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/okim6295.h" #include "sound/k051649.h" -#include "includes/konamipt.h" -#include "includes/hexion.h" + +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(hexion_state::coincntr_w) diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp index c08b8a0f448..015d56c7ddd 100644 --- a/src/mame/drivers/hh_amis2k.cpp +++ b/src/mame/drivers/hh_amis2k.cpp @@ -25,7 +25,8 @@ #include "emu.h" #include "cpu/amis2000/amis2000.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "speaker.h" #include "wildfire.lh" // this is a test layout, use external artwork diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 482bb312d8f..89fba606990 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -13,10 +13,13 @@ #include "emu.h" #include "cpu/cop400/cop400.h" -#include "sound/speaker.h" + +#include "sound/spkrdev.h" #include "sound/dac.h" #include "sound/volt_reg.h" //#include "rendlay.h" +#include "screen.h" +#include "speaker.h" // internal artwork #include "bship82.lh" // clickable diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index 15c84198628..8560fc7eb88 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -86,11 +86,13 @@ ***************************************************************************/ #include "emu.h" -#include "rendlay.h" #include "cpu/hmcs40/hmcs40.h" #include "cpu/cop400/cop400.h" #include "machine/gen_latch.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" // internal artwork #include "pairmtch.lh" diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index 6da171f810b..1a0663fe254 100644 --- a/src/mame/drivers/hh_melps4.cpp +++ b/src/mame/drivers/hh_melps4.cpp @@ -8,9 +8,13 @@ ***************************************************************************/ #include "emu.h" -#include "rendlay.h" + #include "cpu/melps4/m58846.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" //#include "hh_melps4_test.lh" // common test-layout - no svg artwork(yet), use external artwork diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index 997bdf83401..0aaff36f731 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -47,7 +47,8 @@ #include "emu.h" #include "cpu/pic16c5x/pic16c5x.h" #include "machine/clock.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "speaker.h" #include "hccbaskb.lh" #include "leboom.lh" // clickable diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index a0edf5bc8b8..9515983b463 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -12,7 +12,8 @@ #include "emu.h" #include "cpu/sm510/sm510.h" #include "cpu/sm510/kb1013vk1-2.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "speaker.h" #include "hh_sm510_test.lh" // common test-layout - use external artwork diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index b3294fda2e4..9623f2ee921 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -134,11 +134,15 @@ #include "emu.h" #include "includes/hh_tms1k.h" + #include "machine/tms1024.h" -#include "video/hlcd0515.h" #include "sound/beep.h" -#include "sound/sn76477.h" #include "sound/s14001a.h" +#include "sound/sn76477.h" +#include "video/hlcd0515.h" + +#include "screen.h" +#include "speaker.h" #include "rendlay.h" // internal artwork diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index f5e955eb68c..796fa6bfeba 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -69,6 +69,8 @@ TODO: #include "emu.h" #include "includes/hh_ucom4.h" #include "video/hlcd0515.h" +#include "screen.h" +#include "speaker.h" // internal artwork #include "efball.lh" diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp index edf55ea27bc..2d72d3c9750 100644 --- a/src/mame/drivers/hideseek.cpp +++ b/src/mame/drivers/hideseek.cpp @@ -28,24 +28,26 @@ Other stuff: NEC D4992 (RTC?) and xtal possibly 32.768kHz, 3V coin battery, 93L4 #include "emu.h" #include "cpu/sh2/sh2.h" +#include "screen.h" +#include "speaker.h" class hideseek_state : public driver_device { public: hideseek_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") - { } - - required_device m_maincpu; - + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + { + } DECLARE_DRIVER_INIT(hideseek); virtual void video_start() override; DECLARE_PALETTE_INIT(hideseek); uint32_t screen_update_hideseek(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); +protected: + required_device m_maincpu; }; diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp index bf341cbb92e..bae44989a52 100644 --- a/src/mame/drivers/higemaru.cpp +++ b/src/mame/drivers/higemaru.cpp @@ -13,9 +13,12 @@ Use Player 1 joystick and button, then press START1 to go to next screen. ****************************************************************************/ #include "emu.h" +#include "includes/higemaru.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/higemaru.h" +#include "screen.h" +#include "speaker.h" TIMER_DEVICE_CALLBACK_MEMBER(higemaru_state::higemaru_scanline) diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index 1e9da3a340c..7476e1f0cf8 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -97,13 +97,18 @@ Game is V30 based, with rom banking (2Mb) *************************************************************************************************/ #include "emu.h" -#include "cpu/nec/nec.h" + #include "cpu/i86/i186.h" -#include "sound/okim6376.h" +#include "cpu/nec/nec.h" #include "machine/nvram.h" -#include "fashion.lh" +#include "sound/okim6376.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + +#include "fashion.lh" + class highvdeo_state : public driver_device { diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index ed2ef61da6c..aa18d0d14cf 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -383,6 +383,8 @@ Notes: #include "emu.h" #include "cpu/sh4/sh4.h" +#include "screen.h" + #define CPU_CLOCK (200000000) diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp index 4fbaf602e34..2646e71d392 100644 --- a/src/mame/drivers/himesiki.cpp +++ b/src/mame/drivers/himesiki.cpp @@ -92,10 +92,14 @@ A 12.000MHz */ #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/2203intf.h" #include "includes/himesiki.h" + +#include "cpu/z80/z80.h" #include "machine/i8255.h" +#include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" + #define MCLK XTAL_12MHz // this is on the video board #define CLK2 XTAL_8MHz // near the CPUs diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp index d9e49335a36..067ec706d89 100644 --- a/src/mame/drivers/hitme.cpp +++ b/src/mame/drivers/hitme.cpp @@ -17,9 +17,11 @@ */ #include "emu.h" -#include "cpu/i8085/i8085.h" #include "includes/hitme.h" + +#include "cpu/i8085/i8085.h" #include "sound/discrete.h" +#include "speaker.h" #include "barricad.lh" diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp index 8d3c8fd7409..44c2ca5c417 100644 --- a/src/mame/drivers/hitpoker.cpp +++ b/src/mame/drivers/hitpoker.cpp @@ -46,9 +46,11 @@ Some debug tricks (let's test this CPU as more as possible): #include "emu.h" #include "cpu/mc68hc11/mc68hc11.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "video/mc6845.h" -#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" class hitpoker_state : public driver_device diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp index 64bfd0edb22..ed5612dea54 100644 --- a/src/mame/drivers/hnayayoi.cpp +++ b/src/mame/drivers/hnayayoi.cpp @@ -39,11 +39,14 @@ TODO: ****************************************************************************/ #include "emu.h" +#include "includes/hnayayoi.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/msm5205.h" #include "machine/nvram.h" -#include "includes/hnayayoi.h" +#include "screen.h" +#include "speaker.h" READ8_MEMBER(hnayayoi_state::keyboard_0_r) diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp index ad2a0f6513d..1f3a531136f 100644 --- a/src/mame/drivers/hng64.cpp +++ b/src/mame/drivers/hng64.cpp @@ -435,14 +435,15 @@ or Fatal Fury for example). */ - #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/hng64.h" + #include "cpu/mips/mips3.h" +#include "cpu/z80/z80.h" #include "machine/nvram.h" -#include "includes/hng64.h" #include "machine/hng64_net.h" + /* TODO: NOT measured! */ #define PIXEL_CLOCK ((HNG64_MASTER_CLOCK*2)/4) // x 2 is due of the interlaced screen ... diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp index 54f19c3f6ed..3d22462253f 100644 --- a/src/mame/drivers/holeland.cpp +++ b/src/mame/drivers/holeland.cpp @@ -14,12 +14,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/holeland.h" + #include "cpu/z80/z80.h" +#include "machine/nvram.h" #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/sp0256.h" -#include "machine/nvram.h" -#include "includes/holeland.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( holeland_map, AS_PROGRAM, 8, holeland_state ) diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index 01e77b483df..a1a8423c637 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -235,11 +235,15 @@ Custom: GX61A01 #include "emu.h" #include "includes/homedata.h" + #include "cpu/m6809/m6809.h" #include "cpu/upd7810/upd7810.h" #include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + INTERRUPT_GEN_MEMBER(homedata_state::homedata_irq) { diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index d07c8c6a56e..8393ede6b99 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -40,6 +40,8 @@ MB7051 - fuse programmed prom. #include "sound/mea8000.h" #include "sound/volt_reg.h" #include "sound/wave.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp index 7417c5120ec..4fc062d6d21 100644 --- a/src/mame/drivers/homerun.cpp +++ b/src/mame/drivers/homerun.cpp @@ -51,11 +51,13 @@ Notes: */ #include "emu.h" +#include "includes/homerun.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/2203intf.h" #include "sound/samples.h" -#include "includes/homerun.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index fe2c4cb8242..880bf285b71 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -22,6 +22,7 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class homez80_state : public driver_device diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index 7ed25be4a93..4f86929cf3c 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -325,6 +325,8 @@ #include "video/voodoo.h" #include "video/k037122.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class hornet_state : public driver_device diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp index 776c2635caf..1dd41f02888 100644 --- a/src/mame/drivers/hotblock.cpp +++ b/src/mame/drivers/hotblock.cpp @@ -41,6 +41,9 @@ so it could be by them instead #include "emu.h" #include "cpu/i86/i86.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + class hotblock_state : public driver_device { diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp index 3819bf68296..4ff5e2d339e 100644 --- a/src/mame/drivers/hotstuff.cpp +++ b/src/mame/drivers/hotstuff.cpp @@ -4,6 +4,7 @@ #include "emu.h" #include "cpu/m68000/m68000.h" +#include "screen.h" class hotstuff_state : public driver_device diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp index 4cbe85a3f35..4737c674b71 100644 --- a/src/mame/drivers/hp16500.cpp +++ b/src/mame/drivers/hp16500.cpp @@ -49,8 +49,10 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#include "video/mc6845.h" #include "machine/mc68681.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #define MAINCPU_TAG "maincpu" #define CRTC_TAG "crtc" diff --git a/src/mame/drivers/hp48.cpp b/src/mame/drivers/hp48.cpp index a49c56c8ade..545aab99639 100644 --- a/src/mame/drivers/hp48.cpp +++ b/src/mame/drivers/hp48.cpp @@ -10,9 +10,13 @@ #include "emu.h" #include "includes/hp48.h" + #include "cpu/saturn/saturn.h" #include "machine/nvram.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + /* TODO: - IR I/O port diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp index 64b00197328..23dc2dd7cf9 100644 --- a/src/mame/drivers/hp49gp.cpp +++ b/src/mame/drivers/hp49gp.cpp @@ -10,6 +10,7 @@ #include "cpu/arm7/arm7.h" #include "machine/s3c2410.h" #include "rendlay.h" +#include "screen.h" #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index 98fcc823baf..8338550fb0d 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -150,15 +150,17 @@ // #include "emu.h" +#include "bus/rs232/rs232.h" #include "cpu/hphybrid/hphybrid.h" -#include "video/i8275.h" -#include "machine/wd_fdc.h" #include "machine/74123.h" -#include "machine/rescap.h" -#include "sound/beep.h" #include "machine/com8116.h" #include "machine/i8251.h" -#include "bus/rs232/rs232.h" +#include "machine/rescap.h" +#include "machine/wd_fdc.h" +#include "sound/beep.h" +#include "video/i8275.h" +#include "screen.h" +#include "speaker.h" #define BIT_MASK(n) (1U << (n)) diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 670f038d365..3d764056aae 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -30,10 +30,15 @@ #include "emu.h" #include "includes/hp9845.h" -#include "softlist.h" + #include "bus/hp_optroms/hp_optrom.h" -#include "hp9845b.lh" + #include "render.h" +#include "softlist.h" +#include "speaker.h" + +#include "hp9845b.lh" + #define BIT_MASK(n) (1U << (n)) diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp index 774a76632e2..4334057d4d6 100644 --- a/src/mame/drivers/hp9k.cpp +++ b/src/mame/drivers/hp9k.cpp @@ -42,6 +42,7 @@ TODO: boot tests fail #include "video/mc6845.h" #include "machine/terminal.h" //#include "machine/ins8250.h" +#include "screen.h" #define HP9816_CHDIMX 8 #define HP9816_CHDIMY 16 diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index e43b4cfe9cd..1f2db5192c5 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -50,6 +50,7 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/6840ptm.h" +#include "screen.h" #define MAINCPU_TAG "maincpu" #define PTM6840_TAG "ptm" diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp index 292f009cbf4..188297ca4a5 100644 --- a/src/mame/drivers/hprot1.cpp +++ b/src/mame/drivers/hprot1.cpp @@ -57,9 +57,11 @@ Infinite loop is reached at address 0x7699 #include "emu.h" #include "cpu/mcs51/mcs51.h" +#include "sound/spkrdev.h" #include "video/hd44780.h" -#include "sound/speaker.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class hprot1_state : public driver_device { diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp index fe64583f3fc..60eb7e4ad31 100644 --- a/src/mame/drivers/huebler.cpp +++ b/src/mame/drivers/huebler.cpp @@ -22,6 +22,7 @@ #include "emu.h" #include "includes/huebler.h" +#include "screen.h" /* Keyboard */ diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp index 1657975efd0..fa4c0713aad 100644 --- a/src/mame/drivers/hunter2.cpp +++ b/src/mame/drivers/hunter2.cpp @@ -21,15 +21,18 @@ ****************************************************************************/ #include "emu.h" +#include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "video/hd61830.h" +#include "machine/bankdev.h" #include "machine/mm58274c.h" -#include "rendlay.h" -#include "sound/speaker.h" #include "machine/nsc810.h" -#include "bus/rs232/rs232.h" #include "machine/nvram.h" -#include "machine/bankdev.h" +#include "sound/spkrdev.h" +#include "video/hd61830.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" + class hunter2_state : public driver_device { diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index a13120f1e67..c88cfec5542 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -65,6 +65,8 @@ To Do: #include "machine/gen_latch.h" #include "sound/2203intf.h" #include "video/kan_pand.h" +#include "screen.h" +#include "speaker.h" @@ -89,7 +91,7 @@ public: m_soundlatch(*this, "soundlatch"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram") - { } + { } /* Devices */ required_device m_mastercpu; diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp index 1b687435454..6243512b079 100644 --- a/src/mame/drivers/hx20.cpp +++ b/src/mame/drivers/hx20.cpp @@ -28,7 +28,9 @@ #include "emu.h" #include "includes/hx20.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/hyhoo.cpp b/src/mame/drivers/hyhoo.cpp index 270e7285daa..9b5770f3682 100644 --- a/src/mame/drivers/hyhoo.cpp +++ b/src/mame/drivers/hyhoo.cpp @@ -25,11 +25,13 @@ Memo: #include "emu.h" #include "includes/hyhoo.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" static ADDRESS_MAP_START( hyhoo_map, AS_PROGRAM, 8, hyhoo_state ) diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index 6e8ba37bb1e..d8d616d9bb1 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -54,6 +54,7 @@ #include "emu.h" #include "cpu/score/score.h" +#include "screen.h" #define LOG_SPG290_REGISTER_ACCESS (1) diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp index dd97af0d79c..b96ef7ed5ed 100644 --- a/src/mame/drivers/hyperspt.cpp +++ b/src/mame/drivers/hyperspt.cpp @@ -9,10 +9,11 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz) ***************************************************************************/ #include "emu.h" -#include "includes/konamipt.h" #include "includes/hyperspt.h" -#include "audio/trackfld.h" +#include "includes/konamipt.h" #include "audio/hyprolyb.h" +#include "audio/trackfld.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" @@ -23,6 +24,9 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz) #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + void hyperspt_state::machine_start() { diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp index e7bd0b1b34a..13c90e45ecd 100644 --- a/src/mame/drivers/hyprduel.cpp +++ b/src/mame/drivers/hyprduel.cpp @@ -37,11 +37,15 @@ fix comms so it boots, it's a bit of a hack for hyperduel at the moment ;-) ***************************************************************************/ #include "emu.h" +#include "includes/hyprduel.h" + #include "cpu/m68000/m68000.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" +#include "sound/ym2151.h" #include "sound/ym2413.h" -#include "includes/hyprduel.h" + +#include "speaker.h" + /*************************************************************************** Interrupts diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp index acedd0a64c6..1d0b7d77ca4 100644 --- a/src/mame/drivers/i7000.cpp +++ b/src/mame/drivers/i7000.cpp @@ -43,13 +43,16 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" //CPU was actually a NSC800 (Z80 compatible) #include "bus/generic/carts.h" -#include "machine/pit8253.h" +#include "cpu/z80/z80.h" //CPU was actually a NSC800 (Z80 compatible) #include "machine/i8279.h" -#include "sound/speaker.h" +#include "machine/pit8253.h" +#include "sound/spkrdev.h" #include "video/mc6845.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class i7000_state : public driver_device { diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp index 9e398633e67..d5e0e0225b0 100644 --- a/src/mame/drivers/ibm3153.cpp +++ b/src/mame/drivers/ibm3153.cpp @@ -39,6 +39,8 @@ ToDo: #include "emu.h" #include "cpu/mcs51/mcs51.h" +#include "screen.h" + class ibm3153_state : public driver_device { diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index 1618a0a5af4..97b3cd07d45 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -95,6 +95,8 @@ Displaywriter System Manual S544-2023-0 (?) -- mentioned in US patents 4648071 a //nclude "machine/ibm6580_fdc.h" #include "machine/upd765.h" +#include "screen.h" + #include "ibm6580.lh" diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 5facc666246..de7382b4a2d 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -1,28 +1,32 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol #include "emu.h" + #include "cpu/i86/i86.h" -#include "sound/sn76496.h" -#include "sound/speaker.h" -#include "video/pc_t1t.h" -#include "machine/ins8250.h" +#include "imagedev/cassette.h" #include "machine/i8255.h" +#include "machine/ins8250.h" +#include "machine/pc_fdc.h" +#include "machine/pc_lpt.h" +#include "machine/pckeybrd.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" -#include "machine/pckeybrd.h" -#include "machine/pc_lpt.h" -#include "machine/pc_fdc.h" -#include "bus/rs232/rs232.h" -#include "bus/rs232/ser_mouse.h" -#include "bus/pc_joy/pc_joy.h" -#include "bus/isa/fdc.h" -#include "imagedev/cassette.h" +#include "sound/sn76496.h" +#include "sound/spkrdev.h" +#include "video/pc_t1t.h" -#include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "bus/isa/fdc.h" +#include "bus/pc_joy/pc_joy.h" +#include "bus/rs232/rs232.h" +#include "bus/rs232/ser_mouse.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class pcjr_state : public driver_device { diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp index 2481a5a6521..240fce9f9fa 100644 --- a/src/mame/drivers/icatel.cpp +++ b/src/mame/drivers/icatel.cpp @@ -18,11 +18,15 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/mcs51/mcs51.h" #include "video/hd44780.h" //#include "sound/speaker.h" -#include "rendlay.h" + #include "debugger.h" +#include "rendlay.h" +#include "screen.h" + class icatel_state : public driver_device { diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp index 0fb674c3e0e..76320a23b22 100644 --- a/src/mame/drivers/ice_bozopail.cpp +++ b/src/mame/drivers/ice_bozopail.cpp @@ -18,6 +18,7 @@ http://www.highwaygames.com/arcade-machines/bozo-s-grand-prize-game-6751/ */ #include "emu.h" +#include "speaker.h" class ice_bozopail : public driver_device { diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp index 2a4087b180a..4071226bf82 100644 --- a/src/mame/drivers/icecold.cpp +++ b/src/mame/drivers/icecold.cpp @@ -11,8 +11,11 @@ #include "machine/6821pia.h" #include "machine/i8279.h" #include "sound/ay8910.h" +#include "speaker.h" + #include "icecold.lh" + class icecold_state : public driver_device { public: diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp index 5b6d3dcaa08..a73da32455d 100644 --- a/src/mame/drivers/ichiban.cpp +++ b/src/mame/drivers/ichiban.cpp @@ -36,11 +36,13 @@ HSync - 15.510kHz ***************************************************************************/ - #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_18_432MHz @@ -48,8 +50,8 @@ class ichibanjyan_state : public driver_device { public: ichibanjyan_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") { } // devices diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp index eb88a57cf5b..d297f837a2c 100644 --- a/src/mame/drivers/idsa.cpp +++ b/src/mame/drivers/idsa.cpp @@ -27,10 +27,13 @@ ToDO: #include "emu.h" #include "machine/genpin.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/sp0256.h" #include "machine/clock.h" +#include "speaker.h" + class idsa_state : public genpin_class { diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp index cc247f67c2f..ac4bb501d65 100644 --- a/src/mame/drivers/ie15.cpp +++ b/src/mame/drivers/ie15.cpp @@ -13,13 +13,17 @@ #include "emu.h" +#include "machine/ie15_kbd.h" #include "bus/rs232/rs232.h" #include "cpu/ie15/ie15.h" -#include "machine/ie15_kbd.h" #include "sound/beep.h" +#include "screen.h" +#include "speaker.h" + #include "ie15.lh" + #define SCREEN_PAGE (80*48) #define IE_TRUE 0x80 diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp index 4b93ffd07f1..ddb34e7d184 100644 --- a/src/mame/drivers/if800.cpp +++ b/src/mame/drivers/if800.cpp @@ -11,6 +11,7 @@ #include "cpu/i86/i86.h" #include "machine/pic8259.h" #include "video/upd7220.h" +#include "screen.h" class if800_state : public driver_device diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index f10f8165918..21709d53c71 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -34,6 +34,9 @@ Year Game Manufacturer Notes #include "sound/ym2413.h" #include "sound/okim6295.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + class igs009_state : public driver_device { diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index b86d6272d62..d9d350a29a0 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -70,6 +70,8 @@ Notes: #include "sound/3812intf.h" #include "sound/ics2115.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" struct blitter_t diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index e3ee18a5867..a175eaa785f 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -45,6 +45,7 @@ Notes: ************************************************************************************************************/ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "cpu/z180/z180.h" #include "machine/i8255.h" @@ -55,6 +56,10 @@ Notes: #include "machine/ticket.h" #include "video/igs017_igs031.h" +#include "screen.h" +#include "speaker.h" + + class igs017_state : public driver_device { public: diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp index 3e01b2fe2a5..cad0ea39f1a 100644 --- a/src/mame/drivers/igs_fear.cpp +++ b/src/mame/drivers/igs_fear.cpp @@ -7,6 +7,8 @@ #include "machine/nvram.h" #include "machine/pgmcrypt.h" #include "sound/ics2115.h" +#include "screen.h" +#include "speaker.h" class igs_fear_state : public driver_device diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp index 2c1d9e053e6..0a8d950c17f 100644 --- a/src/mame/drivers/igs_m027.cpp +++ b/src/mame/drivers/igs_m027.cpp @@ -27,6 +27,7 @@ #include "machine/nvram.h" #include "machine/pgmcrypt.h" #include "video/igs017_igs031.h" +#include "screen.h" class igs_m027_state : public driver_device { diff --git a/src/mame/drivers/igs_m036.cpp b/src/mame/drivers/igs_m036.cpp index bd26fda4433..c9759711520 100644 --- a/src/mame/drivers/igs_m036.cpp +++ b/src/mame/drivers/igs_m036.cpp @@ -61,6 +61,7 @@ check more info and photo from cjdh2.zip!!! #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "machine/igs036crypt.h" +#include "screen.h" class igs_m036_state : public driver_device diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index 532526dd575..5597e6280b2 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -64,15 +64,19 @@ FIX: PK Tetris have an input named AMUSE which I couldn't map. Maybe it is *****************************************************************************/ -#define VERBOSE 0 - #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ym2413.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + #include "igspoker.lh" +#define VERBOSE 0 + + class igspoker_state : public driver_device { public: diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp index 3b289da1a2f..4ed29121a72 100644 --- a/src/mame/drivers/ikki.cpp +++ b/src/mame/drivers/ikki.cpp @@ -15,9 +15,11 @@ TODO: *****************************************************************************/ #include "emu.h" +#include "includes/ikki.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/ikki.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index d515f81da33..306c69a76f8 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -89,6 +89,8 @@ #include "emu.h" #include "includes/imds2.h" +#include "screen.h" +#include "speaker.h" // CPU oscillator of IPC board: 8 MHz #define IPC_XTAL_Y2 XTAL_8MHz diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp index d1ec0167b0b..206390450ff 100644 --- a/src/mame/drivers/imolagp.cpp +++ b/src/mame/drivers/imolagp.cpp @@ -83,6 +83,8 @@ www.andys-arcade.com #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" #include "imolagp.lh" diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp index 186aa73e39f..999faa5ca1e 100644 --- a/src/mame/drivers/inder.cpp +++ b/src/mame/drivers/inder.cpp @@ -30,15 +30,19 @@ #include "emu.h" #include "machine/genpin.h" + #include "cpu/z80/z80.h" +#include "machine/74157.h" +#include "machine/7474.h" #include "machine/i8255.h" -#include "sound/sn76496.h" #include "sound/ay8910.h" #include "sound/msm5205.h" -#include "machine/7474.h" -#include "machine/74157.h" +#include "sound/sn76496.h" +#include "speaker.h" + #include "inder.lh" + class inder_state : public genpin_class { public: diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index cad8d597283..cc8e0b9322e 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -19,14 +19,16 @@ \*********************************************************************/ #include "emu.h" +#include "bus/scsi/scsi.h" +#include "bus/scsi/scsicd.h" #include "cpu/mips/mips3.h" #include "cpu/mips/r3000.h" #include "machine/8530scc.h" -#include "machine/sgi.h" #include "machine/eepromser.h" -#include "bus/scsi/scsi.h" -#include "bus/scsi/scsicd.h" +#include "machine/sgi.h" #include "machine/wd33c93.h" +#include "screen.h" +#include "speaker.h" class indigo_state : public driver_device { diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index d5c0270a1a5..e138aca954a 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -41,23 +41,25 @@ \*********************************************************************/ #include "emu.h" -#include "cpu/mips/mips3.h" -#include "sound/cdda.h" -#include "machine/sgi.h" -#include "machine/pckeybrd.h" -#include "machine/pc_lpt.h" -#include "machine/8042kbdc.h" -#include "machine/pit8253.h" -#include "video/newport.h" -#include "sound/dac.h" -#include "sound/volt_reg.h" +#include "bus/rs232/rs232.h" #include "bus/scsi/scsi.h" #include "bus/scsi/scsicd.h" #include "bus/scsi/scsihd.h" -#include "machine/wd33c93.h" +#include "cpu/mips/mips3.h" +#include "machine/8042kbdc.h" #include "machine/ds1386.h" +#include "machine/pc_lpt.h" +#include "machine/pckeybrd.h" +#include "machine/pit8253.h" +#include "machine/sgi.h" +#include "machine/wd33c93.h" #include "machine/z80scc.h" -#include "bus/rs232/rs232.h" +#include "sound/cdda.h" +#include "sound/dac.h" +#include "sound/volt_reg.h" +#include "video/newport.h" +#include "screen.h" +#include "speaker.h" #define SCC_TAG "scc" #define PI1_TAG "pi1" @@ -151,8 +153,8 @@ public: : ioc2_device(mconfig, type, name, tag, owner, clock, shortname, source, 0x20) { } }; -const device_type SGI_IOC2_GUINNESS = &device_creator; -const device_type SGI_IOC2_FULL_HOUSE = &device_creator; +const device_type SGI_IOC2_GUINNESS = device_creator; +const device_type SGI_IOC2_FULL_HOUSE = device_creator; ioc2_guinness_device::ioc2_guinness_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ioc2_guinness_device(mconfig, SGI_IOC2_GUINNESS, "SGI IOC2 (Guinness)", tag, owner, clock, "ioc2g", __FILE__) diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index 29c77169dd7..c2af4a3452a 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -43,12 +43,16 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/s2650/s2650.h" -#include "imagedev/snapquik.h" #include "imagedev/cassette.h" +#include "imagedev/snapquik.h" #include "sound/wave.h" +#include "speaker.h" + #include "instruct.lh" + class instruct_state : public driver_device { public: diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp index 6da7f894e3f..3a09bff57e0 100644 --- a/src/mame/drivers/interact.cpp +++ b/src/mame/drivers/interact.cpp @@ -51,16 +51,18 @@ /* Mapping for joystick see hec2hrp.c*/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/hec2hrp.h" + #include "cpu/i8085/i8085.h" -#include "imagedev/cassette.h" +#include "cpu/z80/z80.h" #include "formats/hect_tap.h" +#include "imagedev/cassette.h" #include "imagedev/printer.h" -#include "sound/wave.h" /* for K7 sound*/ -#include "sound/discrete.h" /* for 1 Bit sound*/ #include "machine/upd765.h" /* for floppy disc controller */ +#include "sound/discrete.h" /* for 1 Bit sound*/ +#include "sound/wave.h" /* for K7 sound*/ +#include "screen.h" #include "softlist.h" -#include "includes/hec2hrp.h" class interact_state : public hec2hrp_state diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp index 3c52f82fe77..69d993bf9e9 100644 --- a/src/mame/drivers/intrscti.cpp +++ b/src/mame/drivers/intrscti.cpp @@ -15,6 +15,7 @@ I've not had a chance to wire up the board yet, but it might be possible to writ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class intrscti_state : public driver_device diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp index ec0a75f73b1..12834066b12 100644 --- a/src/mame/drivers/intv.cpp +++ b/src/mame/drivers/intv.cpp @@ -51,12 +51,15 @@ RO-3-9506 = 8KiB (4Kiw) self decoding address mask rom with external address dec #include "emu.h" +#include "includes/intv.h" + #include "cpu/m6502/m6502.h" #include "cpu/cp1610/cp1610.h" -#include "video/tms9927.h" -#include "includes/intv.h" #include "sound/ay8910.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #ifndef VERBOSE #ifdef MAME_DEBUG diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp index 80ba8069177..fcbd860299e 100644 --- a/src/mame/drivers/inufuku.cpp +++ b/src/mame/drivers/inufuku.cpp @@ -73,12 +73,14 @@ TODO: ******************************************************************************/ #include "emu.h" +#include "includes/inufuku.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/2610intf.h" -#include "video/vsystem_spr.h" -#include "includes/inufuku.h" +#include "screen.h" +#include "speaker.h" /****************************************************************************** diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp index 20f755cc13d..7bec200f66f 100644 --- a/src/mame/drivers/invqix.cpp +++ b/src/mame/drivers/invqix.cpp @@ -122,6 +122,8 @@ as well as Up Right, Cocktail or Flip Screen from the service menu. #include "cpu/h8/h8s2357.h" #include "sound/okim9810.h" #include "machine/eepromser.h" +#include "screen.h" +#include "speaker.h" class invqix_state : public driver_device { diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 7b3df48d8cc..102050d1ddc 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -12,6 +12,8 @@ #include "cpu/i8085/i8085.h" #include "video/i8275.h" #include "machine/keyboard.h" +#include "screen.h" + class ipds_state : public driver_device { diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp index 66e946bbdb5..2e57b3bfaf9 100644 --- a/src/mame/drivers/iq151.cpp +++ b/src/mame/drivers/iq151.cpp @@ -44,11 +44,12 @@ ToDo: ****************************************************************************/ #include "emu.h" + #include "cpu/i8085/i8085.h" -#include "machine/pic8259.h" -#include "machine/i8255.h" -#include "sound/speaker.h" #include "imagedev/cassette.h" +#include "machine/i8255.h" +#include "machine/pic8259.h" +#include "sound/spkrdev.h" // cartridge slot #include "bus/iq151/iq151.h" @@ -61,7 +62,10 @@ ToDo: #include "bus/iq151/video32.h" #include "bus/iq151/video64.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class iq151_state : public driver_device { diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp index 8f2fbb9d95a..843c582b3ce 100644 --- a/src/mame/drivers/iqblock.cpp +++ b/src/mame/drivers/iqblock.cpp @@ -52,11 +52,14 @@ Grndtour: ***************************************************************************/ #include "emu.h" +#include "includes/iqblock.h" + #include "cpu/z80/z80.h" #include "cpu/z180/z180.h" #include "machine/i8255.h" -#include "includes/iqblock.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(iqblock_state::iqblock_prot_w) diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp index 2f5142791a9..17d9752d6d3 100644 --- a/src/mame/drivers/irisha.cpp +++ b/src/mame/drivers/irisha.cpp @@ -18,11 +18,13 @@ #include "emu.h" #include "cpu/i8085/i8085.h" +#include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" -#include "machine/i8251.h" -#include "sound/speaker.h" +#include "machine/pit8253.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" class irisha_state : public driver_device { diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp index 0615ecd80a2..a95673ab6c2 100644 --- a/src/mame/drivers/irobot.cpp +++ b/src/mame/drivers/irobot.cpp @@ -80,10 +80,11 @@ ****************************************************************************/ #include "emu.h" +#include "includes/irobot.h" #include "cpu/m6809/m6809.h" #include "sound/pokey.h" #include "machine/nvram.h" -#include "includes/irobot.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_12_096MHz #define VIDEO_CLOCK XTAL_20MHz diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 3289e1b7e83..3aa0484b5e4 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -9,12 +9,16 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/ironhors.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/discrete.h" -#include "includes/konamipt.h" -#include "includes/ironhors.h" +#include "screen.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp index ffc9a63c37d..4a273d6637c 100644 --- a/src/mame/drivers/istellar.cpp +++ b/src/mame/drivers/istellar.cpp @@ -23,8 +23,9 @@ Todo: #include "emu.h" #include "cpu/z80/z80.h" -#include "render.h" #include "machine/ldv1000.h" +#include "render.h" +#include "speaker.h" class istellar_state : public driver_device diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp index a304b71a7f3..9848869264d 100644 --- a/src/mame/drivers/istrebiteli.cpp +++ b/src/mame/drivers/istrebiteli.cpp @@ -24,6 +24,8 @@ #include "emu.h" #include "cpu/i8085/i8085.h" #include "machine/i8255.h" +#include "screen.h" +#include "speaker.h" #define I8080_TAG "maincpu" @@ -58,7 +60,7 @@ extern const device_type ISTREBITELI_SOUND; ////////////////////////////////////////////////////////////// -const device_type ISTREBITELI_SOUND = &device_creator; +const device_type ISTREBITELI_SOUND = device_creator; istrebiteli_sound_device::istrebiteli_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ISTREBITELI_SOUND, "Istrebiteli Sound", tag, owner, clock, "istrebiteli_sound", __FILE__), diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp index 6d67650daae..4bef385c3ab 100644 --- a/src/mame/drivers/iteagle.cpp +++ b/src/mame/drivers/iteagle.cpp @@ -110,6 +110,7 @@ www.multitech.com #include "sound/es1373.h" #include "machine/iteagle_fpga.h" #include "machine/pci-ide.h" +#include "screen.h" //************************************* diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp index ad5e10a3241..9aa1288a2f9 100644 --- a/src/mame/drivers/itech32.cpp +++ b/src/mame/drivers/itech32.cpp @@ -351,17 +351,20 @@ Notes: ****************************************************************************/ #include "emu.h" -#include "cpu/tms32031/tms32031.h" +#include "includes/itech32.h" + #include "cpu/m6800/m6800.h" -#include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" +#include "cpu/m6809/m6809.h" +#include "cpu/tms32031/tms32031.h" #include "machine/6522via.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "machine/timekpr.h" #include "machine/watchdog.h" -#include "includes/itech32.h" #include "sound/es5506.h" -#include "machine/timekpr.h" + +#include "speaker.h" #define FULL_LOGGING 0 diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index d6852ec9661..4ceb96e8ef3 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -497,19 +497,22 @@ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/itech8.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" -#include "machine/6821pia.h" +#include "cpu/z80/z80.h" #include "machine/6522via.h" +#include "machine/6821pia.h" #include "machine/nvram.h" -#include "includes/itech8.h" #include "sound/2203intf.h" #include "sound/2608intf.h" #include "sound/3812intf.h" #include "sound/okim6295.h" +#include "speaker.h" + #define FULL_LOGGING 0 diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp index 2df7f95c7d9..698055beeff 100644 --- a/src/mame/drivers/itgambl2.cpp +++ b/src/mame/drivers/itgambl2.cpp @@ -53,12 +53,14 @@ ************************************************************************/ -#define MAIN_CLOCK XTAL_16MHz -#define SND_CLOCK XTAL_14_31818MHz - #include "emu.h" #include "cpu/h8/h83337.h" #include "sound/upd7759.h" +#include "screen.h" +#include "speaker.h" + +#define MAIN_CLOCK XTAL_16MHz +#define SND_CLOCK XTAL_14_31818MHz class itgambl2_state : public driver_device diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp index 95a592a6f6f..a7450add868 100644 --- a/src/mame/drivers/itgambl3.cpp +++ b/src/mame/drivers/itgambl3.cpp @@ -40,11 +40,13 @@ ************************************************************************/ -#define MAIN_CLOCK XTAL_16MHz - #include "emu.h" #include "cpu/h8/h83048.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + +#define MAIN_CLOCK XTAL_16MHz class itgambl3_state : public driver_device diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp index d87374c380d..968d49e713f 100644 --- a/src/mame/drivers/itgamble.cpp +++ b/src/mame/drivers/itgamble.cpp @@ -47,6 +47,13 @@ *******************************************************************/ +#include "emu.h" +#include "cpu/h8/h83048.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + + #define MAIN_CLOCK XTAL_30MHz #define SND_CLOCK XTAL_1MHz @@ -56,11 +63,6 @@ #define EJOLLYX5_MAIN_CLOCK XTAL_16MHz -#include "emu.h" -#include "cpu/h8/h83048.h" -#include "sound/okim6295.h" - - class itgamble_state : public driver_device { public: diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index ab05c502fb5..46e1ae388b8 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -191,14 +191,19 @@ Beeper Circuit, all ICs shown: #include "emu.h" +#include "cpu/mcs48/mcs48.h" //Keyboard MCU ... talks to the 8278 on the keyboard circuit #include "cpu/z80/z80.h" -#include "machine/wd_fdc.h" #include "machine/bankdev.h" #include "machine/ram.h" -#include "formats/itt3030_dsk.h" -#include "video/tms9927.h" //Display hardware +#include "machine/wd_fdc.h" #include "sound/beep.h" -#include "cpu/mcs48/mcs48.h" //Keyboard MCU ... talks to the 8278 on the keyboard circuit +#include "video/tms9927.h" //Display hardware + +#include "screen.h" +#include "speaker.h" + +#include "formats/itt3030_dsk.h" + #define MAIN_CLOCK XTAL_4.194MHz diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp index fa3c4e70489..d941f12fd22 100644 --- a/src/mame/drivers/jack.cpp +++ b/src/mame/drivers/jack.cpp @@ -81,9 +81,12 @@ Stephh's Notes: ***************************************************************************/ #include "emu.h" +#include "includes/jack.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/jack.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp index 9b768ada806..ecb2710a4ed 100644 --- a/src/mame/drivers/jackal.cpp +++ b/src/mame/drivers/jackal.cpp @@ -70,11 +70,14 @@ Address Dir Data Description ***************************************************************************/ #include "emu.h" +#include "includes/jackal.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/jackal.h" -#include "includes/konamipt.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index 98a7b1bf3c7..a9d5fb3888f 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -48,6 +48,8 @@ Note #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" class jackie_state : public driver_device diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp index c0257234633..8432bea81ee 100644 --- a/src/mame/drivers/jackpool.cpp +++ b/src/mame/drivers/jackpool.cpp @@ -19,8 +19,10 @@ TODO: #include "emu.h" #include "cpu/m68000/m68000.h" -#include "sound/okim6295.h" #include "machine/eepromser.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class jackpool_state : public driver_device diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index e1317a70ce2..f909f68a59e 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -348,6 +348,7 @@ Notes: #include "sound/volt_reg.h" #include "cdrom.h" #include "softlist.h" +#include "speaker.h" #define COJAG_CLOCK XTAL_52MHz #define R3000_CLOCK XTAL_40MHz @@ -393,7 +394,7 @@ public: } }; -const device_type COJAG_HARDDISK = &device_creator; +const device_type COJAG_HARDDISK = device_creator; SLOT_INTERFACE_START(cojag_devices) SLOT_INTERFACE("hdd", COJAG_HARDDISK) diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp index 60164d7e823..97583d59fb5 100644 --- a/src/mame/drivers/jailbrek.cpp +++ b/src/mame/drivers/jailbrek.cpp @@ -86,12 +86,16 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/jailbrek.h" +#include "includes/konamipt.h" #include "machine/konami1.h" + #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "sound/sn76496.h" -#include "includes/konamipt.h" -#include "includes/jailbrek.h" + +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(jailbrek_state::ctrl_w) diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp index 5e9bd278174..74582939bb9 100644 --- a/src/mame/drivers/jalmah.cpp +++ b/src/mame/drivers/jalmah.cpp @@ -118,6 +118,8 @@ OSC: 12.000MHz #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class jalmah_state : public driver_device diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index 37331c61d26..8615d4a1e69 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -26,15 +26,17 @@ $c088-$c095 player tiles *******************************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m6800/m6800.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/hc55516.h" #include "sound/msm5205.h" -#include "video/resnet.h" #include "video/jangou_blitter.h" -#include "machine/nvram.h" +#include "video/resnet.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_19_968MHz diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index d94ebd1ae22..260874eaab0 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -145,8 +145,6 @@ ***************************************************************************/ -#define MASTER_CLOCK XTAL_2_5MHz - #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" @@ -154,8 +152,12 @@ #include "machine/i8255.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "jankenmn.lh" +#define MASTER_CLOCK XTAL_2_5MHz + class jankenmn_state : public driver_device { diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index b115bb299e2..a77895515d8 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -98,6 +98,9 @@ dumped by sayu #include "cpu/z80/z80.h" #include "sound/sn76496.h" #include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp index e24d28f5be2..5da50b63809 100644 --- a/src/mame/drivers/jchan.cpp +++ b/src/mame/drivers/jchan.cpp @@ -155,13 +155,15 @@ JC-301-00 W11 9510K7059 23C16000 U85 #include "emu.h" #include "cpu/m68000/m68000.h" +#include "machine/eepromser.h" #include "machine/nvram.h" +#include "machine/watchdog.h" #include "sound/ymz280b.h" #include "video/sknsspr.h" -#include "machine/eepromser.h" -#include "machine/watchdog.h" #include "video/kaneko_tmap.h" #include "machine/kaneko_toybox.h" +#include "screen.h" +#include "speaker.h" class jchan_state : public driver_device { @@ -180,7 +182,7 @@ public: m_sprregs_2(*this, "sprregs_2"), m_mainsub_shared_ram(*this, "mainsub_shared"), m_ctrl(*this, "ctrl") - { } + { } required_device m_maincpu; required_device m_subcpu; diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index b25f1491c73..e23e859bc21 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -97,10 +97,11 @@ To do: #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" -#include "sound/okim6295.h" +#include "machine/nvram.h" #include "machine/st0016.h" +#include "sound/okim6295.h" #include "video/st0020.h" -#include "machine/nvram.h" +#include "speaker.h" class darkhors_state : public driver_device { diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp index c87ae070ac9..ed9e8efc485 100644 --- a/src/mame/drivers/jeutel.cpp +++ b/src/mame/drivers/jeutel.cpp @@ -17,12 +17,16 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/ay8910.h" #include "sound/tms5110.h" +#include "speaker.h" + #include "jeutel.lh" + class jeutel_state : public genpin_class { public: diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp index d9b0470b771..f31a9449c90 100644 --- a/src/mame/drivers/joctronic.cpp +++ b/src/mame/drivers/joctronic.cpp @@ -11,6 +11,8 @@ #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/msm5205.h" +#include "speaker.h" + class joctronic_state : public driver_device { @@ -22,7 +24,7 @@ public: , m_oki(*this, "oki") , m_adpcm_select(*this, "adpcm_select") , m_soundbank(*this, "soundbank") - { } + { } DECLARE_READ8_MEMBER(csin_r); DECLARE_WRITE8_MEMBER(control_port_w); diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp index 304641d669d..99113017d09 100644 --- a/src/mame/drivers/jokrwild.cpp +++ b/src/mame/drivers/jokrwild.cpp @@ -71,13 +71,14 @@ *******************************************************************************/ -#define MASTER_CLOCK XTAL_8MHz /* guess */ - #include "emu.h" #include "cpu/m6809/m6809.h" #include "video/mc6845.h" #include "machine/6821pia.h" #include "machine/nvram.h" +#include "screen.h" + +#define MASTER_CLOCK XTAL_8MHz /* guess */ class jokrwild_state : public driver_device diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index c3db52b8913..7cc7832d790 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -120,6 +120,8 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class jollyjgr_state : public driver_device diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp index eefafe13c89..7370947a73d 100644 --- a/src/mame/drivers/jongkyo.cpp +++ b/src/mame/drivers/jongkyo.cpp @@ -28,8 +28,10 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/segacrpt_device.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" #define JONGKYO_CLOCK 18432000 diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp index 9a9ee43fa2b..a3075fefd59 100644 --- a/src/mame/drivers/jonos.cpp +++ b/src/mame/drivers/jonos.cpp @@ -19,6 +19,7 @@ Data presented at 5000 will appear on screen in a dumb-terminal format. #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class jonos_state : public driver_device diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index 12a84006bed..e92b4d032f1 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -90,12 +90,14 @@ Notes: #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/tmp68301.h" -#include "machine/msm6242.h" #include "machine/eepromser.h" #include "machine/intelfsh.h" -#include "sound/ym2413.h" +#include "machine/msm6242.h" +#include "machine/tmp68301.h" #include "sound/okim6295.h" +#include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" class joystand_state : public driver_device { diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp index 05544cc96d5..d1322f61742 100644 --- a/src/mame/drivers/jp.cpp +++ b/src/mame/drivers/jp.cpp @@ -19,10 +19,14 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "speaker.h" + #include "jp.lh" + class jp_state : public genpin_class { public: diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp index 80024130d43..f513aabd29c 100644 --- a/src/mame/drivers/jpmimpct.cpp +++ b/src/mame/drivers/jpmimpct.cpp @@ -104,13 +104,16 @@ Thanks to Tony Friery and JPeMU for I/O routines and documentation. #include "emu.h" -#include "cpu/m68000/m68000.h" - #include "includes/jpmimpct.h" + +#include "cpu/m68000/m68000.h" +#include "machine/i8255.h" #include "machine/nvram.h" -#include "jpmimpct.lh" #include "video/awpvid.h" -#include "machine/i8255.h" +#include "screen.h" +#include "speaker.h" + +#include "jpmimpct.lh" /************************************* * diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp index 7986c1cdd70..b4d2a2c30b5 100644 --- a/src/mame/drivers/jpmmps.cpp +++ b/src/mame/drivers/jpmmps.cpp @@ -30,11 +30,14 @@ #include "emu.h" + #include "cpu/tms9900/tms9995.h" #include "sound/sn76496.h" #include "machine/i8255.h" #include "machine/tms9902.h" #include "machine/meters.h" +#include "speaker.h" + #include "jpmmps.lh" // MFME2MAME layouts: diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp index 7bd9562c167..df240e73caa 100644 --- a/src/mame/drivers/jpms80.cpp +++ b/src/mame/drivers/jpms80.cpp @@ -27,6 +27,8 @@ System80 is based on the SRU platform, but with more outputs and finally a separ #include "cpu/tms9900/tms9995.h" #include "sound/ay8910.h" #include "machine/tms9902.h" +#include "speaker.h" + #include "jpms80.lh" // MFME2MAME layouts: diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp index 80fc2dc3ec6..fb807e877a5 100644 --- a/src/mame/drivers/jpmsys5.cpp +++ b/src/mame/drivers/jpmsys5.cpp @@ -33,10 +33,15 @@ #include "emu.h" #include "includes/jpmsys5.h" + #include "machine/clock.h" #include "sound/saa1099.h" +#include "screen.h" +#include "speaker.h" + #include "jpmsys5.lh" + enum state { IDLE, START, DATA, STOP1, STOP2 }; /************************************* diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp index 44b8134d67e..87232a18117 100644 --- a/src/mame/drivers/jpmsys7.cpp +++ b/src/mame/drivers/jpmsys7.cpp @@ -19,18 +19,18 @@ Pluto 8: ColdFire 5475 */ - - #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/mcf5206e.h" +#include "speaker.h" + class jpmsys7_state : public driver_device { public: jpmsys7_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") { } protected: diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index b5fa3f94cc4..9276ee528af 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -15,12 +15,14 @@ #include "emu.h" #include "cpu/m6800/m6800.h" -#include "machine/6522via.h" #include "imagedev/cassette.h" -#include "sound/wave.h" -#include "sound/speaker.h" -#include "sound/beep.h" #include "imagedev/snapquik.h" +#include "machine/6522via.h" +#include "sound/beep.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" class jr100_state : public driver_device diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp index 6b5a3315443..21d92e7903b 100644 --- a/src/mame/drivers/jr200.cpp +++ b/src/mame/drivers/jr200.cpp @@ -20,6 +20,8 @@ #include "emu.h" #include "cpu/m6800/m6800.h" #include "sound/beep.h" +#include "screen.h" +#include "speaker.h" class jr200_state : public driver_device diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp index f0c42233d7a..7484ab4c550 100644 --- a/src/mame/drivers/jrpacman.cpp +++ b/src/mame/drivers/jrpacman.cpp @@ -101,9 +101,12 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/pacman.h" +#include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" + class jrpacman_state : public pacman_state { diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index 4e8eb6fd175..8618b25e7db 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -9,12 +9,14 @@ ****************************************************************************/ #include "emu.h" +#include "bus/centronics/ctronics.h" #include "cpu/z8/z8.h" #include "imagedev/cassette.h" -#include "bus/centronics/ctronics.h" #include "machine/ram.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" +#include "screen.h" +#include "speaker.h" #define SCREEN_TAG "screen" #define UB8830D_TAG "ub8830d" diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp index f7baa860525..79bd3f9383e 100644 --- a/src/mame/drivers/jubilee.cpp +++ b/src/mame/drivers/jubilee.cpp @@ -193,14 +193,15 @@ ****************************************************************************************/ -#define MASTER_CLOCK XTAL_6MHz /* confirmed */ -#define CPU_CLOCK (MASTER_CLOCK / 2) /* guess */ -#define CRTC_CLOCK (MASTER_CLOCK / 8) /* guess */ - #include "emu.h" #include "cpu/tms9900/tms9980a.h" -#include "video/mc6845.h" #include "machine/nvram.h" +#include "video/mc6845.h" +#include "screen.h" + +#define MASTER_CLOCK XTAL_6MHz /* confirmed */ +#define CPU_CLOCK (MASTER_CLOCK / 2) /* guess */ +#define CRTC_CLOCK (MASTER_CLOCK / 8) /* guess */ class jubilee_state : public driver_device diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp index 828a35afea1..a017084154a 100644 --- a/src/mame/drivers/juicebox.cpp +++ b/src/mame/drivers/juicebox.cpp @@ -15,7 +15,10 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + //#define JUICEBOX_ENTER_DEBUG_MENU //#define JUICEBOX_DISPLAY_ROM_ID diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp index 08db2988447..078fc267c60 100644 --- a/src/mame/drivers/jungleyo.cpp +++ b/src/mame/drivers/jungleyo.cpp @@ -40,6 +40,8 @@ PCB silkscreened: "MADE IN TAIWAN YONSHI PCB NO-006F" #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class jungleyo_state : public driver_device diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp index 6bde5b95a91..07652b29703 100644 --- a/src/mame/drivers/junofrst.cpp +++ b/src/mame/drivers/junofrst.cpp @@ -80,8 +80,9 @@ Blitter source graphics #include "emu.h" -#include "includes/konamipt.h" #include "includes/tutankhm.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" @@ -92,6 +93,8 @@ Blitter source graphics #include "sound/dac.h" #include "sound/flt_rc.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" class junofrst_state : public tutankhm_state diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 456bef25b12..bbb555bfd8b 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -44,7 +44,6 @@ Ports: #include "emu.h" #include "cpu/z80/z80.h" -#include "formats/ace_tap.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "bus/centronics/ctronics.h" @@ -53,9 +52,15 @@ Ports: #include "machine/z80pio.h" #include "sound/ay8910.h" #include "sound/sp0256.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/ace_tap.h" + #define Z80_TAG "z0" #define AY8910_TAG "ay8910" diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp index 0f9803581cb..fa8e63511d8 100644 --- a/src/mame/drivers/jupiter.cpp +++ b/src/mame/drivers/jupiter.cpp @@ -19,13 +19,16 @@ ToDo: ***************************************************************************/ #include "emu.h" +#include "includes/jupiter.h" + #include "cpu/m6800/m6800.h" #include "cpu/z80/z80.h" -#include "machine/ram.h" #include "machine/keyboard.h" +#include "machine/ram.h" #include "machine/terminal.h" #include "machine/wd_fdc.h" -#include "includes/jupiter.h" + +#include "screen.h" //************************************************************************** diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp index 50420033dde..07f5393573f 100644 --- a/src/mame/drivers/k28.cpp +++ b/src/mame/drivers/k28.cpp @@ -23,6 +23,7 @@ #include "cpu/mcs48/mcs48.h" #include "machine/tms6100.h" #include "sound/votrax.h" +#include "speaker.h" #include "k28.lh" diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp index 9c137b7759e..4e8961cf462 100644 --- a/src/mame/drivers/k8915.cpp +++ b/src/mame/drivers/k8915.cpp @@ -13,6 +13,7 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/keyboard.h" +#include "screen.h" class k8915_state : public driver_device { diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index 45355963f6d..07ebbf9d49e 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -97,12 +97,15 @@ Non-Bugs (happen on real PCB) ***************************************************************************/ #include "emu.h" +#include "includes/kaneko16.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" -#include "includes/kaneko16.h" #include "machine/watchdog.h" #include "sound/ym2151.h" #include "machine/kaneko_hit.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp index 112b9cad2e2..e74f17150ba 100644 --- a/src/mame/drivers/kangaroo.cpp +++ b/src/mame/drivers/kangaroo.cpp @@ -156,19 +156,20 @@ ***************************************************************************/ #include "emu.h" +#include "includes/kangaroo.h" + #include "cpu/mb88xx/mb88xx.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" -#include "includes/kangaroo.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_10MHz - - /************************************* * * Machine init diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp index 08421318114..872a11e03c5 100644 --- a/src/mame/drivers/karnov.cpp +++ b/src/mame/drivers/karnov.cpp @@ -79,12 +79,16 @@ Stephh's notes (based on the games M68000 code and some tests) : *******************************************************************************/ #include "emu.h" +#include "includes/karnov.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "sound/2203intf.h" #include "sound/3526intf.h" -#include "includes/karnov.h" #include "cpu/mcs51/mcs51.h" +#include "screen.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp index 8c9f1ea8b4a..5da34fe0055 100644 --- a/src/mame/drivers/kas89.cpp +++ b/src/mame/drivers/kas89.cpp @@ -189,19 +189,21 @@ *************************************************************************************/ -#define MASTER_CLOCK XTAL_21_4772MHz -#define VDP_MEM 0x40000 - - #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" -#include "video/v9938.h" #include "machine/gen_latch.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/v9938.h" +#include "speaker.h" + #include "kas89.lh" +#define MASTER_CLOCK XTAL_21_4772MHz +#define VDP_MEM 0x40000 + + class kas89_state : public driver_device { public: diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index 005b1fbf314..a5d2039f6bf 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -43,9 +43,12 @@ #include "emu.h" #include "includes/kaypro.h" + #include "machine/kay_kbd.h" #include "formats/kaypro_dsk.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" READ8_MEMBER( kaypro_state::kaypro2x_87_r ) { return 0x7f; } /* to bypass unemulated HD controller */ diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index ba3fec228c2..e83ba542781 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -13,11 +13,14 @@ ******************************************************************************/ - /* Core includes */ #include "emu.h" #include "includes/kc.h" + #include "softlist.h" +#include "screen.h" +#include "speaker.h" + static ADDRESS_MAP_START(kc85_4_io, AS_IO, 8, kc85_4_state) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp index b2e93fd1571..cb925f7af52 100644 --- a/src/mame/drivers/kchamp.cpp +++ b/src/mame/drivers/kchamp.cpp @@ -66,9 +66,12 @@ IO ports and memory map changes. Dip switches differ too. #include "emu.h" #include "includes/kchamp.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" /******************** diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp index 4a4b2b60df8..f653a717aba 100644 --- a/src/mame/drivers/kickgoal.cpp +++ b/src/mame/drivers/kickgoal.cpp @@ -37,11 +37,15 @@ lev 7 : 0x7c : 0000 0000 - x */ #include "emu.h" +#include "includes/kickgoal.h" + #include "cpu/m68000/m68000.h" #include "cpu/pic16c5x/pic16c5x.h" #include "machine/eepromser.h" #include "sound/okim6295.h" -#include "includes/kickgoal.h" +#include "screen.h" +#include "speaker.h" + /************************************************************************** This table converts commands sent from the main CPU, into sample numbers diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp index ab991ca97fd..087bc841830 100644 --- a/src/mame/drivers/kingdrby.cpp +++ b/src/mame/drivers/kingdrby.cpp @@ -72,13 +72,17 @@ sg1_b.e1 4096 0x92ef3c13 D2732D *******************************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "video/mc6845.h" #include "machine/i8255.h" +#include "machine/nvram.h" +#include "sound/2203intf.h" #include "sound/ay8910.h" #include "sound/okim6295.h" -#include "sound/2203intf.h" -#include "machine/nvram.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #include "kingdrby.lh" diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp index 7ce567dafe0..52ad6cfdbca 100644 --- a/src/mame/drivers/kingobox.cpp +++ b/src/mame/drivers/kingobox.cpp @@ -19,10 +19,14 @@ Main CPU: #include "emu.h" #include "includes/kingobox.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(kingofb_state::video_interrupt_w) { diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp index 58026f44ccc..b581089475e 100644 --- a/src/mame/drivers/kingpin.cpp +++ b/src/mame/drivers/kingpin.cpp @@ -33,11 +33,12 @@ Todo: #include "emu.h" #include "cpu/z80/z80.h" -#include "video/tms9928a.h" -#include "sound/ay8910.h" #include "machine/gen_latch.h" #include "machine/i8255.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/tms9928a.h" +#include "speaker.h" class kingpin_state : public driver_device diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp index da993b6e34f..58c7bda6d7f 100644 --- a/src/mame/drivers/kinst.cpp +++ b/src/mame/drivers/kinst.cpp @@ -131,11 +131,13 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/mips/mips3.h" +#include "audio/dcs.h" + #include "cpu/adsp2100/adsp2100.h" +#include "cpu/mips/mips3.h" #include "machine/ataintf.h" #include "machine/idehd.h" -#include "audio/dcs.h" +#include "screen.h" class kinst_state : public driver_device diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp index 77dca88d1a7..f5bdbcbd1e0 100644 --- a/src/mame/drivers/klax.cpp +++ b/src/mame/drivers/klax.cpp @@ -20,13 +20,15 @@ #include "emu.h" -#include "cpu/m68000/m68000.h" -#include "machine/watchdog.h" -#include "sound/okim6295.h" #include "includes/klax.h" +#include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" +#include "machine/watchdog.h" +#include "sound/okim6295.h" #include "sound/msm5205.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp index 2343e57c5c6..39e5df12cac 100644 --- a/src/mame/drivers/kncljoe.cpp +++ b/src/mame/drivers/kncljoe.cpp @@ -28,10 +28,12 @@ Updates: ***************************************************************************/ #include "emu.h" +#include "includes/kncljoe.h" + #include "cpu/z80/z80.h" #include "cpu/m6800/m6800.h" #include "sound/sn76496.h" -#include "includes/kncljoe.h" +#include "speaker.h" WRITE8_MEMBER(kncljoe_state::sound_cmd_w) diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp index 672fdc1054b..3802e8e960b 100644 --- a/src/mame/drivers/koftball.cpp +++ b/src/mame/drivers/koftball.cpp @@ -35,6 +35,8 @@ ft5_v6_c4.u58 / #include "sound/okim6295.h" #include "sound/ym2413.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" class koftball_state : public driver_device diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp index e0806a68345..7c066b35e9c 100644 --- a/src/mame/drivers/koikoi.cpp +++ b/src/mame/drivers/koikoi.cpp @@ -42,6 +42,8 @@ to prevent disabling inputs. #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" #define KOIKOI_CRYSTAL 15468000 diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp index 70440be9a9e..522c1571306 100644 --- a/src/mame/drivers/konamigq.cpp +++ b/src/mame/drivers/konamigq.cpp @@ -69,17 +69,20 @@ */ #include "emu.h" +#include "bus/scsi/scsi.h" +#include "bus/scsi/scsihd.h" #include "cpu/m68000/m68000.h" #include "cpu/psx/psx.h" #include "cpu/tms57002/tms57002.h" -#include "video/psx.h" #include "machine/am53cf96.h" #include "machine/eepromser.h" #include "machine/mb89371.h" -#include "bus/scsi/scsi.h" -#include "bus/scsi/scsihd.h" -#include "sound/k056800.h" +#include "machine/ram.h" #include "sound/k054539.h" +#include "sound/k056800.h" +#include "video/psx.h" +#include "speaker.h" + class konamigq_state : public driver_device { diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp index 16e162e49fa..c8aa17a5015 100644 --- a/src/mame/drivers/konamigv.cpp +++ b/src/mame/drivers/konamigv.cpp @@ -122,17 +122,20 @@ Notes: */ #include "emu.h" -#include "cdrom.h" +#include "bus/scsi/scsi.h" +#include "bus/scsi/scsicd.h" #include "cpu/psx/psx.h" -#include "video/psx.h" #include "machine/am53cf96.h" #include "machine/eepromser.h" #include "machine/intelfsh.h" #include "machine/mb89371.h" -#include "bus/scsi/scsi.h" -#include "bus/scsi/scsicd.h" -#include "sound/spu.h" +#include "machine/ram.h" #include "sound/cdda.h" +#include "sound/spu.h" +#include "video/psx.h" +#include "speaker.h" +#include "cdrom.h" + class konamigv_state : public driver_device { diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index e58a55202cc..b84e5086145 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -97,14 +97,17 @@ */ #include "emu.h" +#include "includes/konamigx.h" + #include "cpu/m68000/m68000.h" -#include "cpu/z80/z80.h" #include "cpu/tms57002/tms57002.h" +#include "cpu/z80/z80.h" #include "machine/eepromser.h" -#include "sound/k056800.h" #include "sound/k054539.h" -#include "includes/konamigx.h" +#include "sound/k056800.h" #include "rendlay.h" +#include "speaker.h" + // TODO: check on PCB #define MASTER_CLOCK XTAL_24MHz diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp index 2b39ed49d0b..fb180a6874e 100644 --- a/src/mame/drivers/konamim2.cpp +++ b/src/mame/drivers/konamim2.cpp @@ -194,6 +194,7 @@ Notes: #include "imagedev/chd_cd.h" #include "machine/terminal.h" #include "softlist.h" +#include "screen.h" struct CDE_DMA { diff --git a/src/mame/drivers/konendev.cpp b/src/mame/drivers/konendev.cpp index c3c67107d41..4bbbfdc35ed 100644 --- a/src/mame/drivers/konendev.cpp +++ b/src/mame/drivers/konendev.cpp @@ -36,10 +36,12 @@ #include "emu.h" #include "cpu/powerpc/ppc.h" +#include "machine/eepromser.h" +#include "machine/nvram.h" #include "sound/ymz280b.h" #include "video/k057714.h" -#include "machine/nvram.h" -#include "machine/eepromser.h" +#include "screen.h" +#include "speaker.h" class konendev_state : public driver_device { diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index 8ae098814f7..438e046e6f5 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -24,11 +24,13 @@ Inputs: #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/gen_latch.h" #include "machine/eepromser.h" -#include "video/konami_helper.h" -#include "video/k054156_k054157_k056832.h" +#include "machine/gen_latch.h" #include "sound/ymz280b.h" +#include "video/k054156_k054157_k056832.h" +#include "video/konami_helper.h" +#include "screen.h" +#include "speaker.h" class konmedal_state : public driver_device { @@ -39,7 +41,7 @@ public: m_k056832(*this, "k056832"), m_palette(*this, "palette"), m_ymz(*this, "ymz") - { } + { } required_device m_maincpu; required_device m_k056832; diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp index 94d0004e875..e794a2fd9ad 100644 --- a/src/mame/drivers/kontest.cpp +++ b/src/mame/drivers/kontest.cpp @@ -23,6 +23,8 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_24MHz diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp index 37ef8db4194..50abe9a3b3c 100644 --- a/src/mame/drivers/kopunch.cpp +++ b/src/mame/drivers/kopunch.cpp @@ -32,9 +32,11 @@ ********************************************************/ #include "emu.h" +#include "includes/kopunch.h" + #include "cpu/i8085/i8085.h" #include "machine/i8255.h" -#include "includes/kopunch.h" +#include "screen.h" /******************************************************** diff --git a/src/mame/drivers/kramermc.cpp b/src/mame/drivers/kramermc.cpp index b6b43e9f2d3..03f0fd2d900 100644 --- a/src/mame/drivers/kramermc.cpp +++ b/src/mame/drivers/kramermc.cpp @@ -10,9 +10,12 @@ #include "emu.h" +#include "includes/kramermc.h" + #include "cpu/z80/z80.h" #include "machine/z80pio.h" -#include "includes/kramermc.h" +#include "screen.h" + static GFXDECODE_START( kramermc ) GFXDECODE_ENTRY( "gfx1", 0x0000, kramermc_charlayout, 0, 1 ) diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp index 3df2fa1911f..74e7888b7d0 100644 --- a/src/mame/drivers/kron.cpp +++ b/src/mame/drivers/kron.cpp @@ -101,6 +101,7 @@ #include "emu.h" #include "cpu/z180/z180.h" #include "machine/pckeybrd.h" +#include "screen.h" #define VERBOSE 2 diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp index fa415d74da8..8c4846940ec 100644 --- a/src/mame/drivers/ksayakyu.cpp +++ b/src/mame/drivers/ksayakyu.cpp @@ -67,10 +67,14 @@ SRAM: #include "emu.h" #include "includes/ksayakyu.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index 442515fe917..0edb5b2d609 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -358,12 +358,15 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet) #include "machine/k573msu.h" #include "machine/k573npu.h" #include "machine/mb89371.h" +#include "machine/ram.h" #include "machine/timekpr.h" #include "machine/upd4701.h" #include "sound/spu.h" #include "sound/cdda.h" #include "video/psx.h" #include "cdrom.h" +#include "screen.h" +#include "speaker.h" #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp index fda356a1cce..60e8417ef1d 100644 --- a/src/mame/drivers/kungfur.cpp +++ b/src/mame/drivers/kungfur.cpp @@ -58,8 +58,9 @@ mae(forward), migi(right), ushiro(back), hidari(left) #include "emu.h" #include "cpu/m6809/m6809.h" -#include "sound/msm5205.h" #include "machine/i8255.h" +#include "sound/msm5205.h" +#include "speaker.h" #include "kungfur.lh" diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index a0b1a5727e4..5a2fc951ae3 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -376,12 +376,13 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "machine/gen_latch.h" +#include "machine/nvram.h" +#include "machine/ticket.h" #include "sound/ay8910.h" #include "sound/msm5205.h" #include "video/v9938.h" -#include "machine/ticket.h" -#include "machine/nvram.h" -#include "machine/gen_latch.h" +#include "speaker.h" #define UNICODE_10YEN "\xC2\xA5" "10" #define UNICODE_100YEN "\xC2\xA5" "100" diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp index 4db25029c3b..22bfe9e15d7 100644 --- a/src/mame/drivers/kyocera.cpp +++ b/src/mame/drivers/kyocera.cpp @@ -69,6 +69,7 @@ #include "emu.h" #include "includes/kyocera.h" #include "softlist.h" +#include "speaker.h" /* Read/Write Handlers */ diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp index de6c30e318f..99411aa00fa 100644 --- a/src/mame/drivers/kyugo.cpp +++ b/src/mame/drivers/kyugo.cpp @@ -24,10 +24,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/kyugo.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/kyugo.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp index 9b56dd489f3..636cd9aa1e3 100644 --- a/src/mame/drivers/labyrunr.cpp +++ b/src/mame/drivers/labyrunr.cpp @@ -11,12 +11,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/labyrunr.h" +#include "includes/konamipt.h" + #include "cpu/m6809/hd6309.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/konamipt.h" -#include "includes/labyrunr.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(labyrunr_state::labyrunr_vblank_interrupt) diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp index b8d00dbd78e..21cdf5af40e 100644 --- a/src/mame/drivers/ladybug.cpp +++ b/src/mame/drivers/ladybug.cpp @@ -61,9 +61,12 @@ TODO: */ #include "emu.h" +#include "includes/ladybug.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/ladybug.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( ladybug_map, AS_PROGRAM, 8, ladybug_state ) diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp index 2fadf53adab..6f91ad613e3 100644 --- a/src/mame/drivers/ladyfrog.cpp +++ b/src/mame/drivers/ladyfrog.cpp @@ -49,9 +49,12 @@ Notes: */ #include "emu.h" +#include "includes/ladyfrog.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/ladyfrog.h" +#include "screen.h" +#include "speaker.h" READ8_MEMBER(ladyfrog_state::from_snd_r) diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp index c478f1cc07e..bd73426e89b 100644 --- a/src/mame/drivers/laser3k.cpp +++ b/src/mame/drivers/laser3k.cpp @@ -35,8 +35,10 @@ #include "machine/bankdev.h" #include "machine/ram.h" #include "machine/kb3600.h" -#include "sound/speaker.h" #include "sound/sn76496.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" enum { diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp index c079b525a74..db3f131962d 100644 --- a/src/mame/drivers/laserbas.cpp +++ b/src/mame/drivers/laserbas.cpp @@ -61,10 +61,12 @@ expected: 43 FB CC 9A D4 23 6C 01 3E <- From ROM 4 #include "emu.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" #include "machine/pit8253.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class laserbas_state : public driver_device { diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp index 049e4c0e573..db01721f61f 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -77,7 +77,6 @@ */ #include "emu.h" - #include "includes/laserbat.h" #include "cpu/m6800/m6800.h" @@ -85,6 +84,8 @@ #include "machine/clock.h" +#include "speaker.h" + WRITE8_MEMBER(laserbat_state_base::ct_io_w) { diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index 7a765e90717..9eb4608ea68 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -32,11 +32,14 @@ DIP locations verified for: #include "emu.h" #include "includes/lasso.h" + #include "cpu/m6502/m6502.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" INPUT_CHANGED_MEMBER(lasso_state::coin_inserted) diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp index d89033ac514..38ba52af2bf 100644 --- a/src/mame/drivers/lastbank.cpp +++ b/src/mame/drivers/lastbank.cpp @@ -17,6 +17,9 @@ #include "sound/okim6295.h" #include "machine/nvram.h" #include "machine/tc009xlvc.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_14_31818MHz diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp index 6cd3d5242f2..8d6e1f879a1 100644 --- a/src/mame/drivers/lastduel.cpp +++ b/src/mame/drivers/lastduel.cpp @@ -121,11 +121,14 @@ Notes: **************************************************************************/ #include "emu.h" +#include "includes/lastduel.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/lastduel.h" +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp index e3808728387..326147d30b9 100644 --- a/src/mame/drivers/lastfght.cpp +++ b/src/mame/drivers/lastfght.cpp @@ -67,6 +67,8 @@ Notes: #include "emu.h" #include "cpu/h8/h83048.h" #include "machine/nvram.h" +#include "screen.h" + class lastfght_state : public driver_device { diff --git a/src/mame/drivers/laz_aftrshok.cpp b/src/mame/drivers/laz_aftrshok.cpp index d9611e29dd6..28bd3e4e52e 100644 --- a/src/mame/drivers/laz_aftrshok.cpp +++ b/src/mame/drivers/laz_aftrshok.cpp @@ -31,6 +31,7 @@ https://www.youtube.com/watch?v=9DIhuOEVwf4 #include "emu.h" #include "sound/okim6295.h" +#include "speaker.h" class aftrshok_state : public driver_device diff --git a/src/mame/drivers/laz_awetoss.cpp b/src/mame/drivers/laz_awetoss.cpp index e0ae4697f64..6e39139461b 100644 --- a/src/mame/drivers/laz_awetoss.cpp +++ b/src/mame/drivers/laz_awetoss.cpp @@ -11,6 +11,7 @@ Awesome tossem u21 = 27c512 #include "emu.h" #include "sound/okim6295.h" +#include "speaker.h" class awetoss_state : public driver_device diff --git a/src/mame/drivers/laz_ribrac.cpp b/src/mame/drivers/laz_ribrac.cpp index fde9067a7b0..d8b19d7aecf 100644 --- a/src/mame/drivers/laz_ribrac.cpp +++ b/src/mame/drivers/laz_ribrac.cpp @@ -15,6 +15,7 @@ http://ohwow-arcade.com/Assets/Game_Manuals/RIBBIT%20RACIN.PDF #include "emu.h" #include "sound/okim6295.h" +#include "speaker.h" class laz_ribrac_state : public driver_device diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp index c7ddcea5c2f..89aa2419121 100644 --- a/src/mame/drivers/lazercmd.cpp +++ b/src/mame/drivers/lazercmd.cpp @@ -236,6 +236,8 @@ #include "emu.h" #include "includes/lazercmd.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" // color overlays, bbonk does not have an overlay #include "lazercmd.lh" diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp index 4b9482f5bf3..908a6e49284 100644 --- a/src/mame/drivers/lbeach.cpp +++ b/src/mame/drivers/lbeach.cpp @@ -26,6 +26,7 @@ TODO: #include "emu.h" #include "cpu/m6800/m6800.h" #include "machine/nvram.h" +#include "screen.h" #include "lbeach.lh" diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp index ec3f438297e..ef866d363ac 100644 --- a/src/mame/drivers/lc80.cpp +++ b/src/mame/drivers/lc80.cpp @@ -43,6 +43,7 @@ #include "emu.h" #include "includes/lc80.h" +#include "speaker.h" #include "lc80.lh" /* Memory Maps */ diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp index a7570d15f54..25fbc3ec82f 100644 --- a/src/mame/drivers/lcmate2.cpp +++ b/src/mame/drivers/lcmate2.cpp @@ -31,11 +31,13 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/rp5c15.h" #include "machine/nvram.h" +#include "machine/rp5c15.h" +#include "sound/spkrdev.h" #include "video/hd44780.h" -#include "sound/speaker.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class lcmate2_state : public driver_device diff --git a/src/mame/drivers/ldplayer.cpp b/src/mame/drivers/ldplayer.cpp index bc5feb2d458..9fda0081662 100644 --- a/src/mame/drivers/ldplayer.cpp +++ b/src/mame/drivers/ldplayer.cpp @@ -9,16 +9,23 @@ **************************************************************************/ #include "emu.h" -#include "emuopts.h" -#include "chd.h" + #include "cpu/mcs48/mcs48.h" #include "machine/ldpr8210.h" #include "machine/ldv1000.h" -#include + #include "ui/uimain.h" +#include "emuopts.h" +#include "speaker.h" + +#include "chd.h" + #include "pr8210.lh" +#include + + class ldplayer_state : public driver_device { public: diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp index e25c835e763..ee2b853bfcf 100644 --- a/src/mame/drivers/leapster.cpp +++ b/src/mame/drivers/leapster.cpp @@ -210,8 +210,10 @@ PCB - LEAPSTER-TV: #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "cpu/arcompact/arcompact.h" +#include "screen.h" #include "softlist.h" + class leapster_state : public driver_device { public: diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 7e420573db1..61121ceee76 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -81,12 +81,17 @@ Preliminary COP MCU memory map ***************************************************************************/ #include "emu.h" +#include "includes/legionna.h" + +#include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/3812intf.h" #include "sound/ym2151.h" -#include "cpu/m68000/m68000.h" #include "machine/seicop.h" -#include "includes/legionna.h" + +#include "screen.h" +#include "speaker.h" + /*****************************************************************************/ diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp index 004d50b7b5f..64e83f6bd87 100644 --- a/src/mame/drivers/leland.cpp +++ b/src/mame/drivers/leland.cpp @@ -63,6 +63,7 @@ #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/volt_reg.h" +#include "speaker.h" /* Master Clock2 is for Asylum, Ataxx, Brute Force, Danny Sullivan's Indy Heat, World Soccer Finals */ diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp index 9e67c7ec820..3fb5d5d7bbd 100644 --- a/src/mame/drivers/lemmings.cpp +++ b/src/mame/drivers/lemmings.cpp @@ -18,11 +18,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/lemmings.h" + #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/lemmings.h" +#include "screen.h" +#include "speaker.h" + WRITE16_MEMBER(lemmings_state::lemmings_control_w) { diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp index c071377641a..8a00ea24dcd 100644 --- a/src/mame/drivers/lethal.cpp +++ b/src/mame/drivers/lethal.cpp @@ -247,13 +247,17 @@ maybe some sprite placement issues ***************************************************************************/ #include "emu.h" +#include "includes/lethal.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6809/hd6309.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/eepromser.h" #include "sound/k054539.h" -#include "includes/lethal.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_24MHz #define SOUND_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp index 2b4914e93ac..d55fd3490e7 100644 --- a/src/mame/drivers/lethalj.cpp +++ b/src/mame/drivers/lethalj.cpp @@ -140,9 +140,10 @@ Pin #11(+) | | R | ***************************************************************************/ #include "emu.h" -#include "cpu/tms34010/tms34010.h" #include "includes/lethalj.h" + #include "sound/okim6295.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_40MHz diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp index 9b4e2dd8310..c9ccb9c9d93 100644 --- a/src/mame/drivers/lgp.cpp +++ b/src/mame/drivers/lgp.cpp @@ -67,8 +67,9 @@ Dumping Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "render.h" #include "machine/ldv1000.h" +#include "render.h" +#include "speaker.h" class lgp_state : public driver_device diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp index 1665d748bb9..d4c810d4eb6 100644 --- a/src/mame/drivers/liberate.cpp +++ b/src/mame/drivers/liberate.cpp @@ -17,11 +17,15 @@ *******************************************************************************/ #include "emu.h" +#include "includes/liberate.h" + #include "cpu/m6502/deco16.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" -#include "includes/liberate.h" #include "machine/deco222.h" +#include "screen.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp index e0626ac0cda..989b607e1fa 100644 --- a/src/mame/drivers/liberatr.cpp +++ b/src/mame/drivers/liberatr.cpp @@ -138,6 +138,7 @@ #include "emu.h" #include "includes/liberatr.h" +#include "speaker.h" #define MASTER_CLOCK 20000000 /* 20Mhz Main Clock Xtal */ diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp index 40b9c8f2997..aa249e7be94 100644 --- a/src/mame/drivers/limenko.cpp +++ b/src/mame/drivers/limenko.cpp @@ -28,8 +28,10 @@ #include "cpu/e132xs/e132xs.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" -#include "sound/qs1000.h" #include "sound/okim6295.h" +#include "sound/qs1000.h" +#include "screen.h" +#include "speaker.h" class limenko_state : public driver_device diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp index 1e5dad25b03..fb67ddd07f8 100644 --- a/src/mame/drivers/lisa.cpp +++ b/src/mame/drivers/lisa.cpp @@ -11,11 +11,13 @@ *********************************************************************/ #include "emu.h" +#include "includes/lisa.h" #include "cpu/m6502/m6504.h" #include "cpu/cop400/cop400.h" -#include "includes/lisa.h" #include "formats/ap_dsk35.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /*************************************************************************** ADDRESS MAP diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp index 52bafd6cd9f..7e17e2abc02 100644 --- a/src/mame/drivers/littlerb.cpp +++ b/src/mame/drivers/littlerb.cpp @@ -8,9 +8,6 @@ David Haywood */ -#define littlerb_printf logerror -#define littlerb_alt_printf logerror - /* Notes: @@ -71,6 +68,10 @@ Dip sw.2 #include "machine/inder_vid.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + +#define littlerb_printf logerror +#define littlerb_alt_printf logerror class littlerb_state : public driver_device { diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp index 91c84e8ee92..a9d9a413903 100644 --- a/src/mame/drivers/lkage.cpp +++ b/src/mame/drivers/lkage.cpp @@ -86,10 +86,14 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" + +#include "includes/lkage.h" #include "cpu/m6805/m6805.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/lkage.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CPU_CLOCK (XTAL_12MHz/2) #define SOUND_CPU_CLOCK (XTAL_8MHz/2) diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index dd73108bab9..62d593778c5 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -48,10 +48,15 @@ #include "emu.h" -#include "machine/keyboard.h" #include "includes/llc.h" + +#include "machine/keyboard.h" +#include "screen.h" +#include "speaker.h" + #include "llc1.lh" + /* Address maps */ static ADDRESS_MAP_START( llc1_mem, AS_PROGRAM, 8, llc_state ) AM_RANGE(0x0000, 0x07ff) AM_ROM // Monitor ROM diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp index 75e97a43ec1..a1e45abf147 100644 --- a/src/mame/drivers/lockon.cpp +++ b/src/mame/drivers/lockon.cpp @@ -12,11 +12,14 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/lockon.h" + #include "cpu/nec/nec.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/flt_vol.h" -#include "includes/lockon.h" +#include "speaker.h" + #define V30_GND_ADDR ((m_ctrl_reg & 0x3) << 16) #define V30_OBJ_ADDR ((m_ctrl_reg & 0x18) << 13) diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp index 4e573c58a63..def2ca69321 100644 --- a/src/mame/drivers/lola8a.cpp +++ b/src/mame/drivers/lola8a.cpp @@ -21,10 +21,13 @@ #include "emu.h" #include "cpu/i8085/i8085.h" -#include "video/mc6845.h" -#include "sound/ay8910.h" #include "imagedev/cassette.h" +#include "sound/ay8910.h" #include "sound/wave.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #define AY8910_TAG "g12" #define HD46505SP_TAG "h45" diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp index 4b4218fc570..005b631a11a 100644 --- a/src/mame/drivers/looping.cpp +++ b/src/mame/drivers/looping.cpp @@ -65,6 +65,8 @@ L056-6 9A " " VLI-8-4 7A " #include "sound/tms5220.h" #include "sound/volt_reg.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp index d80dfc1d1b8..999097f95d5 100644 --- a/src/mame/drivers/lordgun.cpp +++ b/src/mame/drivers/lordgun.cpp @@ -40,12 +40,14 @@ Notes: *************************************************************************************************************/ #include "emu.h" +#include "includes/lordgun.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/3812intf.h" #include "sound/ymf278b.h" -#include "includes/lordgun.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index 7934d6993dd..7f981732f4a 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -144,11 +144,14 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/lsasquad.h" + #include "cpu/m6805/m6805.h" -#include "sound/ay8910.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/lsasquad.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_24MHz diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp index 458f27d342c..6a61524c346 100644 --- a/src/mame/drivers/ltcasino.cpp +++ b/src/mame/drivers/ltcasino.cpp @@ -18,6 +18,8 @@ etc. #include "emu.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class ltcasino_state : public driver_device diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp index a6fe6c1834d..fdb64913e44 100644 --- a/src/mame/drivers/ltd.cpp +++ b/src/mame/drivers/ltd.cpp @@ -42,10 +42,14 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "sound/ay8910.h" +#include "speaker.h" + #include "ltd.lh" + class ltd_state : public genpin_class { public: diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp index f95038a3b9c..d11ee713476 100644 --- a/src/mame/drivers/luckgrln.cpp +++ b/src/mame/drivers/luckgrln.cpp @@ -82,6 +82,9 @@ #include "emu.h" #include "cpu/z180/z180.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #include "luckgrln.lh" diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp index ffba1469bad..dd49c52350f 100644 --- a/src/mame/drivers/lucky74.cpp +++ b/src/mame/drivers/lucky74.cpp @@ -758,6 +758,20 @@ *****************************************************************************************/ +#include "emu.h" +#include "includes/lucky74.h" + +#include "cpu/z80/z80.h" +#include "sound/ay8910.h" +#include "sound/msm5205.h" +#include "sound/sn76496.h" +#include "machine/i8255.h" +#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + +#include "lucky74.lh" + #define MASTER_CLOCK XTAL_12MHz /* confirmed */ @@ -783,16 +797,6 @@ #define C_06B49P_CLKOUT_19 (MASTER_CLOCK/200000) /* 60 Hz. (V-Sync) */ -#include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/ay8910.h" -#include "sound/sn76496.h" -#include "sound/msm5205.h" -#include "machine/i8255.h" -#include "machine/nvram.h" -#include "lucky74.lh" -#include "includes/lucky74.h" - void lucky74_state::machine_reset() { m_copro_sm7831 = 0; diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp index e3d7f51cb22..5d3b6bb70fc 100644 --- a/src/mame/drivers/lvcards.cpp +++ b/src/mame/drivers/lvcards.cpp @@ -74,10 +74,13 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/lvcards.h" + #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/nvram.h" -#include "includes/lvcards.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" MACHINE_START_MEMBER(lvcards_state,lvpoker) diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp index 8a5bc23658f..6be2f7aa9a1 100644 --- a/src/mame/drivers/lviv.cpp +++ b/src/mame/drivers/lviv.cpp @@ -283,16 +283,17 @@ Timings: *******************************************************************************/ #include "emu.h" +#include "includes/lviv.h" + #include "cpu/i8085/i8085.h" -#include "sound/speaker.h" #include "sound/wave.h" -#include "machine/i8255.h" -#include "includes/lviv.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" -#include "formats/lviv_lvt.h" -#include "machine/ram.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/lviv_lvt.h" + /* I/O ports */ diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 30a37fe3ecd..65a063bd636 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -50,11 +50,14 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/lwings.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/lwings.h" +#include "screen.h" +#include "speaker.h" /* Avengers runs on hardware almost identical to Trojan, but with a protection * device and some small changes to the memory map and videohardware. diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp index 4624a9e7f88..598ed06981c 100644 --- a/src/mame/drivers/lynx.cpp +++ b/src/mame/drivers/lynx.cpp @@ -9,10 +9,13 @@ ******************************************************************************/ #include "emu.h" -#include "cpu/m6502/m65sc02.h" -#include "audio/lynx.h" #include "includes/lynx.h" +#include "audio/lynx.h" + +#include "cpu/m6502/m65sc02.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "lynx.lh" diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp index d2cf6c183dd..8489e7787b3 100644 --- a/src/mame/drivers/m10.cpp +++ b/src/mame/drivers/m10.cpp @@ -113,10 +113,12 @@ Notes (couriersud) ***************************************************************************/ #include "emu.h" +#include "includes/m10.h" + #include "cpu/m6502/m6502.h" #include "machine/rescap.h" #include "sound/samples.h" -#include "includes/m10.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp index c2df3bc0ec2..74f6b79bcd2 100644 --- a/src/mame/drivers/m107.cpp +++ b/src/mame/drivers/m107.cpp @@ -26,13 +26,16 @@ confirmed for m107 games as well. *******************************************************************************/ #include "emu.h" -#include "cpu/nec/nec.h" -#include "cpu/nec/v25.h" #include "includes/m107.h" #include "includes/iremipt.h" + +#include "cpu/nec/nec.h" +#include "cpu/nec/v25.h" #include "machine/irem_cpu.h" #include "sound/ym2151.h" #include "sound/iremga20.h" +#include "speaker.h" + // this is the hacky code from m92.c, but better than per-game irq vector hacks. #define USE_HACKED_IRQS diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp index 43a8ae91449..e8a92f1cae4 100644 --- a/src/mame/drivers/m14.cpp +++ b/src/mame/drivers/m14.cpp @@ -54,6 +54,7 @@ Dumped by Chackn #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class m14_state : public driver_device diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp index 12481737d0f..9abf3d68c91 100644 --- a/src/mame/drivers/m20.cpp +++ b/src/mame/drivers/m20.cpp @@ -37,21 +37,26 @@ E I1 Vectored interrupt error #include "emu.h" -#include "cpu/z8000/z8000.h" +#include "machine/m20_8086.h" +#include "machine/m20_kbd.h" + +#include "bus/rs232/rs232.h" #include "cpu/i86/i86.h" -#include "video/mc6845.h" -#include "machine/ram.h" -#include "machine/wd_fdc.h" +#include "cpu/z8000/z8000.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ram.h" +#include "machine/wd_fdc.h" +#include "video/mc6845.h" + +#include "screen.h" +#include "softlist.h" + #include "formats/m20_dsk.h" #include "formats/pc_dsk.h" -#include "machine/m20_kbd.h" -#include "bus/rs232/rs232.h" -#include "machine/m20_8086.h" -#include "softlist.h" + class m20_state : public driver_device { diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index c1192e3f35d..2c7d99b81eb 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -275,24 +275,21 @@ Few other notes: #include "emu.h" +#include "includes/m5.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "formats/m5_dsk.h" -#include "formats/sord_cas.h" -#include "imagedev/cassette.h" -#include "bus/centronics/ctronics.h" -#include "machine/i8255.h" -#include "machine/ram.h" -#include "machine/wd_fdc.h" //brno mod -#include "machine/upd765.h" #include "machine/z80ctc.h" #include "sound/sn76496.h" #include "video/tms9928a.h" -#include "bus/m5/slot.h" + #include "bus/m5/rom.h" + #include "softlist.h" -#include "includes/m5.h" +#include "speaker.h" +#include "formats/m5_dsk.h" +#include "formats/sord_cas.h" diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp index 1b039cfe035..5a9f85c00d4 100644 --- a/src/mame/drivers/m57.cpp +++ b/src/mame/drivers/m57.cpp @@ -50,10 +50,13 @@ ****************************************************************************/ #include "emu.h" +#include "includes/m57.h" +#include "includes/iremipt.h" + #include "cpu/z80/z80.h" #include "audio/irem.h" -#include "includes/iremipt.h" -#include "includes/m57.h" + +#include "screen.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp index 25c0fce3020..a770110b9c0 100644 --- a/src/mame/drivers/m62.cpp +++ b/src/mame/drivers/m62.cpp @@ -70,9 +70,11 @@ other supported games as well. **************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "includes/iremipt.h" #include "includes/m62.h" +#include "includes/iremipt.h" + +#include "cpu/z80/z80.h" +#include "screen.h" /* Lode Runner 2 seems to have a simple protection on the bank switching */ diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index 28d694dddda..57c9016fd72 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -123,6 +123,8 @@ Dip locations verified for: #include "machine/gen_latch.h" #include "sound/ay8910.h" #include "sound/samples.h" +#include "screen.h" +#include "speaker.h" class m63_state : public driver_device { diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index ce12bce08da..2f5ae1657ec 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -186,6 +186,7 @@ other supported games as well. #include "emu.h" #include "includes/m72.h" #include "includes/iremipt.h" + #include "cpu/mcs51/mcs51.h" #include "cpu/nec/nec.h" #include "cpu/nec/v25.h" @@ -193,6 +194,8 @@ other supported games as well. #include "machine/irem_cpu.h" #include "sound/ym2151.h" #include "sound/volt_reg.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_32MHz #define SOUND_CLOCK XTAL_3_579545MHz diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp index 49819e96136..d216e0d588d 100644 --- a/src/mame/drivers/m79152pc.cpp +++ b/src/mame/drivers/m79152pc.cpp @@ -12,6 +12,8 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" + class m79152pc_state : public driver_device { @@ -22,7 +24,7 @@ public: , m_p_attributes(*this, "attributes") , m_maincpu(*this, "maincpu") , m_p_chargen(*this, "chargen") - { } + { } uint32_t screen_update_m79152pc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp index 8a331688c63..116018e518d 100644 --- a/src/mame/drivers/m79amb.cpp +++ b/src/mame/drivers/m79amb.cpp @@ -58,7 +58,11 @@ and two large (paddles pretending to be) guns. #include "emu.h" #include "includes/m79amb.h" + #include "cpu/i8085/i8085.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(m79amb_state::ramtek_videoram_w) { diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index b363d806a68..68c048a6f55 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -21,6 +21,7 @@ #include "emu.h" #include "includes/m90.h" #include "includes/iremipt.h" + #include "cpu/nec/nec.h" #include "cpu/nec/v25.h" #include "cpu/z80/z80.h" @@ -28,6 +29,8 @@ #include "sound/dac.h" #include "sound/ym2151.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" /***************************************************************************/ diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index 71cd8aca63d..cadf88db39d 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -201,13 +201,15 @@ psoldier dip locations still need verification. *****************************************************************************/ #include "emu.h" -#include "cpu/nec/nec.h" -#include "cpu/nec/v25.h" #include "includes/m92.h" #include "includes/iremipt.h" + +#include "cpu/nec/nec.h" +#include "cpu/nec/v25.h" #include "machine/irem_cpu.h" #include "sound/ym2151.h" #include "sound/iremga20.h" +#include "speaker.h" // I haven't managed to find a way to keep nbbatman happy when using the proper upd71059c device diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index fc02ed09196..d42f940160c 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -82,6 +82,7 @@ #include "machine/macadb.h" #include "softlist.h" +#include "speaker.h" #include "mac.lh" #define C7M (7833600) diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index 44aa12ddd3b..3557adbe421 100644 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -96,7 +96,9 @@ c0 8 data bits, Rx disabled #include "bus/scsi/scsi.h" #include "bus/scsi/scsihd.h" #include "bus/scsi/scsicd.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #define MAC_SCREEN_NAME "screen" #define MAC_539X_1_TAG "539x_1" diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp index ad87d2bd1e8..e76ed9d4dac 100644 --- a/src/mame/drivers/macpci.cpp +++ b/src/mame/drivers/macpci.cpp @@ -41,7 +41,9 @@ #include "cpu/powerpc/ppc.h" #include "imagedev/chd_cd.h" #include "sound/cdda.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" READ64_MEMBER( macpci_state::unk1_r ) { diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp index c893b353d35..57c12137b40 100644 --- a/src/mame/drivers/macrossp.cpp +++ b/src/mame/drivers/macrossp.cpp @@ -284,9 +284,12 @@ Notes: #include "emu.h" +#include "includes/macrossp.h" + #include "cpu/m68000/m68000.h" #include "sound/es5506.h" -#include "includes/macrossp.h" +#include "speaker.h" + /*** VARIOUS READ / WRITE HANDLERS *******************************************/ diff --git a/src/mame/drivers/madalien.cpp b/src/mame/drivers/madalien.cpp index 15f9f3cdc87..ba4a1054aae 100644 --- a/src/mame/drivers/madalien.cpp +++ b/src/mame/drivers/madalien.cpp @@ -9,10 +9,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/madalien.h" + #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" #include "video/mc6845.h" -#include "includes/madalien.h" +#include "screen.h" +#include "speaker.h" #define SOUND_CLOCK XTAL_4MHz diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp index 12e134e15c5..dad6e18407b 100644 --- a/src/mame/drivers/madmotor.cpp +++ b/src/mame/drivers/madmotor.cpp @@ -15,12 +15,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/madmotor.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "sound/2203intf.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/madmotor.h" +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp index 08612642b5d..0057e4db9cc 100644 --- a/src/mame/drivers/magic10.cpp +++ b/src/mame/drivers/magic10.cpp @@ -89,20 +89,24 @@ ****************************************************************************/ -#define MAIN_CLOCK XTAL_20MHz -#define AUX_CLOCK XTAL_30MHz - -#define CPU_CLOCK MAIN_CLOCK/2 - - #include "emu.h" + #include "cpu/m68000/m68000.h" -#include "sound/okim6295.h" #include "machine/nvram.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + #include "sgsafari.lh" #include "musicsrt.lh" +#define MAIN_CLOCK XTAL_20MHz +#define AUX_CLOCK XTAL_30MHz + +#define CPU_CLOCK MAIN_CLOCK/2 + + class magic10_state : public driver_device { public: diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index b6b868d8ade..2ff9031ceb1 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -160,15 +160,17 @@ *******************************************************************************/ - -#define CLOCK_A XTAL_30MHz -#define CLOCK_B XTAL_8MHz -#define CLOCK_C XTAL_19_6608MHz - #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/ym2413.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + + +#define CLOCK_A XTAL_30MHz +#define CLOCK_B XTAL_8MHz +#define CLOCK_C XTAL_19_6608MHz class magicard_state : public driver_device diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index 79c36c4dcc5..ee116e13b3a 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -440,15 +440,17 @@ *******************************************************************************/ - -#define MASTER_CLOCK XTAL_10MHz - #include "emu.h" #include "cpu/m6502/m6502.h" #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_10MHz class magicfly_state : public driver_device diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp index 58225283cd7..feede417431 100644 --- a/src/mame/drivers/magictg.cpp +++ b/src/mame/drivers/magictg.cpp @@ -132,11 +132,13 @@ Medium size chip with heat sink on it ***************************************************************************/ #include "emu.h" -#include "cpu/mips/mips3.h" #include "cpu/adsp2100/adsp2100.h" +#include "cpu/mips/mips3.h" +#include "machine/lpci.h" #include "sound/dmadac.h" #include "video/voodoo.h" -#include "machine/lpci.h" +#include "screen.h" +#include "speaker.h" /* TODO: Two 3Dfx Voodoo chipsets are used in SLI configuration */ diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp index 210f5988028..fb26b84c386 100644 --- a/src/mame/drivers/magmax.cpp +++ b/src/mame/drivers/magmax.cpp @@ -26,10 +26,12 @@ Stephh's notes (based on the game M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/magmax.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/magmax.h" +#include "speaker.h" WRITE16_MEMBER(magmax_state::magmax_sound_w) diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp index b59e9926586..773f44273d7 100644 --- a/src/mame/drivers/magnum.cpp +++ b/src/mame/drivers/magnum.cpp @@ -6,10 +6,12 @@ // http://www.eevblog.com/forum/blog/eevblog-949-vintage-australian-made-laptop-teardown/msg1080508/#msg1080508 #include "emu.h" -#include "rendlay.h" #include "cpu/i86/i186.h" #include "machine/cdp1879.h" #include "sound/beep.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" class magnum_state : public driver_device { diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp index ee1cf77313f..9909d64fa3a 100644 --- a/src/mame/drivers/mainevt.cpp +++ b/src/mame/drivers/mainevt.cpp @@ -23,13 +23,16 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/mainevt.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/mainevt.h" +#include "speaker.h" + INTERRUPT_GEN_MEMBER(mainevt_state::mainevt_interrupt) { diff --git a/src/mame/drivers/mainsnk.cpp b/src/mame/drivers/mainsnk.cpp index c75e8ebda0f..cdb6ebc5575 100644 --- a/src/mame/drivers/mainsnk.cpp +++ b/src/mame/drivers/mainsnk.cpp @@ -110,9 +110,12 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k */ #include "emu.h" +#include "includes/mainsnk.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/mainsnk.h" +#include "screen.h" +#include "speaker.h" void mainsnk_state::machine_start() diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp index 8930ad58fd4..12b871bd641 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -449,20 +449,26 @@ **********************************************************************************/ -#define MASTER_CLOCK XTAL_12MHz -#define CPU_CLOCK (MASTER_CLOCK / 2) // 6 MHz, measured. -#define OKI_CLOCK (MASTER_CLOCK / 8) // 1.5 MHz, measured. -#define CRTC_CLOCK (MASTER_CLOCK / 16) // 750 kHz, measured. - #include "emu.h" + #include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "sound/okim6295.h" #include "machine/bankdev.h" #include "machine/nvram.h" +#include "sound/okim6295.h" +#include "video/mc6845.h" + +#include "screen.h" +#include "speaker.h" + #include "majorpkr.lh" +#define MASTER_CLOCK XTAL_12MHz +#define CPU_CLOCK (MASTER_CLOCK / 2) // 6 MHz, measured. +#define OKI_CLOCK (MASTER_CLOCK / 8) // 1.5 MHz, measured. +#define CRTC_CLOCK (MASTER_CLOCK / 16) // 750 kHz, measured. + + class majorpkr_state : public driver_device { public: diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp index 4b39c437037..bc92e18aacb 100644 --- a/src/mame/drivers/malzak.cpp +++ b/src/mame/drivers/malzak.cpp @@ -65,11 +65,13 @@ */ #include "emu.h" +#include "includes/malzak.h" + #include "cpu/s2650/s2650.h" +#include "machine/nvram.h" #include "sound/sn76477.h" #include "video/saa5050.h" -#include "machine/nvram.h" -#include "includes/malzak.h" +#include "speaker.h" READ8_MEMBER(malzak_state::fake_VRLE_r) diff --git a/src/mame/drivers/manohman.cpp b/src/mame/drivers/manohman.cpp index 690eea8d2f5..08aff866efb 100644 --- a/src/mame/drivers/manohman.cpp +++ b/src/mame/drivers/manohman.cpp @@ -131,12 +131,13 @@ ***************************************************************************/ -#define MASTER_CLOCK XTAL_8MHz -#define SECONDARY_CLOCK XTAL_3_6864MHz - #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/saa1099.h" +#include "speaker.h" + +#define MASTER_CLOCK XTAL_8MHz +#define SECONDARY_CLOCK XTAL_3_6864MHz class _manohman_state : public driver_device diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index 64feea7e074..def351c0926 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -550,9 +550,12 @@ TODO: #include "emu.h" #include "includes/mappy.h" + #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "sound/volt_reg.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp index f04bccfe4df..55661a882c5 100644 --- a/src/mame/drivers/marineb.cpp +++ b/src/mame/drivers/marineb.cpp @@ -38,9 +38,12 @@ write ***************************************************************************/ #include "emu.h" +#include "includes/marineb.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/marineb.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK (XTAL_12MHz) #define CPU_CLOCK (MASTER_CLOCK/4) diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp index 5c66ce11582..e2acb770428 100644 --- a/src/mame/drivers/mario.cpp +++ b/src/mame/drivers/mario.cpp @@ -92,9 +92,11 @@ write: ***************************************************************************/ #include "emu.h" +#include "includes/mario.h" + #include "cpu/z80/z80.h" #include "machine/z80dma.h" -#include "includes/mario.h" +#include "screen.h" /************************************* diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp index 74648b255f3..8481b4f0595 100644 --- a/src/mame/drivers/markham.cpp +++ b/src/mame/drivers/markham.cpp @@ -11,9 +11,12 @@ *****************************************************************************/ #include "emu.h" +#include "includes/markham.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/markham.h" +#include "screen.h" +#include "speaker.h" READ8_MEMBER(markham_state::markham_e004_r) diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp index 676d879dd8d..11826be3965 100644 --- a/src/mame/drivers/marywu.cpp +++ b/src/mame/drivers/marywu.cpp @@ -18,8 +18,10 @@ #include "emu.h" #include "cpu/mcs51/mcs51.h" -#include "sound/ay8910.h" #include "machine/i8279.h" +#include "sound/ay8910.h" +#include "speaker.h" + #include "marywu.lh" class marywu_state : public driver_device diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp index cf7241a0745..08fa73396c2 100644 --- a/src/mame/drivers/mastboy.cpp +++ b/src/mame/drivers/mastboy.cpp @@ -440,6 +440,8 @@ #include "sound/saa1099.h" #include "sound/msm5205.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" class mastboy_state : public driver_device diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp index 2e3bf5022e3..33b915f8f4c 100644 --- a/src/mame/drivers/matmania.cpp +++ b/src/mame/drivers/matmania.cpp @@ -40,6 +40,7 @@ The driver has been updated accordingly. #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp index aa86318b42c..3154c9c8caf 100644 --- a/src/mame/drivers/maxaflex.cpp +++ b/src/mame/drivers/maxaflex.cpp @@ -20,11 +20,14 @@ #include "machine/6821pia.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/pokey.h" #include "video/gtia.h" +#include "screen.h" +#include "speaker.h" + #include "maxaflex.lh" diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index 9b84183349d..3f4de5b3cb6 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -73,6 +73,7 @@ ******************************************************************************************/ #include "emu.h" #include "includes/maygay1b.h" +#include "speaker.h" #include "maygay1b.lh" diff --git a/src/mame/drivers/maygayep.cpp b/src/mame/drivers/maygayep.cpp index ac28c22b2c9..469a2a08eaa 100644 --- a/src/mame/drivers/maygayep.cpp +++ b/src/mame/drivers/maygayep.cpp @@ -35,6 +35,7 @@ #include "emu.h" #include "cpu/h8/h83002.h" #include "sound/ymz280b.h" +#include "speaker.h" class maygayep_state : public driver_device diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp index 755714ea928..6bc9d95668c 100644 --- a/src/mame/drivers/maygayv1.cpp +++ b/src/mame/drivers/maygayv1.cpp @@ -127,15 +127,19 @@ Find lamps/reels after UPD changes. ***************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "video/awpvid.h" + +#include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" -#include "machine/i8279.h" #include "machine/6821pia.h" +#include "machine/i8279.h" #include "machine/mc68681.h" -#include "sound/ym2413.h" -#include "sound/upd7759.h" #include "machine/nvram.h" +#include "sound/upd7759.h" +#include "sound/ym2413.h" + +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/mayumi.cpp b/src/mame/drivers/mayumi.cpp index 898d2ddf5d5..e6787480bc7 100644 --- a/src/mame/drivers/mayumi.cpp +++ b/src/mame/drivers/mayumi.cpp @@ -10,9 +10,11 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/2203intf.h" #include "machine/nvram.h" #include "machine/i8255.h" +#include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" #define MCLK XTAL_10MHz @@ -25,7 +27,8 @@ public: m_videoram(*this, "videoram"), m_i8255(*this, "i8255"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode") + { } /* memory pointers */ required_shared_ptr m_videoram; diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index 305fac7235d..bda6e7bb89c 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -122,6 +122,8 @@ video z80 #include "sound/ay8910.h" #include "video/resnet.h" #include "video/mb_vcu.h" +#include "screen.h" +#include "speaker.h" #define MAZERBLA 0x01 diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index 8eb88009cf4..22934fbba2b 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -45,14 +45,16 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/i8255.h" #include "machine/i8251.h" -#include "video/mc6845.h" +#include "machine/i8255.h" +#include "machine/keyboard.h" #include "machine/wd_fdc.h" #include "sound/beep.h" -#include "sound/speaker.h" -#include "machine/keyboard.h" +#include "sound/spkrdev.h" +#include "video/mc6845.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class mbc200_state : public driver_device { diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp index 836e408e91c..9d03830d6f1 100644 --- a/src/mame/drivers/mbc55x.cpp +++ b/src/mame/drivers/mbc55x.cpp @@ -18,7 +18,9 @@ ToDo: #include "emu.h" #include "includes/mbc55x.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" const unsigned char mbc55x_palette[SCREEN_NO_COLOURS][3] = { diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index 5ca412febef..ec8bc737c15 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -126,6 +126,7 @@ from Brett Selwood and Andrew Davies. #include "emu.h" #include "includes/mbee.h" #include "formats/mbee_cas.h" +#include "speaker.h" #define XTAL_13_5MHz 13500000 diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp index 71387f8cb1c..d02d766b6c5 100644 --- a/src/mame/drivers/mc10.cpp +++ b/src/mame/drivers/mc10.cpp @@ -8,16 +8,21 @@ #include "emu.h" + #include "cpu/m6800/m6800.h" -#include "formats/coco_cas.h" #include "imagedev/cassette.h" #include "imagedev/printer.h" #include "machine/ram.h" #include "sound/dac.h" #include "sound/volt_reg.h" -#include "video/mc6847.h" #include "video/ef9345.h" +#include "video/mc6847.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/coco_cas.h" + //printer state enum @@ -36,14 +41,14 @@ class mc10_state : public driver_device { public: mc10_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_mc6847(*this, "mc6847"), - m_ef9345(*this, "ef9345"), - m_dac(*this, "dac"), - m_ram(*this, RAM_TAG), - m_cassette(*this, "cassette"), - m_printer(*this, "printer") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_mc6847(*this, "mc6847") + , m_ef9345(*this, "ef9345") + , m_dac(*this, "dac") + , m_ram(*this, RAM_TAG) + , m_cassette(*this, "cassette") + , m_printer(*this, "printer") { } required_device m_maincpu; diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp index 85a7d67abd0..e3b855bbc00 100644 --- a/src/mame/drivers/mc1000.cpp +++ b/src/mame/drivers/mc1000.cpp @@ -22,16 +22,21 @@ */ -#include "softlist.h" #include "emu.h" + +#include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" +#include "machine/ram.h" +#include "machine/rescap.h" +#include "sound/ay8910.h" #include "video/mc6845.h" #include "video/mc6847.h" -#include "sound/ay8910.h" -#include "bus/centronics/ctronics.h" -#include "machine/rescap.h" -#include "machine/ram.h" + +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + #define SCREEN_TAG "screen" #define Z80_TAG "u13" diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp index 409798cd3a2..b62b15481ae 100644 --- a/src/mame/drivers/mc1502.cpp +++ b/src/mame/drivers/mc1502.cpp @@ -10,13 +10,15 @@ #include "emu.h" #include "includes/mc1502.h" -#include "bus/rs232/rs232.h" +#include "bus/rs232/rs232.h" #include "cpu/i86/i86.h" #include "machine/kb_7007_3.h" -#include "sound/speaker.h" #include "sound/wave.h" + #include "softlist.h" +#include "speaker.h" + #define VERBOSE_DBG 0 diff --git a/src/mame/drivers/mc80.cpp b/src/mame/drivers/mc80.cpp index 967fc67f637..da71367b000 100644 --- a/src/mame/drivers/mc80.cpp +++ b/src/mame/drivers/mc80.cpp @@ -21,6 +21,7 @@ for various things, but none of that is working. #include "emu.h" #include "includes/mc80.h" +#include "screen.h" static ADDRESS_MAP_START(mc8020_mem, AS_PROGRAM, 8, mc80_state) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp index 594bdb960ad..3f7daf348e8 100644 --- a/src/mame/drivers/mcatadv.cpp +++ b/src/mame/drivers/mcatadv.cpp @@ -138,10 +138,13 @@ Stephh's notes (based on the games M68000 code and some tests) : ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/mcatadv.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/2610intf.h" -#include "includes/mcatadv.h" +#include "screen.h" +#include "speaker.h" /*** Main CPU ***/ diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp index cc65c692b69..473d593a37f 100644 --- a/src/mame/drivers/mcr.cpp +++ b/src/mame/drivers/mcr.cpp @@ -284,10 +284,13 @@ #include "emu.h" +#include "includes/mcr.h" + #include "audio/midway.h" -#include "sound/samples.h" #include "machine/nvram.h" -#include "includes/mcr.h" +#include "sound/samples.h" +#include "screen.h" +#include "speaker.h" #include "dpoker.lh" diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 9f45bcbfee1..966eb0c4bf6 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -104,13 +104,16 @@ #include "emu.h" -#include "cpu/z80/z80.h" -#include "machine/z80ctc.h" +#include "includes/mcr.h" +#include "includes/mcr3.h" #include "audio/midway.h" #include "audio/csd.h" + +#include "cpu/z80/z80.h" #include "machine/nvram.h" -#include "includes/mcr.h" -#include "includes/mcr3.h" +#include "machine/z80ctc.h" + +#include "speaker.h" #include "spyhunt.lh" #include "turbotag.lh" diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp index a4d15922c0c..d24ea59af70 100644 --- a/src/mame/drivers/mcr68.cpp +++ b/src/mame/drivers/mcr68.cpp @@ -55,9 +55,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/mcr68.h" + #include "cpu/m68000/m68000.h" #include "machine/nvram.h" -#include "includes/mcr68.h" + +#include "speaker.h" diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp index 8fdc182ae61..4d7032e1587 100644 --- a/src/mame/drivers/meadows.cpp +++ b/src/mame/drivers/meadows.cpp @@ -120,7 +120,10 @@ #include "emu.h" #include "includes/meadows.h" + #include "sound/volt_reg.h" +#include "speaker.h" + #include "deadeye.lh" #include "gypsyjug.lh" #include "minferno.lh" diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp index 383330544a7..8afdc14d266 100644 --- a/src/mame/drivers/mediagx.cpp +++ b/src/mame/drivers/mediagx.cpp @@ -74,6 +74,8 @@ #include "machine/idectrl.h" #include "sound/dmadac.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" #define SPEEDUP_HACKS 1 diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index 121d4a0a0c7..364f01f3e8b 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -117,6 +117,16 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? < ***************************************************************************/ +#include "emu.h" +#include "includes/megasys1.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "sound/2203intf.h" +#include "sound/ym2151.h" +#include "machine/jalcrpt.h" +#include "speaker.h" + #define SYS_A_CPU_CLOCK (XTAL_12MHz / 2) /* clock for main 68000 */ #define SYS_B_CPU_CLOCK XTAL_8MHz /* clock for main 68000 */ #define SYS_C_CPU_CLOCK (XTAL_24MHz / 2) /* clock for main 68000 */ @@ -124,14 +134,6 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? < #define SOUND_CPU_CLOCK XTAL_7MHz /* clock for sound 68000 */ #define OKI4_SOUND_CLOCK XTAL_4MHz -#include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" -#include "sound/2203intf.h" -#include "sound/ym2151.h" -#include "machine/jalcrpt.h" -#include "includes/megasys1.h" - MACHINE_RESET_MEMBER(megasys1_state,megasys1) { diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp index 94738431af1..524e028228e 100644 --- a/src/mame/drivers/megazone.cpp +++ b/src/mame/drivers/megazone.cpp @@ -9,8 +9,9 @@ To enter service mode, keep 1&2 pressed on reset ***************************************************************************/ #include "emu.h" -#include "includes/konamipt.h" #include "includes/megazone.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" @@ -21,6 +22,8 @@ To enter service mode, keep 1&2 pressed on reset #include "sound/dac.h" #include "sound/flt_rc.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" READ8_MEMBER(megazone_state::megazone_port_a_r) diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp index f3c38c05d8b..116b72b6784 100644 --- a/src/mame/drivers/meijinsn.cpp +++ b/src/mame/drivers/meijinsn.cpp @@ -66,6 +66,8 @@ SOFT PSG & VOICE BY M.C & S.H #include "machine/gen_latch.h" #include "video/resnet.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class meijinsn_state : public driver_device { diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index 80f3d3bc00f..4bdfb6e8ef8 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -74,12 +74,14 @@ TODO #include "emu.h" #include "cpu/m6800/m6800.h" +#include "imagedev/cassette.h" +#include "imagedev/snapquik.h" #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/clock.h" -#include "imagedev/cassette.h" -#include "imagedev/snapquik.h" #include "sound/wave.h" +#include "speaker.h" + #include "mekd2.lh" #define XTAL_MEKD2 1228800 diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp index b010de34dd8..03f660ccf15 100644 --- a/src/mame/drivers/mephisto.cpp +++ b/src/mame/drivers/mephisto.cpp @@ -65,6 +65,7 @@ Mephisto 4 Turbo Kit 18mhz - (mm4tk) #include "emu.h" #include "cpu/m6502/m65c02.h" #include "sound/beep.h" +#include "speaker.h" //#include "mephisto.lh" class mephisto_state : public driver_device diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp index ef1634b5312..9f2c8fb6cad 100644 --- a/src/mame/drivers/mephistp.cpp +++ b/src/mame/drivers/mephistp.cpp @@ -20,6 +20,7 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "sound/3812intf.h" +#include "speaker.h" // mephisto_state was also defined in mess/drivers/mephisto.c class mephisto_pinball_state : public driver_device diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index 6865af919f3..9f8cc5c873f 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -71,9 +71,11 @@ Merit Riviera Notes - There are several known versions: #include "emu.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "video/mc6845.h" -#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK (XTAL_10MHz) #define CPU_CLOCK (MASTER_CLOCK / 4) diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index e36e76aa987..77937db1ddb 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -172,17 +172,20 @@ Not all regional versions are available for each Megatouch series */ #include "emu.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "sound/ay8910.h" -#include "video/v9938.h" #include "machine/ds1204.h" #include "machine/i8255.h" -#include "machine/z80pio.h" #include "machine/ins8250.h" #include "machine/microtch.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "machine/z80pio.h" +#include "sound/ay8910.h" +#include "video/v9938.h" + +#include "speaker.h" class meritm_state : public driver_device diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp index e11d435d624..f5daf2efc84 100644 --- a/src/mame/drivers/mermaid.cpp +++ b/src/mame/drivers/mermaid.cpp @@ -117,9 +117,12 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/mermaid.h" + #include "cpu/z80/z80.h" #include "sound/msm5205.h" -#include "includes/mermaid.h" +#include "speaker.h" + /* Read/Write Handlers */ diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp index 25f7dc00098..d21bcae7a7a 100644 --- a/src/mame/drivers/mes.cpp +++ b/src/mame/drivers/mes.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class mes_state : public driver_device diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp index 7221eadcce2..bdb9d70843d 100644 --- a/src/mame/drivers/metalmx.cpp +++ b/src/mame/drivers/metalmx.cpp @@ -256,8 +256,9 @@ Logic: ***************************************************************************/ #include "emu.h" -#include "audio/cage.h" #include "includes/metalmx.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp index e4e1d362c87..eb07074ab7f 100644 --- a/src/mame/drivers/metlclsh.cpp +++ b/src/mame/drivers/metlclsh.cpp @@ -34,10 +34,13 @@ metlclsh: ***************************************************************************/ #include "emu.h" +#include "includes/metlclsh.h" + #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" #include "sound/3526intf.h" -#include "includes/metlclsh.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp index 07509041d48..6ae92b9fc92 100644 --- a/src/mame/drivers/metlfrzr.cpp +++ b/src/mame/drivers/metlfrzr.cpp @@ -21,9 +21,12 @@ **************************************************************************************************************************/ #include "emu.h" +#include "audio/t5182.h" + #include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" -#include "audio/t5182.h" class metlfrzr_state : public driver_device { @@ -37,7 +40,7 @@ public: m_video_regs(*this, "vregs"), m_palette(*this, "palette"), m_gfxdecode(*this, "gfxdecode") - { } + { } virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index a73b7dcda8b..1cb17cc7911 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -98,16 +98,18 @@ driver modified by Hau ***************************************************************************/ #include "emu.h" +#include "includes/metro.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "cpu/upd7810/upd7810.h" #include "cpu/h8/h83006.h" -#include "includes/metro.h" #include "machine/watchdog.h" #include "sound/ym2413.h" #include "sound/2610intf.h" #include "sound/ymf278b.h" +#include "speaker.h" /*************************************************************************** @@ -1715,7 +1717,7 @@ private: uint8_t value; }; -const device_type PUZZLET_IO = &device_creator; +const device_type PUZZLET_IO = device_creator; puzzlet_io_device::puzzlet_io_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp index fdc656f01df..1c63c75317b 100644 --- a/src/mame/drivers/mexico86.cpp +++ b/src/mame/drivers/mexico86.cpp @@ -53,6 +53,8 @@ PS4 J8635 PS4 J8541 PS4 J8648 #include "includes/mexico86.h" #include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp index 6888cf049cb..e7b54bd7cd7 100644 --- a/src/mame/drivers/meyc8080.cpp +++ b/src/mame/drivers/meyc8080.cpp @@ -60,6 +60,8 @@ #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #include "wldarrow.lh" #include "mdrawpkr.lh" @@ -70,12 +72,13 @@ class meyc8080_state : public driver_device { public: meyc8080_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_videoram_0(*this, "vram0"), - m_videoram_1(*this, "vram1"), - m_videoram_2(*this, "vram2"), - m_maincpu(*this, "maincpu"), - m_dac(*this, "dac") { } + : driver_device(mconfig, type, tag) + , m_videoram_0(*this, "vram0") + , m_videoram_1(*this, "vram1") + , m_videoram_2(*this, "vram2") + , m_maincpu(*this, "maincpu") + , m_dac(*this, "dac") + { } required_shared_ptr m_videoram_0; required_shared_ptr m_videoram_1; diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp index f95642afb58..bbacd7ba5ed 100644 --- a/src/mame/drivers/meyc8088.cpp +++ b/src/mame/drivers/meyc8088.cpp @@ -32,6 +32,9 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" + #include "gldarrow.lh" diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp index 39c41f1811c..64953836fdd 100644 --- a/src/mame/drivers/mgames.cpp +++ b/src/mame/drivers/mgames.cpp @@ -217,6 +217,8 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" +#include "screen.h" + #include "mgames.lh" diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index d5efe2a703f..6b48e387cfa 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -19,13 +19,16 @@ Ver. 2.2 should exist #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" -#include "sound/msm5205.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "sound/ay8910.h" #include "sound/flt_rc.h" +#include "sound/msm5205.h" +#include "speaker.h" + #include "mgavegas.lh" + /**************************** * LOG defines * ****************************/ diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp index ddd157745a8..3a46e4c6c41 100644 --- a/src/mame/drivers/mgolf.cpp +++ b/src/mame/drivers/mgolf.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "cpu/m6502/m6502.h" +#include "screen.h" class mgolf_state : public driver_device { diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp index f5d58a08ca1..a8dcde55d5b 100644 --- a/src/mame/drivers/mhavoc.cpp +++ b/src/mame/drivers/mhavoc.cpp @@ -186,6 +186,8 @@ ***************************************************************************/ #include "emu.h" +#include "includes/mhavoc.h" + #include "cpu/m6502/m6502.h" #include "machine/atari_vg.h" #include "video/avgdvg.h" @@ -194,7 +196,9 @@ #include "sound/pokey.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/mhavoc.h" +#include "screen.h" +#include "speaker.h" + /* Quad pokey hookup (based on schematics): Address: 543210 diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 12ace551f1d..3130e5d0c71 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -25,6 +25,8 @@ #include "cpu/z80/z80.h" #include "video/tms9927.h" #include "sound/beep.h" +#include "screen.h" +#include "speaker.h" class micral_state : public driver_device diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp index eb87f1365df..150b22b84f2 100644 --- a/src/mame/drivers/micro3d.cpp +++ b/src/mame/drivers/micro3d.cpp @@ -24,14 +24,18 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" +#include "includes/micro3d.h" + #include "cpu/am29000/am29000.h" +#include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" #include "machine/mc68681.h" #include "machine/mc68901.h" -#include "sound/ym2151.h" #include "machine/nvram.h" -#include "includes/micro3d.h" +#include "sound/ym2151.h" + +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp index cbbcd78e40d..708f2783d35 100644 --- a/src/mame/drivers/micronic.cpp +++ b/src/mame/drivers/micronic.cpp @@ -112,10 +112,12 @@ */ - #include "emu.h" #include "includes/micronic.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + READ8_MEMBER( micronic_state::keypad_r ) { diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp index 91b55f3477d..d84eff02b73 100644 --- a/src/mame/drivers/micropin.cpp +++ b/src/mame/drivers/micropin.cpp @@ -23,12 +23,16 @@ ToDo: #include "emu.h" #include "machine/genpin.h" -#include "cpu/m6800/m6800.h" + #include "cpu/i8085/i8085.h" +#include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "sound/beep.h" +#include "speaker.h" + #include "micropin.lh" + class micropin_state : public genpin_class { public: diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp index 9b97bb0d17b..05e4b51f29a 100644 --- a/src/mame/drivers/microtan.cpp +++ b/src/mame/drivers/microtan.cpp @@ -39,18 +39,21 @@ /* Core includes */ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/microtan.h" /* Components */ -#include "sound/ay8910.h" -#include "sound/wave.h" +#include "cpu/m6502/m6502.h" #include "machine/6522via.h" #include "machine/mos6551.h" +#include "sound/ay8910.h" +#include "sound/wave.h" /* Devices */ #include "imagedev/cassette.h" +#include "screen.h" +#include "speaker.h" + static ADDRESS_MAP_START( microtan_map, AS_PROGRAM, 8, microtan_state ) AM_RANGE(0x0000, 0x01ff) AM_RAM diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp index 392f5a235ad..cf0ae613865 100644 --- a/src/mame/drivers/microvsn.cpp +++ b/src/mame/drivers/microvsn.cpp @@ -16,14 +16,16 @@ of the games were clocked at around 500KHz, 550KHz, or 300KHz. ****************************************************************************/ #include "emu.h" -#include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/generic/slot.h" #include "cpu/mcs48/mcs48.h" #include "cpu/tms1000/tms1100.h" #include "sound/dac.h" #include "sound/volt_reg.h" #include "rendlay.h" #include "softlist.h" +#include "screen.h" +#include "speaker.h" #define LOG 0 diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp index e4a5b4aa61e..2dfdd7effb6 100644 --- a/src/mame/drivers/midas.cpp +++ b/src/mame/drivers/midas.cpp @@ -52,11 +52,14 @@ *************************************************************************************************************/ #include "emu.h" +#include "includes/neogeo.h" + #include "cpu/m68000/m68000.h" #include "sound/ymz280b.h" #include "machine/eepromser.h" #include "machine/ticket.h" -#include "includes/neogeo.h" +#include "speaker.h" + class midas_state : public driver_device { @@ -70,7 +73,7 @@ public: m_sprgen(*this, "spritegen"), m_screen(*this, "screen"), m_zoomram(*this, "zoomtable") - { } + { } DECLARE_READ16_MEMBER(ret_ffff); DECLARE_WRITE16_MEMBER(midas_gfxregs_w); diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp index 9e3ded89edc..789209e22e3 100644 --- a/src/mame/drivers/midtunit.cpp +++ b/src/mame/drivers/midtunit.cpp @@ -23,11 +23,14 @@ #include "emu.h" -#include "cpu/tms34010/tms34010.h" +#include "includes/midtunit.h" + #include "cpu/adsp2100/adsp2100.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/midtunit.h" + +#include "screen.h" +#include "speaker.h" #define CPU_CLOCK (50000000) diff --git a/src/mame/drivers/midwunit.cpp b/src/mame/drivers/midwunit.cpp index a2c5302f4c9..92414874d81 100644 --- a/src/mame/drivers/midwunit.cpp +++ b/src/mame/drivers/midwunit.cpp @@ -91,12 +91,14 @@ Notes: #include "emu.h" +#include "includes/midtunit.h" +#include "includes/midwunit.h" +#include "audio/dcs.h" + #include "cpu/tms34010/tms34010.h" #include "cpu/adsp2100/adsp2100.h" -#include "audio/dcs.h" #include "machine/nvram.h" -#include "includes/midtunit.h" -#include "includes/midwunit.h" +#include "screen.h" #define PIXEL_CLOCK (8000000) diff --git a/src/mame/drivers/midxunit.cpp b/src/mame/drivers/midxunit.cpp index 93c396177e8..850c904eab2 100644 --- a/src/mame/drivers/midxunit.cpp +++ b/src/mame/drivers/midxunit.cpp @@ -82,12 +82,15 @@ There's a separate sound board also, but it wasn't available so is not documente **************************************************************************/ #include "emu.h" -#include "cpu/tms34010/tms34010.h" -#include "cpu/adsp2100/adsp2100.h" -#include "audio/dcs.h" -#include "machine/nvram.h" #include "includes/midtunit.h" #include "includes/midxunit.h" +#include "audio/dcs.h" + +#include "cpu/adsp2100/adsp2100.h" +#include "cpu/tms34010/tms34010.h" +#include "machine/nvram.h" + +#include "screen.h" #define PIXEL_CLOCK (8000000) diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp index 4c802f59c4b..1e109bd5baf 100644 --- a/src/mame/drivers/midyunit.cpp +++ b/src/mame/drivers/midyunit.cpp @@ -115,9 +115,12 @@ Notes: **************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/midyunit.h" +#include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" + /* master clocks vary based on game */ #define SLOW_MASTER_CLOCK XTAL_40MHz /* "slow" == smashtv, trog, hiimpact */ diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp index 2790065e854..35ded5f2f99 100644 --- a/src/mame/drivers/mikie.cpp +++ b/src/mame/drivers/mikie.cpp @@ -39,13 +39,17 @@ Stephh's notes (based on the games M6809 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/mikie.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/sn76496.h" -#include "includes/konamipt.h" -#include "includes/mikie.h" + +#include "screen.h" +#include "speaker.h" #define MIKIE_TIMER_RATE 512 diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp index 083edea51da..0c1d3ff91d2 100644 --- a/src/mame/drivers/mikro80.cpp +++ b/src/mame/drivers/mikro80.cpp @@ -15,7 +15,9 @@ #include "includes/mikro80.h" #include "sound/volt_reg.h" #include "sound/wave.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* Address maps */ static ADDRESS_MAP_START(mikro80_mem, AS_PROGRAM, 8, mikro80_state ) diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index d94a0387fc6..233fdbde003 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -10,22 +10,29 @@ #include "emu.h" +#include "includes/radio86.h" + #include "cpu/i8085/i8085.h" -#include "sound/wave.h" +#include "imagedev/cassette.h" #include "machine/i8255.h" #include "machine/pit8253.h" -#include "imagedev/cassette.h" -#include "formats/rk_cas.h" -#include "includes/radio86.h" +#include "sound/wave.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/rk_cas.h" + class mikrosha_state : public radio86_state { public: mikrosha_state(const machine_config &mconfig, device_type type, const char *tag) - : radio86_state(mconfig, type, tag), - m_cart(*this, "cartslot") - { } + : radio86_state(mconfig, type, tag) + , m_cart(*this, "cartslot") + { } + DECLARE_WRITE_LINE_MEMBER(mikrosha_pit_out2); I8275_DRAW_CHARACTER_MEMBER(display_pixels); DECLARE_MACHINE_RESET(mikrosha); diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp index 1de41c22541..52b0d120002 100644 --- a/src/mame/drivers/mil4000.cpp +++ b/src/mame/drivers/mil4000.cpp @@ -107,19 +107,22 @@ *******************************************************************************************/ -#define MAIN_CLOCK XTAL_12MHz -#define SEC_CLOCK XTAL_14_31818MHz - -#define CPU_CLOCK MAIN_CLOCK - - #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + #include "mil4000.lh" +#define MAIN_CLOCK XTAL_12MHz +#define SEC_CLOCK XTAL_14_31818MHz + +#define CPU_CLOCK MAIN_CLOCK + + class mil4000_state : public driver_device { public: diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp index 4d62449303c..6d4ad637a96 100644 --- a/src/mame/drivers/mini2440.cpp +++ b/src/mame/drivers/mini2440.cpp @@ -13,6 +13,9 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp index e8f71329de4..feac53e1b2b 100644 --- a/src/mame/drivers/miniboy7.cpp +++ b/src/mame/drivers/miniboy7.cpp @@ -132,18 +132,21 @@ *******************************************************************************/ - -#define MASTER_CLOCK XTAL_12_4725MHz /* 12.4725 MHz */ - #include "emu.h" #include "cpu/m6502/m6502.h" -#include "video/mc6845.h" #include "machine/6821pia.h" -#include "sound/ay8910.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #include "miniboy7.lh" +#define MASTER_CLOCK XTAL_12_4725MHz /* 12.4725 MHz */ + + class miniboy7_state : public driver_device { public: diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp index 4fb18b916ed..b2e11eb42d6 100644 --- a/src/mame/drivers/minivadr.cpp +++ b/src/mame/drivers/minivadr.cpp @@ -36,6 +36,7 @@ Notes: (all ICs shown) #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class minivadr_state : public driver_device diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index 10e7bc9749f..2a977a668f6 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -46,6 +46,8 @@ MR_01-.3A [a0b758aa] #include "sound/okim6295.h" #include "video/bufsprite.h" #include "video/decospr.h" +#include "screen.h" +#include "speaker.h" // mirage_state was also defined in mess/drivers/mirage.c class miragemj_state : public driver_device diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp index 01ca6221106..ff0a166a23b 100644 --- a/src/mame/drivers/mirax.cpp +++ b/src/mame/drivers/mirax.cpp @@ -104,6 +104,8 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class mirax_state : public driver_device diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp index 25571d051cd..b0dea93a3c0 100644 --- a/src/mame/drivers/missb2.cpp +++ b/src/mame/drivers/missb2.cpp @@ -18,10 +18,13 @@ OKI M6295 sound ROM dump is bad. */ #include "emu.h" +#include "includes/bublbobl.h" + #include "cpu/z80/z80.h" -#include "sound/okim6295.h" #include "sound/3526intf.h" -#include "includes/bublbobl.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class missb2_state : public bublbobl_state diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp index 11c4f6b3e8a..49196586e38 100644 --- a/src/mame/drivers/missile.cpp +++ b/src/mame/drivers/missile.cpp @@ -354,6 +354,8 @@ Super Missile Attack Board Layout #include "machine/watchdog.h" #include "sound/pokey.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class missile_state : public driver_device { diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 8f6c676a608..162e20c7eb5 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -118,13 +118,16 @@ mw-9.rom = ST M27C1001 / GFX #include "emu.h" +#include "includes/mitchell.h" + #include "cpu/z80/z80.h" #include "machine/kabuki.h" // needed for decoding functions only -#include "includes/mitchell.h" #include "sound/okim6295.h" #include "sound/3812intf.h" #include "sound/ym2413.h" #include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index 366849496d3..f964372558d 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -24,9 +24,12 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/mjkjidai.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/mjkjidai.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(mjkjidai_state::adpcm_w) diff --git a/src/mame/drivers/mjsenpu.cpp b/src/mame/drivers/mjsenpu.cpp index ba5c9dbe789..f2f7e99987b 100644 --- a/src/mame/drivers/mjsenpu.cpp +++ b/src/mame/drivers/mjsenpu.cpp @@ -44,9 +44,11 @@ #include "emu.h" #include "cpu/e132xs/e132xs.h" -#include "sound/okim6295.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class mjsenpu_state : public driver_device { diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp index 5b2f2f36e3e..8d31a66a739 100644 --- a/src/mame/drivers/mjsister.cpp +++ b/src/mame/drivers/mjsister.cpp @@ -13,6 +13,9 @@ #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + #define MCLK 12000000 diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp index 4018daf4c47..dff0ff8119b 100644 --- a/src/mame/drivers/mk14.cpp +++ b/src/mame/drivers/mk14.cpp @@ -33,12 +33,15 @@ ToDo: *********************************************************************************************************************************/ #include "emu.h" + #include "cpu/scmp/scmp.h" #include "imagedev/cassette.h" #include "machine/ins8154.h" #include "sound/dac.h" #include "sound/volt_reg.h" #include "sound/wave.h" +#include "speaker.h" + #include "mk14.lh" diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp index 7749e4dbf06..df887a44e7a 100644 --- a/src/mame/drivers/mk2.cpp +++ b/src/mame/drivers/mk2.cpp @@ -50,9 +50,12 @@ Usage: ******************************************************************************/ #include "emu.h" -#include "machine/mos6530.h" + #include "cpu/m6502/m6504.h" -#include "sound/speaker.h" +#include "machine/mos6530.h" +#include "sound/spkrdev.h" +#include "speaker.h" + #include "mk2.lh" @@ -60,10 +63,10 @@ class mk2_state : public driver_device { public: mk2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_speaker(*this, "speaker"), - m_miot(*this, "miot") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_speaker(*this, "speaker") + , m_miot(*this, "miot") { } required_device m_maincpu; diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp index 8442093fbf5..67cb4db34b8 100644 --- a/src/mame/drivers/mk85.cpp +++ b/src/mame/drivers/mk85.cpp @@ -21,14 +21,17 @@ Models: #include "emu.h" #include "cpu/t11/t11.h" +#include "screen.h" class mk85_state : public driver_device { public: mk85_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , - m_maincpu(*this, "maincpu") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + { + } virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp index d90142bf109..356be54115e 100644 --- a/src/mame/drivers/mk90.cpp +++ b/src/mame/drivers/mk90.cpp @@ -18,6 +18,7 @@ months for an average citizen. #include "emu.h" #include "cpu/t11/t11.h" +#include "screen.h" class mk90_state : public driver_device diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp index b9577d2df34..f7f3b626d84 100644 --- a/src/mame/drivers/mkit09.cpp +++ b/src/mame/drivers/mkit09.cpp @@ -33,9 +33,11 @@ Test Paste: #include "emu.h" #include "cpu/m6809/m6809.h" -#include "machine/6821pia.h" #include "imagedev/cassette.h" +#include "machine/6821pia.h" #include "sound/wave.h" +#include "speaker.h" + #include "mkit09.lh" diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index f7e78ffd41e..3e2f436ddff 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -44,14 +44,18 @@ ****************************************************************************/ #include "emu.h" +#include "includes/taitoipt.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" #include "cpu/tms32025/tms32025.h" #include "cpu/z80/z80.h" -#include "includes/taitoipt.h" #include "machine/z80ctc.h" -#include "audio/taitosnd.h" -#include "sound/ym2151.h" #include "sound/msm5205.h" +#include "sound/ym2151.h" + +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp index 89415a179bc..52548495a86 100644 --- a/src/mame/drivers/mmagic.cpp +++ b/src/mame/drivers/mmagic.cpp @@ -49,6 +49,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" //************************************************************************** diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp index 0c9a576d708..50c2cfda0e1 100644 --- a/src/mame/drivers/mmodular.cpp +++ b/src/mame/drivers/mmodular.cpp @@ -74,15 +74,18 @@ Bit 5+6 LED 1-8 enable */ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6502/m65c02.h" -#include "sound/beep.h" //#include "machine/mos6551.h" +#include "machine/nvram.h" +#include "sound/beep.h" #include "video/hd44780.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" -#include "machine/nvram.h" //static uint16_t unknown2_data = 0; // Berlin Pro 68020 diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp index 33de2f62680..a10f23e3bd0 100644 --- a/src/mame/drivers/model1.cpp +++ b/src/mame/drivers/model1.cpp @@ -631,12 +631,11 @@ Notes: */ #include "emu.h" -#include "cpu/v60/v60.h" -#include "video/segaic24.h" -#include "cpu/mb86233/mb86233.h" -#include "machine/nvram.h" #include "includes/model1.h" +#include "machine/nvram.h" +#include "speaker.h" + #include "vr.lh" diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 39cae4f09b1..e5c526655c9 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -114,17 +114,20 @@ */ #include "emu.h" -#include "machine/eepromser.h" -#include "machine/nvram.h" -#include "video/segaic24.h" +#include "includes/model2.h" + #include "cpu/i960/i960.h" #include "cpu/m68000/m68000.h" -#include "cpu/sharc/sharc.h" #include "cpu/mb86233/mb86233.h" #include "cpu/mb86235/mb86235.h" +#include "cpu/sharc/sharc.h" #include "cpu/z80/z80.h" +#include "machine/eepromser.h" +#include "machine/nvram.h" #include "sound/2612intf.h" -#include "includes/model2.h" +#include "video/segaic24.h" +#include "speaker.h" + enum { DSP_TYPE_TGP = 1, diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index be16bdf15f0..0706dad5f4b 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -732,12 +732,15 @@ JP4/5/6/7 - Jumpers to configure ROMs */ #include "emu.h" +#include "includes/model3.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/53c810.h" #include "machine/nvram.h" #include "machine/m3comm.h" -#include "includes/model3.h" +#include "speaker.h" + void model3_state::update_irq_state() { diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index a6ffd1694fc..dac0082e9a7 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -19,6 +19,8 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/keyboard.h" +#include "screen.h" + class modellot_state : public driver_device { diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp index d9990833a08..e52e3af829c 100644 --- a/src/mame/drivers/mogura.cpp +++ b/src/mame/drivers/mogura.cpp @@ -3,10 +3,14 @@ /* Mogura Desse */ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/konamipt.h" + +#include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + class mogura_state : public driver_device { diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp index 12b2ca6c2ee..8e3e218c493 100644 --- a/src/mame/drivers/mole.cpp +++ b/src/mame/drivers/mole.cpp @@ -52,6 +52,8 @@ #include "emu.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class mole_state : public driver_device diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp index b12b14b198b..1439eabf44b 100644 --- a/src/mame/drivers/molecular.cpp +++ b/src/mame/drivers/molecular.cpp @@ -47,11 +47,13 @@ TODO: ***********************************************************************************/ - #include "emu.h" #include "cpu/i86/i86.h" #include "cpu/z80/z80.h" //#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #define I86_CLOCK XTAL_24MHz #define Z80_CLOCK XTAL_16MHz diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp index 3feb5c7fa37..1fedaa73dda 100644 --- a/src/mame/drivers/momoko.cpp +++ b/src/mame/drivers/momoko.cpp @@ -46,11 +46,14 @@ Stephh's notes (based on the game Z80 code and some tests) : *****************************************************************************/ #include "emu.h" +#include "includes/momoko.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/momoko.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(momoko_state::momoko_bg_read_bank_w) diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp index a2210d1e53e..f8dc3071cdc 100644 --- a/src/mame/drivers/monty.cpp +++ b/src/mame/drivers/monty.cpp @@ -30,8 +30,10 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "sound/spkrdev.h" #include "video/sed1520.h" -#include "sound/speaker.h" +#include "screen.h" +#include "speaker.h" class monty_state : public driver_device diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp index 6b36dcc15f7..ed09e7d9fb4 100644 --- a/src/mame/drivers/monzagp.cpp +++ b/src/mame/drivers/monzagp.cpp @@ -33,6 +33,7 @@ Lower board (MGP_01): #include "cpu/mcs48/mcs48.h" #include "machine/nvram.h" #include "video/resnet.h" +#include "screen.h" #include "monzagp.lh" diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp index bb6f2344e54..117c3c337bc 100644 --- a/src/mame/drivers/moo.cpp +++ b/src/mame/drivers/moo.cpp @@ -115,14 +115,16 @@ Bucky: ***************************************************************************/ #include "emu.h" +#include "includes/moo.h" +#include "includes/konamipt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/ym2151.h" #include "sound/okim6295.h" #include "sound/k054539.h" -#include "includes/konamipt.h" -#include "includes/moo.h" +#include "speaker.h" #define MOO_DEBUG 0 #define MOO_DMADELAY (100) diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp index edbbcff08f9..fa8284734a6 100644 --- a/src/mame/drivers/mosaic.cpp +++ b/src/mame/drivers/mosaic.cpp @@ -10,9 +10,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/mosaic.h" + #include "cpu/z180/z180.h" #include "sound/2203intf.h" -#include "includes/mosaic.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(mosaic_state::protection_w) { diff --git a/src/mame/drivers/mouser.cpp b/src/mame/drivers/mouser.cpp index a64e53aa513..d1a096749f5 100644 --- a/src/mame/drivers/mouser.cpp +++ b/src/mame/drivers/mouser.cpp @@ -15,9 +15,13 @@ *******************************************************************************/ #include "emu.h" +#include "includes/mouser.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/mouser.h" +#include "screen.h" +#include "speaker.h" + /* Mouser has external masking circuitry around * the NMI input on the main CPU */ diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index 378252a0563..53911636fb6 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -50,6 +50,8 @@ #include "emu.h" #include "includes/mpf1.h" +#include "speaker.h" + #include "mpf1.lh" #include "mpf1b.lh" #include "mpf1p.lh" diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp index 31e0b05bf44..dfd26114196 100644 --- a/src/mame/drivers/mpu12wbk.cpp +++ b/src/mame/drivers/mpu12wbk.cpp @@ -205,14 +205,16 @@ *****************************************************************************************/ - -#define MASTER_CLOCK XTAL_8MHz - #include "emu.h" #include "cpu/m6809/m6809.h" -#include "video/mc6845.h" -#include "sound/ay8910.h" //#include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_8MHz class mpu12wbk_state : public driver_device diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp index ebda900681e..f889fa3af7f 100644 --- a/src/mame/drivers/mpu4.cpp +++ b/src/mame/drivers/mpu4.cpp @@ -260,12 +260,12 @@ TODO: - Distinguish door switches using manual - Per game inputs not currently supported, may need to do something about DIPs, inverted lines etc. ***********************************************************************************************************/ #include "emu.h" - #include "includes/mpu4.h" - #include "video/awpvid.h" //Fruit Machines Only +#include "speaker.h" + #include "mpu4.lh" #include "mpu4ext.lh" diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp index 37063826098..8327c7e983f 100644 --- a/src/mame/drivers/mpu4dealem.cpp +++ b/src/mame/drivers/mpu4dealem.cpp @@ -15,17 +15,20 @@ the Deal 'Em board design, rather than the one they ultimately used, suggesting #include "emu.h" #include "includes/mpu4.h" + #include "video/resnet.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class mpu4dealem_state : public mpu4_state { public: mpu4dealem_state(const machine_config &mconfig, device_type type, const char *tag) - : mpu4_state(mconfig, type, tag), - m_dealem_videoram(*this, "dealem_videoram"), - m_gfxdecode(*this, "gfxdecode") + : mpu4_state(mconfig, type, tag) + , m_dealem_videoram(*this, "dealem_videoram") + , m_gfxdecode(*this, "gfxdecode") { } diff --git a/src/mame/drivers/mpu4plasma.cpp b/src/mame/drivers/mpu4plasma.cpp index a6675fc3b6e..ef2f442f5c2 100644 --- a/src/mame/drivers/mpu4plasma.cpp +++ b/src/mame/drivers/mpu4plasma.cpp @@ -7,7 +7,10 @@ #include "emu.h" #include "includes/mpu4.h" + #include "cpu/m68000/m68000.h" +#include "screen.h" + #include "mpu4plasma.lh" diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index 09ea564b857..18d1e439d4e 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -176,26 +176,33 @@ TODO: approximation of the SCN2674 scanline logic, but this is perhaps better served as a proper device. ***********************************************************************************************************/ #include "emu.h" +#include "includes/mpu4.h" + +#include "cpu/m6809/m6809.h" +#include "cpu/m68000/m68000.h" + #include "machine/6821pia.h" #include "machine/6840ptm.h" +#include "machine/6850acia.h" +#include "machine/meters.h" #include "machine/nvram.h" +#include "machine/roc10937.h" +#include "machine/steppers.h" -#include "cpu/m6809/m6809.h" #include "sound/ay8910.h" #include "sound/okim6376.h" -#include "sound/ym2413.h" +#include "sound/saa1099.h" #include "sound/upd7759.h" -#include "machine/steppers.h" -#include "machine/roc10937.h" -#include "machine/meters.h" -#include "video/scn2674.h" +#include "sound/ym2413.h" + #include "video/ef9369.h" -#include "cpu/m68000/m68000.h" -#include "machine/6850acia.h" -#include "sound/saa1099.h" +#include "video/scn2674.h" + +#include "screen.h" +#include "speaker.h" + #include "crmaze2p.lh" #include "crmaze4p.lh" -#include "includes/mpu4.h" struct bt471_t diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp index 62227614415..af1e49b57e4 100644 --- a/src/mame/drivers/mpu5.cpp +++ b/src/mame/drivers/mpu5.cpp @@ -44,7 +44,10 @@ #include "emu.h" +#include "machine/68340.h" #include "machine/sec.h" +#include "speaker.h" + #include "mpu5.lh" // MFME2MAME layouts: @@ -196,8 +199,6 @@ #include "m5xfact11.lh" -#include "machine/68340.h" - class mpu5_state : public driver_device { public: diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp index 064e66bd19d..47e009cd4b4 100644 --- a/src/mame/drivers/mquake.cpp +++ b/src/mame/drivers/mquake.cpp @@ -35,20 +35,22 @@ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/amiga.h" -#include "sound/es5503.h" + +#include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/amigafdc.h" +#include "sound/es5503.h" +#include "speaker.h" class mquake_state : public amiga_state { public: mquake_state(const machine_config &mconfig, device_type type, const char *tag) - : amiga_state(mconfig, type, tag), - m_es5503(*this, "es5503"), - m_es5503_rom(*this, "es5503") + : amiga_state(mconfig, type, tag), + m_es5503(*this, "es5503"), + m_es5503_rom(*this, "es5503") { } DECLARE_DRIVER_INIT(mquake); diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp index a95c42c71ec..8501dde3262 100644 --- a/src/mame/drivers/mrdo.cpp +++ b/src/mame/drivers/mrdo.cpp @@ -22,9 +22,12 @@ There's a chance that certain bootlegs might have the different 8/20 MHz XTALS. ***************************************************************************/ #include "emu.h" +#include "includes/mrdo.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/mrdo.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_8_2MHz diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp index ac14b0ae87c..99ba8b6109e 100644 --- a/src/mame/drivers/mrflea.cpp +++ b/src/mame/drivers/mrflea.cpp @@ -66,9 +66,11 @@ Stephh's notes (based on the games Z80 code and some tests) : ******************************************************************/ #include "emu.h" +#include "includes/mrflea.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/mrflea.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp index 66a9333be43..ea3065cc1a1 100644 --- a/src/mame/drivers/mrgame.cpp +++ b/src/mame/drivers/mrgame.cpp @@ -31,7 +31,6 @@ ToDo: *****************************************************************************************/ - #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" @@ -41,6 +40,9 @@ ToDo: #include "sound/tms5220.h" #include "sound/volt_reg.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" + class mrgame_state : public driver_device { diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp index 57f09a19316..23bf9a6c0db 100644 --- a/src/mame/drivers/mrjong.cpp +++ b/src/mame/drivers/mrjong.cpp @@ -46,9 +46,12 @@ ROMs 6A, 7A, 8A, 9A: 2764 ***************************************************************************/ #include "emu.h" +#include "includes/mrjong.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/mrjong.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp index 957fe421217..a4bcd1c1ad5 100644 --- a/src/mame/drivers/ms0515.cpp +++ b/src/mame/drivers/ms0515.cpp @@ -26,7 +26,6 @@ #include "bus/rs232/rs232.h" #include "cpu/t11/t11.h" -#include "formats/ms0515_dsk.h" #include "machine/clock.h" #include "machine/i8251.h" #include "machine/i8255.h" @@ -34,9 +33,13 @@ #include "machine/pit8253.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" +#include "screen.h" + +#include "formats/ms0515_dsk.h" + #include "ms0515.lh" diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index b1007f5e45e..e97a1f14543 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -169,11 +169,13 @@ Super Strong Warriors /********** BITS & PIECES **********/ #include "emu.h" +#include "includes/ms32.h" +#include "machine/jalcrpt.h" + #include "cpu/z80/z80.h" #include "cpu/v60/v60.h" #include "sound/ymf271.h" -#include "machine/jalcrpt.h" -#include "includes/ms32.h" +#include "speaker.h" /********** READ INPUTS **********/ diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index 48ec76311a2..9c2977cce73 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -9,10 +9,14 @@ ****************************************************************************/ #include "emu.h" +#include "includes/msisaac.h" + #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" -#include "includes/msisaac.h" +#include "screen.h" +#include "speaker.h" + /* TO DO: diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp index da34f317971..0c2b515fee5 100644 --- a/src/mame/drivers/mstation.cpp +++ b/src/mame/drivers/mstation.cpp @@ -30,9 +30,11 @@ #include "cpu/z80/z80.h" #include "machine/bankdev.h" #include "machine/intelfsh.h" -#include "machine/rp5c01.h" #include "machine/ram.h" +#include "machine/rp5c01.h" #include "rendlay.h" +#include "screen.h" + class mstation_state : public driver_device { diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index f8d672f5ba0..ab5ea0e9a42 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -534,7 +534,9 @@ PCB Layouts missing #include "machine/msx_s1985.h" #include "machine/msx_systemflags.h" #include "sound/volt_reg.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" static ADDRESS_MAP_START ( msx_memory_map, AS_PROGRAM, 8, msx_state ) diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index a2d69798559..99fff4172dd 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -23,17 +23,21 @@ #include "emu.h" #include "includes/mtx.h" + +#include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "imagedev/cassette.h" -#include "machine/ram.h" #include "imagedev/snapquik.h" -#include "bus/centronics/ctronics.h" +#include "machine/ram.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" -#include "video/tms9928a.h" #include "sound/sn76496.h" +#include "video/tms9928a.h" + #include "softlist.h" +#include "speaker.h" + /*************************************************************************** MEMORY MAPS diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp index 2b61c560ce1..29d713fab2f 100644 --- a/src/mame/drivers/mugsmash.cpp +++ b/src/mame/drivers/mugsmash.cpp @@ -42,11 +42,15 @@ behavior we use . */ #include "emu.h" +#include "includes/mugsmash.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/mugsmash.h" +#include "screen.h" +#include "speaker.h" + WRITE16_MEMBER(mugsmash_state::mugsmash_reg2_w) { diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp index b06bc7d9f41..431f6efeed2 100644 --- a/src/mame/drivers/multfish.cpp +++ b/src/mame/drivers/multfish.cpp @@ -184,6 +184,9 @@ below are simply made to the banking address to run on other boards. #include "emu.h" #include "includes/multfish.h" +#include "speaker.h" + + TILE_GET_INFO_MEMBER(igrosoft_gamble_state::get_igrosoft_gamble_tile_info) { int code = m_vid[tile_index*2+0x0000] | (m_vid[tile_index*2+0x0001] << 8); diff --git a/src/mame/drivers/multi16.cpp b/src/mame/drivers/multi16.cpp index 5a5911f6c7b..3193c2e9e23 100644 --- a/src/mame/drivers/multi16.cpp +++ b/src/mame/drivers/multi16.cpp @@ -8,8 +8,9 @@ #include "emu.h" #include "cpu/i86/i86.h" -#include "video/mc6845.h" #include "machine/pic8259.h" +#include "video/mc6845.h" +#include "screen.h" class multi16_state : public driver_device diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp index 5f9c0603af6..61c5291ff11 100644 --- a/src/mame/drivers/multi8.cpp +++ b/src/mame/drivers/multi8.cpp @@ -16,10 +16,12 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/2203intf.h" -#include "video/mc6845.h" #include "machine/i8255.h" +#include "sound/2203intf.h" #include "sound/beep.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class multi8_state : public driver_device @@ -32,7 +34,7 @@ public: , m_ppi(*this, "ppi8255_0") , m_crtc(*this, "crtc") , m_beeper(*this, "beeper") - { } + { } DECLARE_WRITE8_MEMBER(multi8_6845_w); DECLARE_READ8_MEMBER(key_input_r); diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp index 87c92d7851f..dee9c71d0fb 100644 --- a/src/mame/drivers/multigam.cpp +++ b/src/mame/drivers/multigam.cpp @@ -109,6 +109,8 @@ Eproms are 27512,27010,274001 #include "emu.h" #include "cpu/m6502/n2a03.h" #include "video/ppu2c0x.h" +#include "screen.h" +#include "speaker.h" class multigam_state : public driver_device diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp index e0bc16b6530..2b59c1520b2 100644 --- a/src/mame/drivers/munchmo.cpp +++ b/src/mame/drivers/munchmo.cpp @@ -26,9 +26,12 @@ Stephh's notes (based on the game Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/munchmo.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/munchmo.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp index 9935e42dea5..fce442574e8 100644 --- a/src/mame/drivers/murogem.cpp +++ b/src/mame/drivers/murogem.cpp @@ -108,9 +108,11 @@ val (hex): 27 20 22 04 26 00 20 20 00 07 00 00 80 00 00 00 ns #include "emu.h" #include "cpu/m6800/m6800.h" -#include "video/mc6845.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class murogem_state : public driver_device diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp index e2b827548da..e8f19e19b69 100644 --- a/src/mame/drivers/murogmbl.cpp +++ b/src/mame/drivers/murogmbl.cpp @@ -39,6 +39,8 @@ Dumped: 06/04/2009 f205v #include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" class murogmbl_state : public driver_device diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp index 0080e6dcf29..5110bba8a7c 100644 --- a/src/mame/drivers/mustache.cpp +++ b/src/mame/drivers/mustache.cpp @@ -30,10 +30,13 @@ YM2151: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/mustache.h" #include "audio/t5182.h" +#include "cpu/z80/z80.h" +#include "speaker.h" + + #define XTAL1 14318180 #define XTAL2 18432000 #define XTAL3 12000000 diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp index 6d34a3363e8..d97533bda3b 100644 --- a/src/mame/drivers/mwarr.cpp +++ b/src/mame/drivers/mwarr.cpp @@ -43,6 +43,9 @@ Notes: #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_12MHz #define SOUND_CLOCK XTAL_45MHz diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp index 861eb19f318..442013d9283 100644 --- a/src/mame/drivers/mx2178.cpp +++ b/src/mame/drivers/mx2178.cpp @@ -22,10 +22,12 @@ #include "emu.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" #include "machine/6850acia.h" #include "machine/clock.h" #include "machine/keyboard.h" +#include "video/mc6845.h" +#include "screen.h" + class mx2178_state : public driver_device { diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp index 8b6f6b00a40..fe7446f27b1 100644 --- a/src/mame/drivers/myb3k.cpp +++ b/src/mame/drivers/myb3k.cpp @@ -14,8 +14,9 @@ #include "emu.h" #include "cpu/i86/i86.h" -#include "video/mc6845.h" #include "machine/wd_fdc.h" +#include "video/mc6845.h" +#include "screen.h" class myb3k_state : public driver_device { diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp index 6b736e15afd..600999a942e 100644 --- a/src/mame/drivers/mycom.cpp +++ b/src/mame/drivers/mycom.cpp @@ -50,13 +50,15 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "machine/i8255.h" -#include "sound/sn76496.h" #include "imagedev/cassette.h" -#include "sound/wave.h" +#include "machine/i8255.h" #include "machine/msm5832.h" #include "machine/wd_fdc.h" +#include "sound/sn76496.h" +#include "sound/wave.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class mycom_state : public driver_device @@ -78,7 +80,7 @@ public: , m_palette(*this, "palette") , m_p_videoram(*this, "vram") , m_p_chargen(*this, "chargen") - { } + { } DECLARE_READ8_MEMBER(mycom_upper_r); DECLARE_WRITE8_MEMBER(mycom_upper_w); diff --git a/src/mame/drivers/mystston.cpp b/src/mame/drivers/mystston.cpp index abe70753f9c..5fec3ea95cb 100644 --- a/src/mame/drivers/mystston.cpp +++ b/src/mame/drivers/mystston.cpp @@ -16,9 +16,11 @@ ***************************************************************************/ #include "emu.h" +#include "includes/mystston.h" + #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" -#include "includes/mystston.h" +#include "speaker.h" diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp index 3d2ec6f3c07..6a469728c42 100644 --- a/src/mame/drivers/mystwarr.cpp +++ b/src/mame/drivers/mystwarr.cpp @@ -133,14 +133,16 @@ we have no way of knowing which is the later/corrected version. **************************************************************************/ #include "emu.h" -#include "video/k053250.h" +#include "includes/mystwarr.h" #include "includes/konamigx.h" +#include "includes/konamipt.h" +#include "video/k053250.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/k054539.h" -#include "includes/konamipt.h" -#include "includes/mystwarr.h" +#include "speaker.h" diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp index 5a2e6b8554b..ea048d9eda0 100644 --- a/src/mame/drivers/myvision.cpp +++ b/src/mame/drivers/myvision.cpp @@ -24,12 +24,17 @@ #include "emu.h" + #include "cpu/z80/z80.h" -#include "video/tms9928a.h" #include "sound/ay8910.h" +#include "video/tms9928a.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" + #include "softlist.h" +#include "speaker.h" + class myvision_state : public driver_device { diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index 93540e603e0..823ee098c44 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -18,19 +18,25 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "machine/z80pio.h" +#include "imagedev/cassette.h" +#include "imagedev/flopdrv.h" #include "machine/i8255.h" -#include "machine/wd_fdc.h" #include "machine/pit8253.h" +#include "machine/rp5c15.h" +#include "machine/wd_fdc.h" +#include "machine/z80pio.h" #include "sound/beep.h" #include "sound/wave.h" -#include "machine/rp5c15.h" -#include "imagedev/cassette.h" -#include "imagedev/flopdrv.h" + +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + #include "formats/2d_dsk.h" #include "formats/mz_cas.h" -#include "softlist.h" + #define MASTER_CLOCK XTAL_17_73447MHz/5 /* TODO: was 4 MHz, but otherwise cassette won't work due of a bug with MZF support ... */ diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index c7fb550dd22..0de63ed8a50 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -46,15 +46,17 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/z80pio.h" -#include "machine/z80dart.h" #include "machine/i8255.h" -#include "machine/wd_fdc.h" #include "machine/pit8253.h" +#include "machine/rp5c15.h" +#include "machine/wd_fdc.h" +#include "machine/z80dart.h" +#include "machine/z80pio.h" #include "sound/2203intf.h" #include "sound/beep.h" -#include "machine/rp5c15.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" //#include "imagedev/cassette.h" #include "imagedev/flopdrv.h" diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp index 20f46da0cc7..badf86c6d19 100644 --- a/src/mame/drivers/mz3500.cpp +++ b/src/mame/drivers/mz3500.cpp @@ -35,6 +35,8 @@ #include "machine/pit8253.h" #include "sound/beep.h" #include "video/upd7220.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_8MHz diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp index 4314226b988..c33b3943411 100644 --- a/src/mame/drivers/mz6500.cpp +++ b/src/mame/drivers/mz6500.cpp @@ -12,6 +12,7 @@ #include "cpu/i86/i86.h" #include "machine/upd765.h" #include "video/upd7220.h" +#include "screen.h" class mz6500_state : public driver_device { diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index ed715c4acb0..93125aac2df 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -81,19 +81,18 @@ #include "emu.h" #include "includes/mz700.h" + #include "cpu/z80/z80.h" -#include "machine/i8255.h" -#include "machine/pit8253.h" -#include "machine/z80pio.h" #include "machine/74145.h" -#include "bus/centronics/ctronics.h" #include "sound/sn76496.h" -#include "sound/speaker.h" #include "sound/wave.h" -#include "imagedev/cassette.h" -#include "machine/ram.h" -#include "formats/mz_cas.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/mz_cas.h" + /*************************************************************************** TIMER DEVICE CALLBACKS diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp index 13f1eb7d50e..fda11575bd4 100644 --- a/src/mame/drivers/mz80.cpp +++ b/src/mame/drivers/mz80.cpp @@ -30,6 +30,10 @@ MZ80B #include "emu.h" #include "includes/mz80.h" + +#include "screen.h" +#include "speaker.h" + #include "formats/mz_cas.h" diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index 09b736400c2..7b368074370 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -10,14 +10,17 @@ */ #include "emu.h" +#include "includes/n64.h" + #include "cpu/rsp/rsp.h" #include "cpu/mips/mips3.h" #include "sound/dmadac.h" -#include "includes/n64.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "imagedev/harddriv.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class n64_mess_state : public n64_state { diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp index 051aededa15..14ac132d6dc 100644 --- a/src/mame/drivers/nakajies.cpp +++ b/src/mame/drivers/nakajies.cpp @@ -274,8 +274,10 @@ disabled). Perhaps power on/off related?? #include "emu.h" #include "cpu/nec/nec.h" #include "machine/rp5c01.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" #define LOG 0 diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index 1b0ffebe86d..c42cae2be32 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -158,13 +158,16 @@ OSC3: 48.384MHz */ #include "emu.h" +#include "includes/namcofl.h" #include "includes/namcoic.h" + #include "cpu/i960/i960.h" #include "sound/c352.h" #include "machine/namcomcu.h" #include "machine/nvram.h" +#include "speaker.h" + #include "namcofl.lh" -#include "includes/namcofl.h" READ32_MEMBER(namcofl_state::fl_unk1_r) diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp index 575248ac9fd..93dd8adc6e5 100644 --- a/src/mame/drivers/namcona1.cpp +++ b/src/mame/drivers/namcona1.cpp @@ -166,9 +166,10 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/namcona1.h" +#include "cpu/m68000/m68000.h" #include "machine/namcomcu.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_50_113MHz diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp index cacefc14731..1f5e2ff2aba 100644 --- a/src/mame/drivers/namconb1.cpp +++ b/src/mame/drivers/namconb1.cpp @@ -271,12 +271,16 @@ GFX: Custom 145 ( 80 pin PQFP) Custom 169 (120 pin PQFP) */ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/namconb1.h" #include "includes/namcoic.h" + +#include "cpu/m68000/m68000.h" #include "machine/namcomcu.h" #include "sound/c352.h" +#include "speaker.h" + + #define MASTER_CLOCK XTAL_48_384MHz #define ENABLE_LOGGING (0) diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp index ff0662c4c91..2123d28d516 100644 --- a/src/mame/drivers/namcond1.cpp +++ b/src/mame/drivers/namcond1.cpp @@ -69,11 +69,15 @@ Notes: *************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" -#include "cpu/h8/h83002.h" #include "includes/namcond1.h" -#include "sound/c352.h" + +#include "cpu/h8/h83002.h" +#include "cpu/m68000/m68000.h" #include "machine/at28c16.h" +#include "sound/c352.h" +#include "screen.h" +#include "speaker.h" + /*************************************************************/ diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp index b37e15ea9a8..c2088b7db6f 100644 --- a/src/mame/drivers/namcops2.cpp +++ b/src/mame/drivers/namcops2.cpp @@ -873,6 +873,7 @@ Notes: #include "emu.h" #include "cpu/mips/mips3.h" #include "cpu/mips/r3000.h" +#include "screen.h" class namcops2_state : public driver_device diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index 3c7a6452a6c..0853def98ec 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -337,11 +337,14 @@ C - uses sub board with support for player 3 and 4 controls #include "emu.h" #include "includes/namcos1.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6800.h" #include "machine/nvram.h" #include "sound/volt_reg.h" #include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" /**********************************************************************/ diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp index b9f7ae9a3ef..69c5feacae2 100644 --- a/src/mame/drivers/namcos10.cpp +++ b/src/mame/drivers/namcos10.cpp @@ -267,9 +267,13 @@ Kono Tako 10021 Ver.A KC034A 8E, 8D */ #include "emu.h" +#include "machine/ns10crypt.h" + #include "cpu/psx/psx.h" +#include "machine/ram.h" #include "video/psx.h" -#include "machine/ns10crypt.h" +#include "speaker.h" + class namcos10_state : public driver_device { diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp index dbc273e8397..c4d6b45cf80 100644 --- a/src/mame/drivers/namcos11.cpp +++ b/src/mame/drivers/namcos11.cpp @@ -295,11 +295,13 @@ Pin 22 Solder Side - Gun 2 Trigger #include "emu.h" #include "cpu/psx/psx.h" -#include "video/psx.h" #include "machine/at28c16.h" #include "machine/namcomcu.h" #include "machine/ns11prot.h" +#include "machine/ram.h" #include "sound/c352.h" +#include "video/psx.h" +#include "speaker.h" #define C76_SPEEDUP ( 1 ) /* sound cpu idle skipping */ #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp index 747ee95237f..1186aac3cfc 100644 --- a/src/mame/drivers/namcos12.cpp +++ b/src/mame/drivers/namcos12.cpp @@ -1090,9 +1090,13 @@ The lever must be wired to analog port 0 (pin B22 parts side) of the Namco 48-wa #include "cpu/h8/h83337.h" #include "video/psx.h" #include "machine/at28c16.h" +#include "machine/ram.h" #include "sound/c352.h" #include "machine/rtc4543.h" #include "machine/namco_settings.h" +#include "screen.h" +#include "speaker.h" + #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 84044e5c1a0..dc73bbb17f7 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -446,14 +446,16 @@ $a00000 checks have been seen on the Final Lap boards. ***************************************************************************/ #include "emu.h" +#include "includes/namcos2.h" +#include "includes/namcoic.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6805/m6805.h" -#include "includes/namcos2.h" #include "cpu/m6809/m6809.h" -#include "includes/namcoic.h" #include "machine/nvram.h" #include "sound/ym2151.h" #include "sound/c140.h" +#include "speaker.h" #include "finallap.lh" diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index 808cbb501b0..c6c75b97772 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -519,15 +519,18 @@ Filter Board */ #include "emu.h" +#include "includes/namcos21.h" +#include "includes/namcoic.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6805/m6805.h" #include "cpu/m6809/m6809.h" #include "cpu/tms32025/tms32025.h" -#include "includes/namcoic.h" #include "sound/ym2151.h" -#include "sound/c140.h" -#include "includes/namcos21.h" #include "machine/nvram.h" +#include "sound/c140.h" +#include "speaker.h" + #define PTRAM_SIZE 0x20000 // TODO: basic parameters to get 60.606060 Hz, x2 is for interlace diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 3dae90a4618..aae96ea6c37 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -1158,10 +1158,13 @@ #include "emu.h" #include "includes/namcos22.h" + #include "cpu/m68000/m68000.h" #include "cpu/tms32025/tms32025.h" #include "machine/namcomcu.h" #include "sound/c352.h" +#include "speaker.h" + #define SS22_MASTER_CLOCK (XTAL_49_152MHz) /* info from Guru */ diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index b79ac26831f..54c3bd4fb02 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -1255,16 +1255,19 @@ Notes: */ #include "emu.h" -#include -#include "video/poly.h" -#include "cpu/mips/mips3.h" #include "cpu/h8/h83002.h" #include "cpu/h8/h83337.h" +#include "cpu/mips/mips3.h" #include "cpu/sh2/sh2.h" -#include "sound/c352.h" +#include "machine/namco_settings.h" #include "machine/nvram.h" #include "machine/rtc4543.h" -#include "machine/namco_settings.h" +#include "sound/c352.h" +#include "video/poly.h" +#include "speaker.h" + +#include + #define JVSCLOCK (XTAL_14_7456MHz) diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index e4455cac255..f3939ef636c 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -175,11 +175,15 @@ TODO: *******************************************************************/ #include "emu.h" +#include "includes/namcos86.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6800.h" #include "sound/ym2151.h" #include "sound/n63701x.h" -#include "includes/namcos86.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(namcos86_state::bankswitch1_w) { diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index 95571f39104..91f1754a7ce 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -9,14 +9,18 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "machine/z80pio.h" -#include "machine/z80dart.h" -#include "machine/z80ctc.h" +#include "machine/ram.h" #include "machine/upd765.h" +#include "machine/z80ctc.h" +#include "machine/z80dart.h" +#include "machine/z80pio.h" + #include "formats/nanos_dsk.h" -#include "machine/ram.h" + +#include "screen.h" class nanos_state : public driver_device diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index f73b07088db..d175262dc6c 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -1572,6 +1572,9 @@ Premier Eleven #include "emu.h" #include "includes/naomi.h" +#include "screen.h" +#include "speaker.h" + #define CPU_CLOCK (200000000) diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index 29908fb149e..adb296ff2e5 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -9,16 +9,21 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "machine/ram.h" -#include "machine/z80pio.h" -#include "machine/ay31015.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" +#include "machine/ay31015.h" +#include "machine/ram.h" +#include "machine/z80pio.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "bus/nasbus/nasbus.h" + #include "softlist.h" +#include "screen.h" + //************************************************************************** // CONSTANTS/MACROS diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp index 21ee2d04a88..0d60bc8e915 100644 --- a/src/mame/drivers/naughtyb.cpp +++ b/src/mame/drivers/naughtyb.cpp @@ -105,9 +105,11 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/naughtyb.h" + #include "cpu/z80/z80.h" #include "sound/tms36xx.h" -#include "includes/naughtyb.h" +#include "speaker.h" #define CLOCK_XTAL 12000000 diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index 9ab21bbf0b4..78d7ce180de 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -32,6 +32,7 @@ TODO: #include "emu.h" #include "includes/nbmj8688.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/3812intf.h" @@ -39,6 +40,9 @@ TODO: #include "sound/dac.h" #include "sound/volt_reg.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + #include "nbmj8688.lh" diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp index ee393bce6a9..1a69bb994e4 100644 --- a/src/mame/drivers/nbmj8891.cpp +++ b/src/mame/drivers/nbmj8891.cpp @@ -42,12 +42,14 @@ TODO: #include "emu.h" #include "includes/nbmj8891.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/3812intf.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" DRIVER_INIT_MEMBER(nbmj8891_state,gionbana) diff --git a/src/mame/drivers/nbmj8900.cpp b/src/mame/drivers/nbmj8900.cpp index 29712b4136b..2447bbe193e 100644 --- a/src/mame/drivers/nbmj8900.cpp +++ b/src/mame/drivers/nbmj8900.cpp @@ -27,10 +27,12 @@ TODO: #include "emu.h" #include "includes/nbmj8900.h" + #include "cpu/z80/z80.h" #include "sound/3812intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" DRIVER_INIT_MEMBER(nbmj8900_state,ohpaipee) diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp index 3f53ef95270..a4e60c609d5 100644 --- a/src/mame/drivers/nbmj8991.cpp +++ b/src/mame/drivers/nbmj8991.cpp @@ -32,12 +32,14 @@ Notes: #include "emu.h" #include "includes/nbmj8991.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/3812intf.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" WRITE8_MEMBER(nbmj8991_state::soundbank_w) diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp index 53ed32df3f8..742075e35dd 100644 --- a/src/mame/drivers/nbmj9195.cpp +++ b/src/mame/drivers/nbmj9195.cpp @@ -24,11 +24,13 @@ Notes: #include "emu.h" #include "includes/nbmj9195.h" #include "includes/nb1413m3.h" // needed for mahjong input controller + #include "machine/gen_latch.h" #include "machine/nvram.h" #include "sound/3812intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" void nbmj9195_state::machine_start() diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp index 301a49e5b9f..f63b8650666 100644 --- a/src/mame/drivers/nc.cpp +++ b/src/mame/drivers/nc.cpp @@ -96,15 +96,16 @@ ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/nc.h" + +#include "cpu/z80/z80.h" #include "machine/mc146818.h" /* for NC200 real time clock */ -#include "machine/rp5c01.h" /* for NC100 real time clock */ +#include "machine/rp5c01.h" /* for NC100 real time clock */ #include "machine/upd765.h" /* for NC200 disk drive interface */ #include "formats/pc_dsk.h" /* for NC200 disk image */ -#include "sound/beep.h" -#include "machine/ram.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" #define VERBOSE 0 diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index 515efc4c294..faea4873a3a 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -49,6 +49,9 @@ So this is the correct behavior of real hardware, not an emulation bug. ***************************************************************************/ #include "emu.h" +#include "includes/nemesis.h" +#include "includes/konamipt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" @@ -57,8 +60,7 @@ So this is the correct behavior of real hardware, not an emulation bug. #include "sound/ym2151.h" #include "sound/3812intf.h" #include "sound/k051649.h" -#include "includes/nemesis.h" -#include "includes/konamipt.h" +#include "speaker.h" #include "konamigt.lh" diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index 6be7974edc3..dc42437997a 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -463,9 +463,12 @@ #include "emu.h" #include "includes/neogeo.h" + #include "machine/nvram.h" #include "machine/watchdog.h" #include "softlist.h" +#include "speaker.h" + #include "neogeo.lh" diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index d26bb9a2ba2..4eb4f0bdafc 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -25,8 +25,10 @@ #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/nvram.h" -#include "sound/2610intf.h" #include "machine/upd1990a.h" +#include "sound/2610intf.h" +#include "screen.h" +#include "speaker.h" class neoprint_state : public driver_device diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp index 4090216a4f4..952291942ae 100644 --- a/src/mame/drivers/neptunp2.cpp +++ b/src/mame/drivers/neptunp2.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "cpu/i86/i186.h" +#include "screen.h" +#include "speaker.h" class neptunp2_state : public driver_device diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp index 5c894331c59..2e22e40df43 100644 --- a/src/mame/drivers/nes.cpp +++ b/src/mame/drivers/nes.cpp @@ -14,8 +14,12 @@ #include "emu.h" #include "includes/nes.h" + #include "cpu/m6502/n2a03.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + WRITE8_MEMBER(nes_state::nes_vh_sprite_dma_w) { diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index 80fb3dcc764..54f12085371 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -50,6 +50,9 @@ #include "emu.h" #include "includes/newbrain.h" + +#include "screen.h" + #include "newbrain.lh" #include "newbraina.lh" diff --git a/src/mame/drivers/news.cpp b/src/mame/drivers/news.cpp index 5bca38ad047..603b631dc02 100644 --- a/src/mame/drivers/news.cpp +++ b/src/mame/drivers/news.cpp @@ -16,9 +16,12 @@ driver by David Haywood */ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/news.h" + +#include "cpu/z80/z80.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( news_map, AS_PROGRAM, 8, news_state ) diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index 40d04fa363a..586e3cedbf9 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -27,12 +27,16 @@ #include "emu.h" #include "includes/next.h" -#include "formats/pc_dsk.h" -#include "formats/mfi_dsk.h" + #include "machine/nscsi_cd.h" #include "machine/nscsi_hd.h" +#include "screen.h" #include "softlist.h" +#include "formats/mfi_dsk.h" +#include "formats/pc_dsk.h" + + uint32_t next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { // We don't handle partial updates, but we don't generate them either :-) diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp index 53b4385462e..e8430db92d0 100644 --- a/src/mame/drivers/nexus3d.cpp +++ b/src/mame/drivers/nexus3d.cpp @@ -17,6 +17,7 @@ #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "machine/serflash.h" +#include "screen.h" //#include "machine/i2cmem.h" @@ -50,9 +51,6 @@ public: - - - READ32_MEMBER(nexus3d_state::nexus3d_unk_r) { return machine().rand() ^ (machine().rand() << 16); diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index 31a69f410ba..e23e94b889d 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -62,20 +62,22 @@ */ #include "emu.h" -#include "cpu/i86/i186.h" +#include "bus/rs232/rs232.h" #include "cpu/i386/i386.h" -#include "video/mc6845.h" -#include "machine/i8251.h" +#include "cpu/i86/i186.h" +#include "imagedev/harddriv.h" #include "machine/am9517a.h" +#include "machine/clock.h" +#include "machine/i8251.h" +#include "machine/ngen_kb.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/z80dart.h" -#include "machine/wd_fdc.h" #include "machine/wd2010.h" -#include "bus/rs232/rs232.h" -#include "machine/ngen_kb.h" -#include "machine/clock.h" -#include "imagedev/harddriv.h" +#include "machine/wd_fdc.h" +#include "machine/z80dart.h" +#include "video/mc6845.h" +#include "screen.h" + class ngen_state : public driver_device { diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp index 6a90badb6d8..dcbd70a8d81 100644 --- a/src/mame/drivers/ngp.cpp +++ b/src/mame/drivers/ngp.cpp @@ -107,7 +107,9 @@ the Neogeo Pocket. #include "sound/volt_reg.h" #include "video/k1ge.h" #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" enum flash_state { diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp index 61275ba4dc1..0a0ad62d7a0 100644 --- a/src/mame/drivers/nibble.cpp +++ b/src/mame/drivers/nibble.cpp @@ -46,14 +46,15 @@ *************************************************************************/ - -#define MASTER_CLOCK XTAL_12MHz - #include "emu.h" #include "cpu/tms9900/tms9980a.h" //#include "cpu/tms9900/tms9900.h" #include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" + + +#define MASTER_CLOCK XTAL_12MHz class nibble_state : public driver_device diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp index d56b3b545d7..1d1186222a9 100644 --- a/src/mame/drivers/nightgal.cpp +++ b/src/mame/drivers/nightgal.cpp @@ -18,12 +18,16 @@ TODO: *******************************************************************************************/ #include "emu.h" -#include "sound/ay8910.h" -#include "sound/2203intf.h" -#include "cpu/z80/z80.h" + #include "cpu/m6800/m6800.h" +#include "cpu/z80/z80.h" +#include "sound/2203intf.h" +#include "sound/ay8910.h" #include "video/jangou_blitter.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_19_968MHz diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp index cbd9f4f845d..e585971c771 100644 --- a/src/mame/drivers/ninjakd2.cpp +++ b/src/mame/drivers/ninjakd2.cpp @@ -151,11 +151,14 @@ TODO: ******************************************************************************/ #include "emu.h" +#include "includes/ninjakd2.h" + #include "cpu/z80/z80.h" -#include "sound/2203intf.h" #include "machine/gen_latch.h" #include "machine/mc8123.h" -#include "includes/ninjakd2.h" +#include "sound/2203intf.h" +#include "speaker.h" + #define MAIN_CLOCK_12 XTAL_12MHz #define MAIN_CLOCK_5 XTAL_5MHz diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp index b2c54139331..409281acad2 100644 --- a/src/mame/drivers/ninjaw.cpp +++ b/src/mame/drivers/ninjaw.cpp @@ -316,11 +316,14 @@ rumbling on a subwoofer in the cabinet.) ***************************************************************************/ #include "emu.h" +#include "includes/ninjaw.h" +#include "includes/taitoipt.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2610intf.h" -#include "includes/taitoipt.h" -#include "includes/ninjaw.h" +#include "screen.h" +#include "speaker.h" #include "ninjaw.lh" @@ -649,7 +652,7 @@ private: extern const device_type SUBWOOFER; -const device_type SUBWOOFER = &device_creator; +const device_type SUBWOOFER = device_creator; subwoofer_device::subwoofer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SUBWOOFER, "Subwoofer", tag, owner, clock), diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp index 85d07411d48..1e006b023c9 100644 --- a/src/mame/drivers/nitedrvr.cpp +++ b/src/mame/drivers/nitedrvr.cpp @@ -37,11 +37,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/nitedrvr.h" + #include "cpu/m6502/m6502.h" #include "machine/rescap.h" #include "machine/watchdog.h" #include "sound/discrete.h" -#include "includes/nitedrvr.h" +#include "screen.h" +#include "speaker.h" /* Memory Map */ diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp index ec3a2d80938..03ce359a07f 100644 --- a/src/mame/drivers/niyanpai.cpp +++ b/src/mame/drivers/niyanpai.cpp @@ -38,6 +38,7 @@ Memo: #include "emu.h" #include "includes/niyanpai.h" #include "includes/nb1413m3.h" + #include "cpu/z80/tmpz84c011.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" @@ -45,6 +46,7 @@ Memo: #include "sound/3812intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" WRITE8_MEMBER(niyanpai_state::soundbank_w) diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp index 78b0759f371..f4cb152f221 100644 --- a/src/mame/drivers/nmg5.cpp +++ b/src/mame/drivers/nmg5.cpp @@ -222,12 +222,15 @@ Stephh's notes (based on the games M68000 code and some tests) : */ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "sound/okim6295.h" #include "sound/3812intf.h" +#include "sound/okim6295.h" #include "video/decospr.h" +#include "screen.h" +#include "speaker.h" + class nmg5_state : public driver_device { diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 4a9ad0fbb4f..ae2c019c7c3 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -147,17 +147,21 @@ Afega stands for "Art-Fiction Electronic Game" ********************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/tlcs90/tlcs90.h" -#include "cpu/m68000/m68000.h" +#include "includes/nmk16.h" #include "audio/seibu.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/pic16c5x/pic16c5x.h" +#include "cpu/tlcs90/tlcs90.h" +#include "cpu/z80/z80.h" +#include "machine/nmk004.h" #include "sound/2203intf.h" -#include "sound/okim6295.h" #include "sound/3812intf.h" +#include "sound/okim6295.h" #include "sound/ym2151.h" -#include "machine/nmk004.h" -#include "cpu/pic16c5x/pic16c5x.h" -#include "includes/nmk16.h" + +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(nmk16_state::nmk16_x0016_w) diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp index b7bc6672b6f..afa83f973b2 100644 --- a/src/mame/drivers/nokia_3310.cpp +++ b/src/mame/drivers/nokia_3310.cpp @@ -12,11 +12,14 @@ // if anybody has solid information to aid in the emulation of this (or other phones) please contribute. #include "emu.h" + #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "machine/intelfsh.h" #include "video/pcd8544.h" + #include "debugger.h" +#include "screen.h" #define LOG_MAD2_REGISTER_ACCESS (0) diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp index 1f387ab36cd..ae4b4db6c39 100644 --- a/src/mame/drivers/norautp.cpp +++ b/src/mame/drivers/norautp.cpp @@ -544,23 +544,27 @@ *******************************************************************************/ - -#define NORAUT_MASTER_CLOCK XTAL_18_432MHz -#define DPHL_MASTER_CLOCK XTAL_18MHz -#define NORAUT_CPU_CLOCK NORAUT_MASTER_CLOCK / 8 /* 2.30275 MHz - Measured: 2.305 MHz */ -#define DPHL_CPU_CLOCK DPHL_MASTER_CLOCK / 9 /* 2 MHz (from 8224) */ - #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/norautp.h" + #include "cpu/i8085/i8085.h" +#include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/nvram.h" -#include "includes/norautp.h" + +#include "screen.h" +#include "speaker.h" #include "noraut11.lh" #include "noraut12.lh" +#define NORAUT_MASTER_CLOCK XTAL_18_432MHz +#define DPHL_MASTER_CLOCK XTAL_18MHz +#define NORAUT_CPU_CLOCK NORAUT_MASTER_CLOCK / 8 /* 2.30275 MHz - Measured: 2.305 MHz */ +#define DPHL_CPU_CLOCK DPHL_MASTER_CLOCK / 9 /* 2 MHz (from 8224) */ + + /************************* * Video Hardware * *************************/ diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 36ad2a4e6d7..d82d9e6cce2 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -83,6 +83,9 @@ DONE: #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/tms9927.h" +#include "screen.h" +#include "speaker.h" + class notetaker_state : public driver_device { diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp index f35c26daf8c..5e6e3b2d491 100644 --- a/src/mame/drivers/nova2001.cpp +++ b/src/mame/drivers/nova2001.cpp @@ -122,10 +122,14 @@ e000 - e7ff R/W Work RAM ******************************************************************************/ #include "emu.h" +#include "includes/nova2001.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/nova2001.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_12MHz diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index 3f1a99e59b7..e367580f29a 100644 --- a/src/mame/drivers/novag6502.cpp +++ b/src/mame/drivers/novag6502.cpp @@ -57,11 +57,14 @@ instead of magnet sensors. #include "emu.h" #include "includes/novagbase.h" + +#include "bus/rs232/rs232.h" #include "cpu/m6502/m6502.h" #include "cpu/m6502/m65c02.h" -#include "bus/rs232/rs232.h" #include "machine/mos6551.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" // internal artwork #include "novag_cforte.lh" // clickable diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp index af7c4efa693..3d270f14218 100644 --- a/src/mame/drivers/novag68k.cpp +++ b/src/mame/drivers/novag68k.cpp @@ -26,9 +26,12 @@ Diablo 68000: #include "emu.h" #include "includes/novagbase.h" + #include "cpu/m68000/m68000.h" #include "machine/mos6551.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" // internal artwork #include "novag_diablo68k.lh" // clickable diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp index cab7f8820ac..049cd61eb53 100644 --- a/src/mame/drivers/nsm.cpp +++ b/src/mame/drivers/nsm.cpp @@ -22,6 +22,8 @@ ToDo: #include "cpu/tms9900/tms9995.h" #include "sound/ay8910.h" +#include "speaker.h" + #include "nsm.lh" diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp index 318e7d23cff..6589293b7ef 100644 --- a/src/mame/drivers/nsmpoker.cpp +++ b/src/mame/drivers/nsmpoker.cpp @@ -58,12 +58,13 @@ *******************************************************************************/ - -#define MASTER_CLOCK XTAL_22_1184MHz - #include "emu.h" #include "cpu/tms9900/tms9995.h" #include "sound/ay8910.h" +#include "screen.h" + + +#define MASTER_CLOCK XTAL_22_1184MHz class nsmpoker_state : public driver_device diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp index d8285756571..5c6f8803b27 100644 --- a/src/mame/drivers/nss.cpp +++ b/src/mame/drivers/nss.cpp @@ -294,13 +294,15 @@ Contra III CONTRA_III_1 TC574000 CONTRA_III_0 TC574000 GAME1_NSSU ***************************************************************************/ #include "emu.h" +#include "includes/snes.h" + #include "cpu/z80/z80.h" #include "machine/m6m80011ap.h" #include "machine/s3520cf.h" #include "machine/rp5h01.h" #include "video/m50458.h" -#include "includes/snes.h" #include "rendlay.h" +#include "speaker.h" class nss_state : public snes_state diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp index 3df6f9ab198..37a603a1fcc 100644 --- a/src/mame/drivers/nwk-tr.cpp +++ b/src/mame/drivers/nwk-tr.cpp @@ -259,6 +259,8 @@ Thrill Drive 713A13 - 713A14 - #include "sound/k056800.h" #include "video/voodoo.h" #include "video/k001604.h" +#include "screen.h" +#include "speaker.h" class nwktr_state : public driver_device diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index 6a5ba1aad0c..f26b3744a2d 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -190,17 +190,20 @@ Stephh's additional notes (based on the game Z80 code and some tests) : ***************************************************************************/ -//#define USE_MCU - - #include "emu.h" #include "includes/nycaptor.h" +#include "includes/taitoipt.h" + #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" -#include "includes/taitoipt.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + + +//#define USE_MCU WRITE8_MEMBER(nycaptor_state::sub_cpu_halt_w) diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp index 876b9cfed00..3cfbe24f1b9 100644 --- a/src/mame/drivers/nyny.cpp +++ b/src/mame/drivers/nyny.cpp @@ -64,7 +64,7 @@ ***************************************************************************/ #include "emu.h" -#include "emu.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" @@ -77,6 +77,9 @@ #include "sound/volt_reg.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CPU_MASTER_CLOCK XTAL_11_2MHz #define PIXEL_CLOCK (MAIN_CPU_MASTER_CLOCK / 2) diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 4504a24c902..2d1f2c9c919 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -106,30 +106,36 @@ It's a very rare computer. It has 2 processors, Z80 and 8088, so it can run both ****************************************************************************/ #include "emu.h" + #include "cpu/i86/i86.h" #include "cpu/z80/z80.h" -#include "video/scn2674.h" +#include "imagedev/floppy.h" #include "machine/am9517a.h" -#include "machine/pic8259.h" -#include "machine/mc146818.h" -#include "machine/i8255.h" -#include "machine/wd_fdc.h" -#include "machine/i8251.h" +#include "machine/bankdev.h" #include "machine/clock.h" -#include "imagedev/floppy.h" -#include "machine/pit8253.h" -#include "sound/speaker.h" -#include "machine/z80dart.h" +#include "machine/i8251.h" +#include "machine/i8255.h" +#include "machine/mc146818.h" #include "machine/octo_kbd.h" -#include "machine/bankdev.h" +#include "machine/pic8259.h" +#include "machine/pit8253.h" #include "machine/ram.h" +#include "machine/wd_fdc.h" +#include "machine/z80dart.h" +#include "sound/spkrdev.h" +#include "video/scn2674.h" + #include "bus/centronics/ctronics.h" #include "bus/centronics/comxpl80.h" #include "bus/centronics/epson_ex800.h" #include "bus/centronics/epson_lx800.h" #include "bus/centronics/epson_lx810l.h" #include "bus/centronics/printer.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class octopus_state : public driver_device { diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index dcac941e74d..09250f96e85 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -12,13 +12,18 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/mcs48/mcs48.h" -#include "video/i8244.h" #include "machine/i8243.h" #include "video/ef9340_1.h" +#include "video/i8244.h" #include "bus/odyssey2/slot.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class odyssey2_state : public driver_device { diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp index 1a052608e7e..a105469525d 100644 --- a/src/mame/drivers/offtwall.cpp +++ b/src/mame/drivers/offtwall.cpp @@ -20,9 +20,11 @@ #include "emu.h" +#include "includes/offtwall.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" -#include "includes/offtwall.h" +#include "speaker.h" diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp index 19432ad7651..a93238fcdd9 100644 --- a/src/mame/drivers/ohmygod.cpp +++ b/src/mame/drivers/ohmygod.cpp @@ -14,10 +14,13 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/ohmygod.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "sound/okim6295.h" -#include "includes/ohmygod.h" +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(ohmygod_state::ohmygod_ctrl_w) diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index 843b73b91d7..95ad666a87f 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -34,11 +34,13 @@ Memo: ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/ojankohs.h" + +#include "cpu/z80/z80.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/msm5205.h" -#include "machine/nvram.h" +#include "speaker.h" WRITE8_MEMBER(ojankohs_state::ojankohs_rombank_w) diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index a1657b61367..2fa47418255 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -53,6 +53,8 @@ Usage of terminal: #include "cpu/i8085/i8085.h" #include "machine/keyboard.h" #include "machine/terminal.h" +#include "screen.h" + class okean240_state : public driver_device { diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp index cce3d18d002..5bf02fb5dda 100644 --- a/src/mame/drivers/olibochu.cpp +++ b/src/mame/drivers/olibochu.cpp @@ -57,6 +57,8 @@ $7004 writes, related to $7000 reads #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class olibochu_state : public driver_device { diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp index ba37b547ab8..4e6fc310fdd 100644 --- a/src/mame/drivers/omegrace.cpp +++ b/src/mame/drivers/omegrace.cpp @@ -223,6 +223,8 @@ #include "machine/gen_latch.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "screen.h" +#include "speaker.h" #include "omegrace.lh" diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp index b8c0402709b..40c7028d7e5 100644 --- a/src/mame/drivers/ondra.cpp +++ b/src/mame/drivers/ondra.cpp @@ -10,12 +10,16 @@ #include "emu.h" +#include "includes/ondra.h" + #include "cpu/z80/z80.h" -#include "sound/wave.h" #include "imagedev/cassette.h" #include "machine/ram.h" -#include "includes/ondra.h" +#include "sound/wave.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + /* Address maps */ static ADDRESS_MAP_START(ondra_mem, AS_PROGRAM, 8, ondra_state ) diff --git a/src/mame/drivers/oneshot.cpp b/src/mame/drivers/oneshot.cpp index 3ef8f98f588..54cfc96b2a8 100644 --- a/src/mame/drivers/oneshot.cpp +++ b/src/mame/drivers/oneshot.cpp @@ -36,12 +36,17 @@ NOTE: An eBay auction of the PCB shows "1996.9.16 PROMAT" on the JAMMA+ adapter */ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" #include "includes/oneshot.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "sound/okim6295.h" #include "sound/3812intf.h" +#include "sound/okim6295.h" + +#include "screen.h" +#include "speaker.h" + READ16_MEMBER(oneshot_state::oneshot_in0_word_r) { diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp index 4087d0a435a..bbd211588ac 100644 --- a/src/mame/drivers/onetwo.cpp +++ b/src/mame/drivers/onetwo.cpp @@ -45,8 +45,10 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" -#include "sound/okim6295.h" #include "sound/3812intf.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_4MHz diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 72853c009a0..2041f3529a9 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -274,13 +274,17 @@ register. So what is controlling priority. #define SOUND_CPU_CLOCK (XTAL_8MHz / 2) /* clock for Z80 sound CPU */ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/opwolf.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "includes/taitoipt.h" -#include "audio/taitosnd.h" -#include "sound/ym2151.h" #include "sound/msm5205.h" -#include "includes/opwolf.h" +#include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" + READ16_MEMBER(opwolf_state::cchip_r) { diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp index 46632ff1a2b..d2b27d8ab79 100644 --- a/src/mame/drivers/orao.cpp +++ b/src/mame/drivers/orao.cpp @@ -13,13 +13,17 @@ ****************************************************************************/ #include "emu.h" +#include "includes/orao.h" + #include "cpu/m6502/m6502.h" -#include "sound/speaker.h" #include "sound/wave.h" -#include "includes/orao.h" -#include "imagedev/cassette.h" -#include "formats/orao_cas.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/orao_cas.h" + /* Address maps */ static ADDRESS_MAP_START(orao_mem, AS_PROGRAM, 8, orao_state ) diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp index a2e1370fbaf..7cbf45b2308 100644 --- a/src/mame/drivers/orbit.cpp +++ b/src/mame/drivers/orbit.cpp @@ -20,10 +20,12 @@ Atari Orbit Driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6800/m6800.h" #include "includes/orbit.h" + +#include "cpu/m6800/m6800.h" #include "machine/watchdog.h" #include "sound/discrete.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_12_096MHz diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index dc2fb6b5ad3..05432a58d21 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -20,19 +20,25 @@ *********************************************************************/ #include "emu.h" + +#include "bus/centronics/ctronics.h" #include "bus/oricext/oricext.h" #include "cpu/m6502/m6502.h" -#include "sound/ay8910.h" -#include "sound/wave.h" +#include "imagedev/cassette.h" +#include "imagedev/floppy.h" #include "machine/6522via.h" #include "machine/mos6551.h" -#include "bus/centronics/ctronics.h" -#include "imagedev/floppy.h" -#include "imagedev/cassette.h" #include "machine/wd_fdc.h" +#include "sound/ay8910.h" +#include "sound/wave.h" + +#include "screen.h" +#include "speaker.h" + #include "formats/oric_dsk.h" #include "formats/oric_tap.h" + class oric_state : public driver_device { public: diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp index 7f3b9326ff4..15e2e5947e9 100644 --- a/src/mame/drivers/orion.cpp +++ b/src/mame/drivers/orion.cpp @@ -12,10 +12,15 @@ #include "emu.h" #include "includes/orion.h" + #include "imagedev/cassette.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + #include "formats/smx_dsk.h" #include "formats/rk_cas.h" -#include "softlist.h" + /* Address maps */ diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index 28d02a1b624..6adf765ef59 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -7,16 +7,21 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "sound/speaker.h" -#include "machine/wd_fdc.h" #include "machine/6821pia.h" -#include "machine/z80dart.h" +#include "machine/input_merger.h" #include "machine/pit8253.h" #include "machine/ram.h" -#include "machine/input_merger.h" +#include "machine/wd_fdc.h" +#include "machine/z80dart.h" +#include "sound/spkrdev.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #define MAIN_CLOCK 23961600 diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp index 87fe3842ecd..43e5c995e5d 100644 --- a/src/mame/drivers/osborne1.cpp +++ b/src/mame/drivers/osborne1.cpp @@ -58,7 +58,7 @@ Schematics specify a WD1793 floppy controller, but we're using the Fujitsu equivalent MB8877 here. Is it known that the original machines used one or the other exclusively? In any case MAME emulates them identically. -The installing the SCREEN-PAC requires the CPU and character generator ROM +Installation of the SCREEN-PAC requires the CPU and character generator ROM to be transplanted to the add-on board, and cables run to the sockets that previously held these chips. It contains additional RAM clocked at twice the speed of the main system RAM. Writes to video memory get sent to this @@ -72,9 +72,8 @@ character generator ROM, so the mainboard's character generator ROM doesn't need to be moved. However, it doesn't behave like the SCREEN-PAC. It uses a Synertek SY6545-1 with its pixel clock derived from a 12.288MHz crystal mapped at 0x04/0x05 in I/O space. It runs at 640x240 (80x24) at just below -60Hz and doesn't allow resolution switching. We don't know how video RAM -contention on video RAM is handled, or whether the CRTC can generate VBL -interrupts. +60Hz and doesn't allow resolution switching. We don't know how contention +for video RAM is handled, or whether the CRTC can generate VBL interrupts. TODO: @@ -93,6 +92,8 @@ TODO: #include "includes/osborne1.h" #include "bus/rs232/rs232.h" +#include "screen.h" +#include "speaker.h" #include "softlist.h" diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp index c9382f0c27c..92d96939619 100644 --- a/src/mame/drivers/osi.cpp +++ b/src/mame/drivers/osi.cpp @@ -218,7 +218,11 @@ PRINT FRE(0) #include "emu.h" #include "includes/osi.h" + #include "machine/clock.h" +#include "screen.h" +#include "speaker.h" + /* Sound */ diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp index 49adc51e733..f3255e3d740 100644 --- a/src/mame/drivers/othello.cpp +++ b/src/mame/drivers/othello.cpp @@ -38,8 +38,9 @@ Limit for help/undo (matta): */ #include "emu.h" -#include "cpu/z80/z80.h" + #include "cpu/mcs48/mcs48.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/i8243.h" #include "sound/ay8910.h" @@ -47,6 +48,9 @@ Limit for help/undo (matta): #include "sound/volt_reg.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #define TILE_WIDTH 6 diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp index dc830b11a3c..8efd0b53ac8 100644 --- a/src/mame/drivers/othunder.cpp +++ b/src/mame/drivers/othunder.cpp @@ -285,14 +285,17 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/othunder.h" +#include "includes/taitoipt.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/eepromser.h" -#include "audio/taitosnd.h" #include "sound/2610intf.h" #include "sound/flt_vol.h" -#include "includes/othunder.h" -#include "includes/taitoipt.h" +#include "screen.h" +#include "speaker.h" /*********************************************************** diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp index 3daa286fcd4..f0fd002521e 100644 --- a/src/mame/drivers/overdriv.cpp +++ b/src/mame/drivers/overdriv.cpp @@ -27,13 +27,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/overdriv.h" + #include "cpu/m68000/m68000.h" -#include "video/k053250.h" -#include "machine/eepromser.h" #include "cpu/m6809/m6809.h" -#include "sound/ym2151.h" +#include "machine/eepromser.h" #include "sound/k053260.h" -#include "includes/overdriv.h" +#include "sound/ym2151.h" +#include "video/k053250.h" +#include "speaker.h" #include "overdriv.lh" diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp index f6f6cee8262..3707ce10c70 100644 --- a/src/mame/drivers/p112.cpp +++ b/src/mame/drivers/p112.cpp @@ -35,6 +35,7 @@ Some of the parts: #include "emu.h" #include "cpu/z180/z180.h" +#include "screen.h" class p112_state : public driver_device diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp index 1e512cf4e95..0472d3dbe44 100644 --- a/src/mame/drivers/p2000t.cpp +++ b/src/mame/drivers/p2000t.cpp @@ -31,6 +31,9 @@ Philips P2000 1 Memory map #include "emu.h" #include "includes/p2000t.h" +#include "screen.h" +#include "speaker.h" + /* port i/o functions */ static ADDRESS_MAP_START( p2000t_io, AS_IO, 8, p2000t_state ) diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp index 3335a839372..11735b65f05 100644 --- a/src/mame/drivers/p8k.cpp +++ b/src/mame/drivers/p8k.cpp @@ -49,15 +49,17 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z8000/z8000.h" #include "cpu/z80/z80daisy.h" +#include "cpu/z8000/z8000.h" +#include "machine/terminal.h" #include "machine/upd765.h" #include "machine/z80ctc.h" -#include "machine/z80pio.h" #include "machine/z80dart.h" #include "machine/z80dma.h" +#include "machine/z80pio.h" #include "sound/beep.h" -#include "machine/terminal.h" +#include "speaker.h" + #define TERMINAL_TAG "terminal" diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp index d3b5fdc6972..37999a46caf 100644 --- a/src/mame/drivers/pachifev.cpp +++ b/src/mame/drivers/pachifev.cpp @@ -81,9 +81,10 @@ Stephh's notes (based on the game TMS9995 code and some tests) : #include "emu.h" #include "cpu/tms9900/tms9995.h" -#include "video/tms9928a.h" #include "sound/msm5205.h" #include "sound/sn76496.h" +#include "video/tms9928a.h" +#include "speaker.h" #define USE_MSM 0 #define NUM_PLUNGER_REPEATS 50 diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp index f7b7eaca34f..8af5fcafd5b 100644 --- a/src/mame/drivers/pacland.cpp +++ b/src/mame/drivers/pacland.cpp @@ -191,10 +191,12 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/pacland.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6800.h" #include "machine/watchdog.h" -#include "includes/pacland.h" +#include "speaker.h" void pacland_state::machine_start() diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 99790e35523..0258e638730 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -337,16 +337,19 @@ Boards: ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/pacman.h" +#include "machine/epos.h" +#include "machine/jumpshot.h" +#include "machine/pacplus.h" + #include "cpu/s2650/s2650.h" +#include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/sn76496.h" -#include "machine/epos.h" -#include "machine/jumpshot.h" -#include "machine/pacplus.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp index 2ff0dae6309..4b8c6d795bb 100644 --- a/src/mame/drivers/palm.cpp +++ b/src/mame/drivers/palm.cpp @@ -18,6 +18,8 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" #define MC68328_TAG "dragonball" diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp index 596411c90fe..3ca31438d5a 100644 --- a/src/mame/drivers/palmz22.cpp +++ b/src/mame/drivers/palmz22.cpp @@ -68,6 +68,7 @@ end #include "machine/s3c2410.h" #include "machine/smartmed.h" #include "rendlay.h" +#include "screen.h" #define PALM_Z22_BATTERY_LEVEL 75 diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp index f6d0ad273d9..5709670fd9a 100644 --- a/src/mame/drivers/pandoras.cpp +++ b/src/mame/drivers/pandoras.cpp @@ -26,6 +26,7 @@ Boards: #include "emu.h" #include "includes/pandoras.h" #include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" @@ -34,6 +35,8 @@ Boards: #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/pangofun.cpp b/src/mame/drivers/pangofun.cpp index 5c676615dca..e334f3043c4 100644 --- a/src/mame/drivers/pangofun.cpp +++ b/src/mame/drivers/pangofun.cpp @@ -98,6 +98,7 @@ Arcade Version (Coin-Op) by InfoCube (Pisa, Italy) #include "cpu/i386/i386.h" #include "machine/pcshare.h" #include "video/pc_vga.h" +#include "screen.h" class pangofun_state : public pcat_base_state diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index 4396f3b3830..be6dd72e7e0 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -61,10 +61,13 @@ D.9B [f99cac4b] / */ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/nec/nec.h" #include "audio/t5182.h" +#include "cpu/nec/nec.h" +#include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" + class panicr_state : public driver_device { diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp index 706538e8eef..b14985e7f9c 100644 --- a/src/mame/drivers/paradise.cpp +++ b/src/mame/drivers/paradise.cpp @@ -87,9 +87,12 @@ sticker from Jan 95 and factory sticker 94*41. ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/paradise.h" +#include "cpu/z80/z80.h" +#include "speaker.h" + + /*************************************************************************** Memory Maps diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp index 71d233a30ac..83f9659bd4e 100644 --- a/src/mame/drivers/paranoia.cpp +++ b/src/mame/drivers/paranoia.cpp @@ -36,14 +36,18 @@ HuC6280A (Hudson) ****************************************************************************/ #include "emu.h" +#include "machine/pcecommn.h" + #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" #include "machine/i8155.h" -#include "machine/pcecommn.h" #include "video/huc6260.h" #include "video/huc6270.h" #include "cpu/h6280/h6280.h" #include "sound/c6280.h" +#include "screen.h" +#include "speaker.h" + class paranoia_state : public pce_common_state { diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index d608636c982..a06b4792169 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -9,13 +9,16 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/parodius.h" +#include "includes/konamipt.h" + #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ +#include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ym2151.h" #include "sound/k053260.h" -#include "includes/konamipt.h" -#include "includes/parodius.h" +#include "speaker.h" + INTERRUPT_GEN_MEMBER(parodius_state::parodius_interrupt) { diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp index bca616fbad5..e3ae867cd45 100644 --- a/src/mame/drivers/partner.cpp +++ b/src/mame/drivers/partner.cpp @@ -10,16 +10,19 @@ #include "emu.h" +#include "includes/partner.h" + #include "cpu/i8085/i8085.h" -#include "sound/wave.h" -#include "machine/i8255.h" #include "imagedev/cassette.h" -#include "formats/smx_dsk.h" -#include "formats/rk_cas.h" -#include "includes/radio86.h" -#include "machine/ram.h" -#include "includes/partner.h" +#include "sound/wave.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/rk_cas.h" +#include "formats/smx_dsk.h" + /* Address maps */ static ADDRESS_MAP_START(partner_mem, AS_PROGRAM, 8, partner_state ) diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp index 1cb7718de67..0834666f3d8 100644 --- a/src/mame/drivers/pasha2.cpp +++ b/src/mame/drivers/pasha2.cpp @@ -77,6 +77,8 @@ Notes: #include "cpu/e132xs/e132xs.h" #include "machine/eepromser.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class pasha2_state : public driver_device { diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp index ae2292309cf..5d1524b77fa 100644 --- a/src/mame/drivers/paso1600.cpp +++ b/src/mame/drivers/paso1600.cpp @@ -12,9 +12,10 @@ #include "emu.h" #include "cpu/i86/i86.h" -#include "video/mc6845.h" -#include "machine/pic8259.h" #include "machine/am9517a.h" +#include "machine/pic8259.h" +#include "video/mc6845.h" +#include "screen.h" class paso1600_state : public driver_device @@ -32,7 +33,8 @@ public: , m_p_pcg(*this, "pcg") , m_gfxdecode(*this, "gfxdecode") , m_palette(*this, "palette") - { } + { + } DECLARE_READ8_MEMBER(paso1600_pcg_r); DECLARE_WRITE8_MEMBER(paso1600_pcg_w); diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp index ab98af7c72f..2403fc33829 100644 --- a/src/mame/drivers/pasopia.cpp +++ b/src/mame/drivers/pasopia.cpp @@ -11,12 +11,15 @@ ****************************************************************************/ #include "emu.h" +#include "includes/pasopia.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "video/mc6845.h" -#include "includes/pasopia.h" +#include "screen.h" + class pasopia_state : public driver_device { diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index fe8bc8fda12..7d4ea993e16 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -22,15 +22,20 @@ ***************************************************************************************************/ #include "emu.h" +#include "includes/pasopia.h" + #include "cpu/z80/z80.h" -#include "machine/z80ctc.h" #include "machine/i8255.h" -#include "machine/z80pio.h" #include "machine/upd765.h" +#include "machine/z80ctc.h" +#include "machine/z80pio.h" #include "sound/sn76496.h" #include "video/mc6845.h" + #include "rendlay.h" -#include "includes/pasopia.h" +#include "screen.h" +#include "speaker.h" + class pasopia7_state : public driver_device { diff --git a/src/mame/drivers/pass.cpp b/src/mame/drivers/pass.cpp index 6177ecc7ff2..a7931dfab4e 100644 --- a/src/mame/drivers/pass.cpp +++ b/src/mame/drivers/pass.cpp @@ -102,12 +102,15 @@ */ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/pass.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/pass.h" +#include "screen.h" +#include "speaker.h" /* todo: check all memory regions actually readable / read from */ diff --git a/src/mame/drivers/pastelg.cpp b/src/mame/drivers/pastelg.cpp index 8f6650bb425..e493578bef2 100644 --- a/src/mame/drivers/pastelg.cpp +++ b/src/mame/drivers/pastelg.cpp @@ -24,11 +24,13 @@ Memo: #include "emu.h" #include "includes/pastelg.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" void pastelg_state::machine_start() diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp index c289c38731f..cd68ade4272 100644 --- a/src/mame/drivers/pb1000.cpp +++ b/src/mame/drivers/pb1000.cpp @@ -21,14 +21,18 @@ #include "emu.h" #include "cpu/hd61700/hd61700.h" -#include "video/hd44352.h" #include "machine/nvram.h" #include "sound/beep.h" +#include "video/hd44352.h" + #include "rendlay.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" -#include "bus/generic/slot.h" #include "bus/generic/carts.h" -#include "softlist.h" +#include "bus/generic/slot.h" + class pb1000_state : public driver_device { diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp index 0bf9eca3ce1..e3fe16b9265 100644 --- a/src/mame/drivers/pbaction.cpp +++ b/src/mame/drivers/pbaction.cpp @@ -66,10 +66,13 @@ Stephh's notes (based on the game Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/pbaction.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/segacrpt_device.h" -#include "includes/pbaction.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(pbaction_state::pbaction_sh_command_w) diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp index 96762ead797..c31e5a30128 100644 --- a/src/mame/drivers/pc100.cpp +++ b/src/mame/drivers/pc100.cpp @@ -53,17 +53,23 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/i86/i86.h" #include "imagedev/flopdrv.h" -#include "formats/mfi_dsk.h" -#include "formats/d88_dsk.h" +#include "machine/i8251.h" #include "machine/i8255.h" +#include "machine/msm58321.h" #include "machine/pic8259.h" #include "machine/upd765.h" -#include "machine/msm58321.h" -#include "machine/i8251.h" #include "sound/beep.h" +#include "screen.h" +#include "speaker.h" + +#include "formats/d88_dsk.h" +#include "formats/mfi_dsk.h" + + class pc100_state : public driver_device { public: diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp index 170ba554176..c359696f279 100644 --- a/src/mame/drivers/pc1500.cpp +++ b/src/mame/drivers/pc1500.cpp @@ -16,6 +16,8 @@ #include "cpu/lh5801/lh5801.h" #include "machine/lh5810.h" #include "machine/upd1990a.h" +#include "screen.h" + #include "pc1500.lh" diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp index 535102971f7..aad7d0d066c 100644 --- a/src/mame/drivers/pc1512.cpp +++ b/src/mame/drivers/pc1512.cpp @@ -97,6 +97,7 @@ PC1640-HD30: Western Digital 95038 [-chs 615,6,17 -ss 512] #include "bus/rs232/rs232.h" #include "bus/isa/ega.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp index eb570a109c1..85d433e195a 100644 --- a/src/mame/drivers/pc2000.cpp +++ b/src/mame/drivers/pc2000.cpp @@ -15,31 +15,36 @@ #include "emu.h" + #include "cpu/z80/z80.h" +#include "sound/beep.h" #include "video/hd44780.h" #include "video/sed1520.h" -#include "sound/beep.h" -#include "rendlay.h" -#include "softlist.h" -#include "gl3000s.lh" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "rendlay.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + +#include "gl3000s.lh" + class pc2000_state : public driver_device { public: pc2000_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_lcdc(*this, "hd44780"), - m_beep(*this, "beeper"), - m_cart(*this, "cartslot"), - m_bank0(*this, "bank0"), - m_bank1(*this, "bank1"), - m_bank2(*this, "bank2") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_lcdc(*this, "hd44780") + , m_beep(*this, "beeper") + , m_cart(*this, "cartslot") + , m_bank0(*this, "bank0") + , m_bank1(*this, "bank1") + , m_bank2(*this, "bank2") + { } required_device m_maincpu; optional_device m_lcdc; diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp index 7cd3cdab7e1..1aa193eb344 100644 --- a/src/mame/drivers/pc4.cpp +++ b/src/mame/drivers/pc4.cpp @@ -25,10 +25,14 @@ #include "emu.h" +#include "includes/pc4.h" + #include "cpu/z80/z80.h" #include "machine/rp5c01.h" + #include "rendlay.h" -#include "includes/pc4.h" +#include "screen.h" +#include "speaker.h" READ8_MEMBER( pc4_state::kb_r ) diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index 76d46f2455d..9fd2c50a98f 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -125,17 +125,21 @@ irq vector 0x26: *******************************************************************************************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "machine/i8255.h" +#include "imagedev/cassette.h" #include "machine/i8251.h" -#include "video/mc6847.h" +#include "machine/i8255.h" #include "sound/ay8910.h" #include "sound/upd7752.h" #include "sound/wave.h" +#include "video/mc6847.h" -#include "imagedev/cassette.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" + +#include "speaker.h" + #include "formats/p6001_cas.h" diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp index 07bc719676a..eba3531fb75 100644 --- a/src/mame/drivers/pc8001.cpp +++ b/src/mame/drivers/pc8001.cpp @@ -25,6 +25,8 @@ #include "emu.h" #include "includes/pc8001.h" +#include "screen.h" +#include "speaker.h" /* Read/Write Handlers */ diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index b4b22573b16..dc825df33eb 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -255,19 +255,20 @@ #include "emu.h" +#include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "bus/centronics/ctronics.h" +#include "machine/i8214.h" +#include "machine/i8251.h" #include "machine/i8255.h" #include "machine/upd1990a.h" #include "machine/upd765.h" -#include "machine/i8214.h" -#include "machine/i8251.h" #include "sound/2203intf.h" #include "sound/2608intf.h" #include "sound/beep.h" +#include "screen.h" #include "softlist.h" -//#include "includes/pc8801.h" +#include "speaker.h" //#define USE_PROPER_I8214 diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index 1e76df1ce4f..50ddb757152 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -25,17 +25,23 @@ ********************************************************************************************/ #include "emu.h" + #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" +#include "machine/am9517a.h" #include "machine/i8255.h" #include "machine/pic8259.h" #include "machine/pit8253.h" +//#include "machine/upd71071.h" #include "machine/upd765.h" #include "sound/2203intf.h" -#include "formats/xdf_dsk.h" -//#include "machine/upd71071.h" -#include "machine/am9517a.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/xdf_dsk.h" + /* Note: for the time being, just disable FDC CPU, it's for PC-8801 compatibility mode anyway ... */ #define TEST_SUBFDC 0 diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index d473260994c..3a58027ac1f 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -383,41 +383,33 @@ Keyboard TX commands: #include "emu.h" +#include "cpu/i386/i386.h" +#include "cpu/i86/i286.h" #include "cpu/i86/i86.h" #include "cpu/nec/nec.h" -#include "cpu/i86/i286.h" -#include "cpu/i386/i386.h" -#include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/am9517a.h" +#include "machine/bankdev.h" +#include "machine/buffer.h" +#include "machine/i8251.h" +#include "machine/i8255.h" +#include "machine/latch.h" #include "machine/pic8259.h" -#include "machine/upd765.h" +#include "machine/pit8253.h" +#include "machine/ram.h" #include "machine/upd1990a.h" -#include "machine/i8251.h" -#include "machine/bankdev.h" +#include "machine/upd765.h" #include "bus/scsi/pc9801_sasi.h" #include "bus/scsi/scsi.h" #include "bus/scsi/scsihd.h" -#include "machine/buffer.h" -#include "machine/latch.h" -#include "sound/beep.h" -#include "sound/speaker.h" #include "sound/2608intf.h" +#include "sound/beep.h" +#include "sound/spkrdev.h" #include "video/upd7220.h" -#include "machine/ram.h" - -#include "formats/pc98_dsk.h" -#include "formats/pc98fdi_dsk.h" -#include "formats/fdd_dsk.h" -#include "formats/dcp_dsk.h" -#include "formats/dip_dsk.h" -#include "formats/nfd_dsk.h" - #include "machine/pc9801_26.h" #include "machine/pc9801_86.h" #include "machine/pc9801_118.h" @@ -429,7 +421,16 @@ Keyboard TX commands: #include "machine/idehd.h" #include "debugger.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/pc98_dsk.h" +#include "formats/pc98fdi_dsk.h" +#include "formats/fdd_dsk.h" +#include "formats/dcp_dsk.h" +#include "formats/dip_dsk.h" +#include "formats/nfd_dsk.h" #define UPD1990A_TAG "upd1990a" #define UPD8251_TAG "upd8251" diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index 8b3dc32570d..d01fb0c8a14 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -21,18 +21,23 @@ If the output isn't satisfactory, it prints "I/O BOARD FAILURE". ********************************************************************************************************************/ #include "emu.h" + #include "cpu/i386/i386.h" #include "machine/pcshare.h" -#include "bus/isa/trident.h" #include "machine/bankdev.h" #include "machine/ds128x.h" #include "machine/ins8250.h" #include "machine/nvram.h" #include "sound/ad1848.h" -#include "bus/rs232/rs232.h" -#include "bus/rs232/ser_mouse.h" + #include "bus/isa/isa.h" #include "bus/isa/sblaster.h" +#include "bus/isa/trident.h" +#include "bus/rs232/rs232.h" +#include "bus/rs232/ser_mouse.h" + +#include "screen.h" + class pcat_dyn_state : public pcat_base_state { diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index ab8e25c8eb1..76522771379 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -9,19 +9,24 @@ ***************************************************************************/ #include "emu.h" +#include "machine/pcd_kbd.h" +#include "video/pcd.h" + +#include "bus/rs232/rs232.h" +#include "bus/scsi/omti5100.h" #include "cpu/i86/i186.h" -#include "machine/ram.h" +#include "machine/mc146818.h" +#include "machine/mc2661.h" #include "machine/nvram.h" #include "machine/pic8259.h" -#include "machine/mc2661.h" +#include "machine/ram.h" #include "machine/wd_fdc.h" -#include "machine/mc146818.h" -#include "machine/pcd_kbd.h" -#include "video/pcd.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + +#include "speaker.h" + #include "formats/pc_dsk.h" -#include "bus/scsi/omti5100.h" -#include "bus/rs232/rs232.h" + //************************************************************************** // TYPE DEFINITIONS @@ -30,19 +35,19 @@ class pcd_state : public driver_device { public: - pcd_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_pic1(*this, "pic1"), - m_pic2(*this, "pic2"), - m_speaker(*this, "speaker"), - m_fdc(*this, "fdc"), - m_rtc(*this, "rtc"), - m_scsi(*this, "scsi"), - m_scsi_data_out(*this, "scsi_data_out"), - m_scsi_data_in(*this, "scsi_data_in"), - m_ram(*this, "ram"), - m_req_hack(nullptr) + pcd_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_pic1(*this, "pic1") + , m_pic2(*this, "pic2") + , m_speaker(*this, "speaker") + , m_fdc(*this, "fdc") + , m_rtc(*this, "rtc") + , m_scsi(*this, "scsi") + , m_scsi_data_out(*this, "scsi_data_out") + , m_scsi_data_in(*this, "scsi_data_in") + , m_ram(*this, "ram") + , m_req_hack(nullptr) { } DECLARE_READ8_MEMBER( irq_callback ); diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp index be00259e717..dd1d22ee450 100644 --- a/src/mame/drivers/pce.cpp +++ b/src/mame/drivers/pce.cpp @@ -57,15 +57,20 @@ Super System Card: **********************************************************************/ #include "emu.h" -#include "cpu/h6280/h6280.h" #include "includes/pce.h" + #include "bus/pce/pce_rom.h" +#include "cpu/h6280/h6280.h" #include "sound/c6280.h" #include "sound/cdda.h" #include "sound/msm5205.h" -#include "video/huc6270.h" #include "video/huc6202.h" +#include "video/huc6270.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + /* todo: alternate forms of input (multitap, mouse, etc.) */ static INPUT_PORTS_START( pce ) diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp index 8c2add74f39..7e2e457fc6c 100644 --- a/src/mame/drivers/pce220.cpp +++ b/src/mame/drivers/pce220.cpp @@ -26,14 +26,16 @@ ****************************************************************************/ - #include "emu.h" #include "cpu/z80/z80.h" +#include "machine/nvram.h" +#include "machine/pce220_ser.h" #include "machine/ram.h" #include "sound/beep.h" -#include "machine/pce220_ser.h" -#include "machine/nvram.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + // Interrupt flags #define IRQ_FLAG_KEY 0x01 diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp index 58c719db9a8..26dafc00080 100644 --- a/src/mame/drivers/pcfx.cpp +++ b/src/mame/drivers/pcfx.cpp @@ -15,6 +15,7 @@ #include "video/huc6270.h" #include "video/huc6271.h" #include "video/huc6272.h" +#include "screen.h" struct pcfx_pad_t { diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp index 27d8562897a..f09610cd8f4 100644 --- a/src/mame/drivers/pcktgal.cpp +++ b/src/mame/drivers/pcktgal.cpp @@ -15,11 +15,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/pcktgal.h" + #include "cpu/m6502/m6502.h" #include "sound/2203intf.h" #include "sound/3812intf.h" -#include "includes/pcktgal.h" #include "machine/deco222.h" +#include "screen.h" +#include "speaker.h" + /***************************************************************************/ diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index 4a5fc324760..5f954f2bf98 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -53,15 +53,17 @@ ****************************************************************************/ #include "emu.h" -#include "machine/z80ctc.h" -#include "machine/z80pio.h" -#include "machine/z80dart.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "imagedev/cassette.h" -#include "sound/speaker.h" -#include "sound/wave.h" #include "machine/k7659kb.h" +#include "machine/z80ctc.h" +#include "machine/z80dart.h" +#include "machine/z80pio.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" class pcm_state : public driver_device @@ -79,7 +81,8 @@ public: , m_cass(*this, "cassette") , m_p_videoram(*this, "videoram") , m_p_chargen(*this, "chargen") - { } + { + } DECLARE_READ8_MEMBER( pcm_85_r ); DECLARE_WRITE_LINE_MEMBER( pcm_82_w ); diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp index f213848c86e..d43b926341f 100644 --- a/src/mame/drivers/pcw.cpp +++ b/src/mame/drivers/pcw.cpp @@ -95,17 +95,18 @@ - emulation of other hardware...? ******************************************************************************/ #include "emu.h" +// pcw video hardware +#include "includes/pcw.h" + #include "cpu/z80/z80.h" #include "cpu/mcs48/mcs48.h" #include "machine/i8243.h" -// upd765 interface #include "machine/upd765.h" -// pcw video hardware -#include "includes/pcw.h" // pcw/pcw16 beeper #include "sound/beep.h" #include "machine/ram.h" #include "softlist.h" +#include "speaker.h" #include "pcw.lh" diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp index 8e53b675631..cd1bab1f3db 100644 --- a/src/mame/drivers/pcw16.cpp +++ b/src/mame/drivers/pcw16.cpp @@ -93,7 +93,9 @@ TODO: #include "includes/pcw16.h" #include "bus/rs232/rs232.h" #include "bus/rs232/ser_mouse.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" // interrupt counter /* controls which bank of 2mb address space is paged into memory */ diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp index 318c91b5508..cbe24788965 100644 --- a/src/mame/drivers/pcxt.cpp +++ b/src/mame/drivers/pcxt.cpp @@ -104,7 +104,7 @@ public: virtual const tiny_rom_entry *device_rom_region() const override; }; -const device_type ISA8_CGA_FILETTO = &device_creator; +const device_type ISA8_CGA_FILETTO = device_creator; //------------------------------------------------- // isa8_cga_filetto_device - constructor @@ -145,7 +145,7 @@ private: /* for superimposing CGA over a different source video (i.e. tetriskr) */ -const device_type ISA8_CGA_TETRISKR = &device_creator; +const device_type ISA8_CGA_TETRISKR = device_creator; //------------------------------------------------- // isa8_cga_tetriskr_device - constructor diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp index a9aa4589742..64914230cb8 100644 --- a/src/mame/drivers/pda600.cpp +++ b/src/mame/drivers/pda600.cpp @@ -60,6 +60,7 @@ #include "machine/nvram.h" #include "machine/hd64610.h" #include "rendlay.h" +#include "screen.h" class pda600_state : public driver_device diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp index 6fcb5a367e7..25576561e5f 100644 --- a/src/mame/drivers/pdp1.cpp +++ b/src/mame/drivers/pdp1.cpp @@ -56,9 +56,12 @@ To load and play a game: */ #include "emu.h" -#include "cpu/pdp1/pdp1.h" #include "includes/pdp1.h" + +#include "cpu/pdp1/pdp1.h" #include "video/crt.h" +#include "screen.h" + /* * @@ -687,7 +690,7 @@ protected: virtual void device_start() override { } }; -const device_type PDP1_READTAPE = &device_creator; +const device_type PDP1_READTAPE = device_creator; pdp1_readtape_image_device::pdp1_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PDP1_READTAPE, "PDP1 Tape Reader", tag, owner, clock, "pdp1_readtape_image", __FILE__), @@ -720,7 +723,7 @@ protected: virtual void device_start() override { } }; -const device_type PDP1_PUNCHTAPE = &device_creator; +const device_type PDP1_PUNCHTAPE = device_creator; pdp1_punchtape_image_device::pdp1_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PDP1_PUNCHTAPE, "PDP1 Tape Puncher", tag, owner, clock, "pdp1_punchtape_image", __FILE__), @@ -754,7 +757,7 @@ protected: virtual void device_start() override { } }; -const device_type PDP1_PRINTER = &device_creator; +const device_type PDP1_PRINTER = device_creator; pdp1_printer_image_device::pdp1_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PDP1_PRINTER, "PDP1 Typewriter", tag, owner, clock, "pdp1_printer_image", __FILE__), @@ -787,7 +790,7 @@ protected: virtual void device_start() override { } }; -const device_type PDP1_CYLINDER = &device_creator; +const device_type PDP1_CYLINDER = device_creator; pdp1_cylinder_image_device::pdp1_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PDP1_CYLINDER, "PDP1 Cylinder", tag, owner, clock, "pdp1_cylinder_image", __FILE__), diff --git a/src/mame/drivers/pecom.cpp b/src/mame/drivers/pecom.cpp index 5a32fcf84e6..e3a7c09abef 100644 --- a/src/mame/drivers/pecom.cpp +++ b/src/mame/drivers/pecom.cpp @@ -9,12 +9,12 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/cosmac/cosmac.h" -#include "sound/cdp1869.h" -#include "sound/wave.h" -#include "machine/ram.h" #include "includes/pecom.h" + +#include "sound/wave.h" #include "softlist.h" +#include "speaker.h" + /* Address maps */ static ADDRESS_MAP_START(pecom64_mem, AS_PROGRAM, 8, pecom_state ) diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index f509c095e46..441f3eae6d0 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -38,13 +38,15 @@ ****************************************************************************/ #include "emu.h" +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" #include "cpu/m6809/m6809.h" -#include "machine/6821pia.h" #include "imagedev/cassette.h" +#include "machine/6821pia.h" #include "sound/wave.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class pegasus_state : public driver_device diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp index 85cb0a884b2..de259bedd5a 100644 --- a/src/mame/drivers/pencil2.cpp +++ b/src/mame/drivers/pencil2.cpp @@ -81,15 +81,19 @@ ToDo: ****************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "video/tms9928a.h" -#include "sound/sn76496.h" -#include "bus/centronics/ctronics.h" #include "imagedev/cassette.h" +#include "sound/sn76496.h" #include "sound/wave.h" +#include "video/tms9928a.h" + +#include "bus/centronics/ctronics.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" + #include "softlist.h" +#include "speaker.h" class pencil2_state : public driver_device { diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp index 21c71645e8e..5bf0abc267c 100644 --- a/src/mame/drivers/pengadvb.cpp +++ b/src/mame/drivers/pengadvb.cpp @@ -30,6 +30,8 @@ NOTE! switches 1, 3 & 5 must be ON or the game will not boot. #include "sound/ay8910.h" #include "machine/i8255.h" #include "machine/bankdev.h" +#include "screen.h" +#include "speaker.h" class pengadvb_state : public driver_device diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp index 1e9f04fe512..bfdf991f4eb 100644 --- a/src/mame/drivers/pengo.cpp +++ b/src/mame/drivers/pengo.cpp @@ -64,9 +64,12 @@ ***************************************************************************/ #include "emu.h" +#include "includes/pacman.h" + #include "cpu/z80/z80.h" #include "machine/segacrpt_device.h" -#include "includes/pacman.h" +#include "screen.h" +#include "speaker.h" class pengo_state : public pacman_state diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp index 725e3003b2c..0908792973f 100644 --- a/src/mame/drivers/pentagon.cpp +++ b/src/mame/drivers/pentagon.cpp @@ -3,15 +3,16 @@ #include "emu.h" #include "includes/spectrum.h" #include "includes/spec128.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" -#include "sound/ay8910.h" -#include "sound/speaker.h" -#include "formats/tzx_cas.h" + #include "machine/beta.h" -#include "machine/ram.h" +#include "sound/ay8910.h" + +#include "screen.h" #include "softlist.h" -#include "machine/spec_snqk.h" +#include "speaker.h" + +#include "formats/tzx_cas.h" + class pentagon_state : public spectrum_state { diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index 51ed69a429d..bf74ab4926b 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -12,6 +12,7 @@ #include "video/mc6845.h" #include "bus/rs232/rs232.h" #include "bus/rs232/keyboard.h" +#include "screen.h" class peoplepc_state : public driver_device { diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index 930cc3ecdde..3dd638353cf 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -197,11 +197,14 @@ A Note about Best Bet Products. ***********************************************************************************/ #include "emu.h" -#include "sound/ay8910.h" -#include "machine/nvram.h" + #include "cpu/mcs51/mcs51.h" #include "machine/i2cmem.h" +#include "machine/nvram.h" +#include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #include "peplus.lh" #include "pe_schip.lh" diff --git a/src/mame/drivers/pes.cpp b/src/mame/drivers/pes.cpp index 5016cc07b28..0461e47042b 100644 --- a/src/mame/drivers/pes.cpp +++ b/src/mame/drivers/pes.cpp @@ -53,17 +53,20 @@ Address map: port 3.7: write, /RD (general) and /OE (pin 22) for unpopulated 6164 SRAM */ +#include "emu.h" +#include "includes/pes.h" + +#include "cpu/mcs51/mcs51.h" +#include "sound/tms5220.h" +#include "speaker.h" + + #define CPU_CLOCK XTAL_10_245MHz #undef DEBUG_FIFO #undef DEBUG_SERIAL_CB #undef DEBUG_PORTS -/* Core includes */ -#include "emu.h" -#include "includes/pes.h" -#include "cpu/mcs51/mcs51.h" -#include "sound/tms5220.h" /* Devices */ WRITE8_MEMBER(pes_state::pes_kbd_input) diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index ca63cc6cbe2..c61110972ff 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -150,7 +150,9 @@ ROM sockets: UA3 2K or 4K character */ #include "emu.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "bus/ieee488/c2040.h" @@ -166,7 +168,7 @@ ROM sockets: UA3 2K or 4K character #include "machine/cbm_snqk.h" #include "machine/pla.h" #include "machine/ram.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/mc6845.h" #define M6502_TAG "f3" diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp index aeafb8576bc..97dc88a6624 100644 --- a/src/mame/drivers/peyper.cpp +++ b/src/mame/drivers/peyper.cpp @@ -35,9 +35,12 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/z80/z80.h" #include "machine/i8279.h" #include "sound/ay8910.h" +#include "speaker.h" + #include "peyper.lh" class peyper_state : public genpin_class diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp index 8cfbfa7e2d3..7a6cc974b42 100644 --- a/src/mame/drivers/pg685.cpp +++ b/src/mame/drivers/pg685.cpp @@ -79,10 +79,9 @@ Memory: 54x 64KBit RAM, 18 empty sockets, 9 bit and 4 bit wire straps ****************************************************************************/ #include "emu.h" -#include "cpu/nec/nec.h" -#include "cpu/i86/i86.h" #include "cpu/i86/i286.h" -#include "video/mc6845.h" +#include "cpu/i86/i86.h" +#include "cpu/nec/nec.h" #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/i8279.h" @@ -90,8 +89,10 @@ Memory: 54x 64KBit RAM, 18 empty sockets, 9 bit and 4 bit wire straps #include "machine/mm58167.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/wd_fdc.h" #include "machine/wd2010.h" +#include "machine/wd_fdc.h" +#include "video/mc6845.h" +#include "screen.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index ff30d11ee7a..31a4bfe23cf 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -187,10 +187,9 @@ Notes: */ -#define PGMLOGERROR 0 - #include "emu.h" #include "includes/pgm.h" + #include "machine/pgmprot_igs025_igs012.h" #include "machine/pgmprot_igs025_igs022.h" #include "machine/pgmprot_igs025_igs028.h" @@ -199,6 +198,12 @@ Notes: #include "machine/pgmprot_igs027a_type3.h" #include "machine/pgmprot_orlegend.h" +#include "screen.h" +#include "speaker.h" + +#define PGMLOGERROR 0 + + READ16_MEMBER(pgm_state::pgm_videoram_r) { if (offset < 0x4000 / 2) diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp index 5a47728810f..15df4e616ac 100644 --- a/src/mame/drivers/pgm2.cpp +++ b/src/mame/drivers/pgm2.cpp @@ -53,6 +53,8 @@ #include "cpu/arm7/arm7core.h" #include "sound/ymz770.h" #include "machine/igs036crypt.h" +#include "screen.h" +#include "speaker.h" class pgm2_state : public driver_device { diff --git a/src/mame/drivers/pgm3.cpp b/src/mame/drivers/pgm3.cpp index 218dd683b5d..6bcdd3f91ae 100644 --- a/src/mame/drivers/pgm3.cpp +++ b/src/mame/drivers/pgm3.cpp @@ -53,6 +53,7 @@ #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" +#include "screen.h" class pgm3_state : public driver_device diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp index a009bc99fc8..905504b6fbf 100644 --- a/src/mame/drivers/phc25.cpp +++ b/src/mame/drivers/phc25.cpp @@ -40,6 +40,9 @@ RUN #include "emu.h" #include "includes/phc25.h" +#include "speaker.h" + + /* Read/Write Handlers */ READ8_MEMBER( phc25_state::port40_r ) diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp index bb3e1e0e370..b1f955395c6 100644 --- a/src/mame/drivers/phoenix.cpp +++ b/src/mame/drivers/phoenix.cpp @@ -28,10 +28,13 @@ Pleiads: ***************************************************************************/ #include "emu.h" +#include "includes/phoenix.h" + #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" #include "sound/ay8910.h" -#include "includes/phoenix.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( phoenix_memory_map, AS_PROGRAM, 8, phoenix_state ) diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp index bd965a5bf6e..ef1b28fdccf 100644 --- a/src/mame/drivers/photon.cpp +++ b/src/mame/drivers/photon.cpp @@ -18,10 +18,13 @@ */ #include "emu.h" -#include "cpu/i8085/i8085.h" #include "includes/pk8000.h" + +#include "cpu/i8085/i8085.h" #include "machine/i8255.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" class photon_state : public pk8000_base_state diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp index af17cb91d56..2cf2362e086 100644 --- a/src/mame/drivers/photon2.cpp +++ b/src/mame/drivers/photon2.cpp @@ -23,7 +23,9 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" class photon2_state : public driver_device diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index c7cbf6a0728..2a70fb87a1a 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -28,11 +28,13 @@ #include "emu.h" #include "cpu/s2650/s2650.h" -#include "machine/keyboard.h" -#include "sound/speaker.h" #include "imagedev/cassette.h" -#include "sound/wave.h" #include "imagedev/snapquik.h" +#include "machine/keyboard.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" #define LOG 1 diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp index e1a0d8e16d1..d1eda58516d 100644 --- a/src/mame/drivers/piggypas.cpp +++ b/src/mame/drivers/piggypas.cpp @@ -14,9 +14,12 @@ game details unknown #include "machine/ticket.h" #include "sound/okim6295.h" #include "video/hd44780.h" +#include "screen.h" +#include "speaker.h" #include "piggypas.lh" + class piggypas_state : public driver_device { public: diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp index b79dbea3fca..85c522d4df0 100644 --- a/src/mame/drivers/pinball2k.cpp +++ b/src/mame/drivers/pinball2k.cpp @@ -20,11 +20,14 @@ #include "emu.h" #include "cpu/i386/i386.h" +#include "machine/idectrl.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" -#include "machine/idectrl.h" +#include "machine/pcshare.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + class pinball2k_state : public pcat_base_state { diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp index 4b1210999ca..03a5fc68e39 100644 --- a/src/mame/drivers/pingpong.cpp +++ b/src/mame/drivers/pingpong.cpp @@ -7,11 +7,14 @@ Ping Pong (c) 1985 Konami ***************************************************************************/ #include "emu.h" +#include "includes/pingpong.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/pingpong.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp index 1995ad424d4..1416bdc446a 100644 --- a/src/mame/drivers/pinkiri8.cpp +++ b/src/mame/drivers/pinkiri8.cpp @@ -41,6 +41,8 @@ Dumped by Chackn #include "emu.h" #include "cpu/z180/z180.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class pinkiri8_state : public driver_device @@ -130,7 +132,7 @@ DEVICE_ADDRESS_MAP_START( map, 8, janshi_vdp_device ) AM_RANGE(0xff6000, 0xff601f) AM_RAM AM_SHARE("crtc_regs") ADDRESS_MAP_END -const device_type JANSHIVDP = &device_creator; +const device_type JANSHIVDP = device_creator; janshi_vdp_device::janshi_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, JANSHIVDP, "Janshi VDP", tag, owner, clock, "janshi_vdp", __FILE__), diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp index 6f8764ac51f..b6c68fd4bf7 100644 --- a/src/mame/drivers/pipedrm.cpp +++ b/src/mame/drivers/pipedrm.cpp @@ -163,10 +163,12 @@ Added Multiple Coin Feature: #include "emu.h" +#include "includes/fromance.h" + #include "cpu/z80/z80.h" #include "sound/2608intf.h" #include "sound/2610intf.h" -#include "includes/fromance.h" +#include "speaker.h" class pipedrm_state : public fromance_state diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index b7298c672b2..40cce978752 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -76,6 +76,9 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" + class pipeline_state : public driver_device { @@ -88,8 +91,8 @@ public: , m_palette(*this, "palette") , m_vram1(*this, "vram1") , m_vram2(*this, "vram2") - { - } + { + } DECLARE_WRITE8_MEMBER(vram2_w); DECLARE_WRITE8_MEMBER(vram1_w); diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp index c315a705688..e31a6f56fd1 100644 --- a/src/mame/drivers/pirates.cpp +++ b/src/mame/drivers/pirates.cpp @@ -90,10 +90,13 @@ Notes: ---*/ #include "emu.h" +#include "includes/pirates.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "sound/okim6295.h" -#include "includes/pirates.h" +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(pirates_state::out_w) diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp index 81dd4b007d6..db7a8dc2044 100644 --- a/src/mame/drivers/pitagjr.cpp +++ b/src/mame/drivers/pitagjr.cpp @@ -152,16 +152,19 @@ #include "emu.h" #include "cpu/m6805/m6805.h" + #include "rendlay.h" +#include "screen.h" + class pitagjr_state : public driver_device { public: pitagjr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_rombank(*this, "rombank") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_rombank(*this, "rombank") + { } required_device m_maincpu; required_memory_bank m_rombank; diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp index 80d20ddf5b9..ca31ba1fd5d 100644 --- a/src/mame/drivers/pitnrun.cpp +++ b/src/mame/drivers/pitnrun.cpp @@ -76,6 +76,9 @@ K1000233A #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + INTERRUPT_GEN_MEMBER(pitnrun_state::nmi_source) { diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp index 35d0a1234ff..c004cc43fda 100644 --- a/src/mame/drivers/pk8000.cpp +++ b/src/mame/drivers/pk8000.cpp @@ -10,15 +10,20 @@ ****************************************************************************/ #include "emu.h" +#include "includes/pk8000.h" + #include "cpu/i8085/i8085.h" #include "machine/i8255.h" #include "imagedev/cassette.h" -#include "formats/fmsx_cas.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" -#include "includes/pk8000.h" #include "machine/ram.h" +#include "screen.h" +#include "speaker.h" + +#include "formats/fmsx_cas.h" + class pk8000_state : public pk8000_base_state { diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp index a2b86af09cf..b8fc7507c18 100644 --- a/src/mame/drivers/pk8020.cpp +++ b/src/mame/drivers/pk8020.cpp @@ -11,13 +11,16 @@ #include "emu.h" +#include "includes/pk8020.h" + #include "cpu/i8085/i8085.h" #include "machine/i8255.h" #include "imagedev/flopdrv.h" #include "formats/pk8020_dsk.h" -#include "includes/pk8020.h" #include "machine/ram.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* Address maps */ static ADDRESS_MAP_START(pk8020_mem, AS_PROGRAM, 8, pk8020_state ) diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp index cf431d9c6cd..a2286f6064a 100644 --- a/src/mame/drivers/pkscram.cpp +++ b/src/mame/drivers/pkscram.cpp @@ -15,8 +15,10 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli #include "emu.h" #include "cpu/m68000/m68000.h" -#include "sound/2203intf.h" #include "machine/nvram.h" +#include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" class pkscram_state : public driver_device diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp index b22a56bf92f..9574d25c432 100644 --- a/src/mame/drivers/pktgaldx.cpp +++ b/src/mame/drivers/pktgaldx.cpp @@ -55,11 +55,15 @@ bootleg todo: */ #include "emu.h" +#include "includes/pktgaldx.h" + #include "cpu/m68000/m68000.h" #include "machine/decocrpt.h" #include "machine/deco102.h" #include "sound/okim6295.h" -#include "includes/pktgaldx.h" +#include "screen.h" +#include "speaker.h" + /**********************************************************************************/ diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index ee02d3373b1..59dc7f07194 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -25,6 +25,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class plan80_state : public driver_device diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp index c5109c99bac..a48e8b08efa 100644 --- a/src/mame/drivers/play_1.cpp +++ b/src/mame/drivers/play_1.cpp @@ -19,14 +19,17 @@ Others: When starting the game, hold down X, then release and hit Z, otherwise **********************************************************************************/ - #include "emu.h" #include "machine/genpin.h" + #include "cpu/cosmac/cosmac.h" #include "machine/clock.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "speaker.h" + #include "play_1.lh" + class play_1_state : public genpin_class { public: diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp index d5f294c9e24..0f7ba393990 100644 --- a/src/mame/drivers/play_2.cpp +++ b/src/mame/drivers/play_2.cpp @@ -33,14 +33,18 @@ Notes: #include "emu.h" #include "machine/genpin.h" -#include "cpu/cosmac/cosmac.h" + #include "cpu/cop400/cop400.h" -#include "machine/clock.h" +#include "cpu/cosmac/cosmac.h" #include "machine/7474.h" +#include "machine/clock.h" #include "sound/ay8910.h" #include "sound/cdp1863.h" +#include "speaker.h" + #include "play_2.lh" + class play_2_state : public genpin_class { public: diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp index 8f07acf7d1e..af22906fa49 100644 --- a/src/mame/drivers/play_3.cpp +++ b/src/mame/drivers/play_3.cpp @@ -45,14 +45,18 @@ The manual is not that clear, there's a lot we don't know, this *seems* to work. #include "emu.h" #include "machine/genpin.h" +#include "audio/efo_zsu.h" + #include "cpu/cosmac/cosmac.h" #include "machine/clock.h" #include "machine/7474.h" #include "sound/ay8910.h" -#include "audio/efo_zsu.h" +#include "speaker.h" + #include "play_3.lh" + class play_3_state : public genpin_class { public: diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index 3e36bd64fde..f3a5a5f8722 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -292,13 +292,16 @@ Notes & Todo: ***************************************************************************/ #include "emu.h" +#include "includes/playch10.h" + #include "cpu/m6502/n2a03.h" #include "cpu/z80/z80.h" #include "machine/rp5h01.h" #include "machine/nvram.h" #include "rendlay.h" -#include "includes/playch10.h" +#include "screen.h" +#include "speaker.h" /* clock frequency */ #define N2A03_DEFAULTCLOCK (21477272.724 / 12) diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp index 489e681bd9a..6ec5e882504 100644 --- a/src/mame/drivers/playmark.cpp +++ b/src/mame/drivers/playmark.cpp @@ -61,13 +61,16 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/playmark.h" + #include "cpu/m68000/m68000.h" -#include "machine/eepromser.h" #include "cpu/pic16c5x/pic16c5x.h" -#include "sound/okim6295.h" -#include "includes/playmark.h" -#include "machine/ticket.h" +#include "machine/eepromser.h" #include "machine/nvram.h" +#include "machine/ticket.h" +#include "screen.h" +#include "sound/okim6295.h" +#include "speaker.h" WRITE16_MEMBER(playmark_state::coinctrl_w) diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp index ab96baf6bb8..38dd420dfd3 100644 --- a/src/mame/drivers/plus4.cpp +++ b/src/mame/drivers/plus4.cpp @@ -12,7 +12,9 @@ */ #include "emu.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "bus/cbmiec/cbmiec.h" #include "bus/pet/cass.h" #include "bus/plus4/exp.h" diff --git a/src/mame/drivers/pluto5.cpp b/src/mame/drivers/pluto5.cpp index 6a9fe99efa1..f6e5fce2e01 100644 --- a/src/mame/drivers/pluto5.cpp +++ b/src/mame/drivers/pluto5.cpp @@ -179,6 +179,7 @@ #include "emu.h" #include "machine/68340.h" +#include "speaker.h" class pluto5_state : public driver_device { diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp index 18c48c18925..69901872957 100644 --- a/src/mame/drivers/plygonet.cpp +++ b/src/mame/drivers/plygonet.cpp @@ -63,13 +63,16 @@ */ +#include "includes/plygonet.h" #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "sound/k054539.h" #include "machine/watchdog.h" -#include "includes/plygonet.h" +#include "sound/k054539.h" +#include "screen.h" +#include "speaker.h" + enum { BANK_GROUP_A, BANK_GROUP_B, INVALID_BANK_GROUP }; diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp index 143963a5f0f..af3ca41d182 100644 --- a/src/mame/drivers/pmd85.cpp +++ b/src/mame/drivers/pmd85.cpp @@ -172,16 +172,22 @@ I/O ports *******************************************************************************/ #include "emu.h" +#include "includes/pmd85.h" + #include "cpu/i8085/i8085.h" -#include "sound/wave.h" #include "imagedev/cassette.h" -#include "includes/pmd85.h" +#include "machine/i8251.h" #include "machine/i8255.h" #include "machine/pit8253.h" -#include "machine/i8251.h" -#include "formats/pmd_cas.h" #include "machine/ram.h" +#include "sound/wave.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/pmd_cas.h" + //************************************************************************** // VIDEO EMULATION diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp index 724e662f24a..5b5dcba359f 100644 --- a/src/mame/drivers/pntnpuzl.cpp +++ b/src/mame/drivers/pntnpuzl.cpp @@ -126,6 +126,7 @@ CN1 standard DB15 VGA connector (15KHz) #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "video/pc_vga.h" +#include "screen.h" class pntnpuzl_state : public driver_device @@ -135,7 +136,7 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_eeprom(*this, "eeprom") - { } + { } uint16_t m_eeprom_data; uint16_t m_pntpzl_200000; diff --git a/src/mame/drivers/pockchal.cpp b/src/mame/drivers/pockchal.cpp index 1b2206bf2a8..facc24e60d6 100644 --- a/src/mame/drivers/pockchal.cpp +++ b/src/mame/drivers/pockchal.cpp @@ -21,11 +21,15 @@ Cart sizes: 1MB, 2MB, 4MB ********************************************************************/ #include "emu.h" + #include "cpu/tlcs90/tlcs90.h" -#include "softlist.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" +#include "softlist.h" + class pockchalv1_state : public driver_device { @@ -34,7 +38,7 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cart(*this, "cartslot") - { } + { } virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp index 6af288dc643..1fbb9501f14 100644 --- a/src/mame/drivers/pocketc.cpp +++ b/src/mame/drivers/pocketc.cpp @@ -7,15 +7,18 @@ ******************************************************************************/ #include "emu.h" -#include "cpu/sc61860/sc61860.h" - #include "includes/pocketc.h" #include "includes/pc1401.h" #include "includes/pc1251.h" #include "includes/pc1350.h" #include "includes/pc1403.h" + +#include "cpu/sc61860/sc61860.h" #include "machine/ram.h" +#include "screen.h" + + /* pc1430 no peek poke operations! */ /* pc1280?? */ diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp index f373c53256a..8c83cbc9b4e 100644 --- a/src/mame/drivers/pockstat.cpp +++ b/src/mame/drivers/pockstat.cpp @@ -47,6 +47,8 @@ If you do nothing for about 20 secs, it turns itself off (screen goes white). #include "cpu/arm7/arm7core.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #define MAX_PS_TIMERS 3 diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp index cbe4eea2cf2..5d9b7ac92b1 100644 --- a/src/mame/drivers/pofo.cpp +++ b/src/mame/drivers/pofo.cpp @@ -33,8 +33,7 @@ */ #include "emu.h" -#include "rendlay.h" -#include "softlist.h" + #include "cpu/i86/i86.h" #include "bus/pofo/ccm.h" #include "bus/pofo/exp.h" @@ -43,6 +42,11 @@ #include "sound/pcd3311.h" #include "video/hd61830.h" +#include "rendlay.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + //************************************************************************** diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp index c42205446e3..7fd8d30d95c 100644 --- a/src/mame/drivers/poisk1.cpp +++ b/src/mame/drivers/poisk1.cpp @@ -9,21 +9,22 @@ ***************************************************************************/ #include "emu.h" - #include "machine/kb_poisk1.h" -#include "video/cgapal.h" + +#include "bus/isa/isa.h" +#include "bus/isa/xsu_cards.h" +#include "cpu/i86/i86.h" #include "imagedev/cassette.h" #include "machine/i8255.h" -#include "bus/isa/isa.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" -#include "bus/isa/xsu_cards.h" -#include "sound/speaker.h" - -#include "cpu/i86/i86.h" +#include "sound/spkrdev.h" +#include "video/cgapal.h" #include "softlist.h" +#include "speaker.h" + #define CGA_PALETTE_SETS 83 /* one for colour, one for mono, 81 for colour composite */ diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp index 58767d749b7..4885939cd14 100644 --- a/src/mame/drivers/pokechmp.cpp +++ b/src/mame/drivers/pokechmp.cpp @@ -41,11 +41,16 @@ ClawGrip, Jul 2006 */ #include "emu.h" +#include "includes/pokechmp.h" + #include "cpu/m6502/m6502.h" #include "sound/2203intf.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/pokechmp.h" + +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(pokechmp_state::pokechmp_bank_w) { diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp index 0287115cdd1..6f75c5b1d5c 100644 --- a/src/mame/drivers/pokemini.cpp +++ b/src/mame/drivers/pokemini.cpp @@ -10,13 +10,15 @@ The LCD is likely to be a SSD1828 LCD. ********************************************************************/ #include "emu.h" -#include "sound/speaker.h" -#include "machine/i2cmem.h" #include "cpu/minx/minx.h" +#include "machine/i2cmem.h" +#include "sound/spkrdev.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" struct PRC { diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp index 9ecc000c37f..903b8a322df 100644 --- a/src/mame/drivers/poker72.cpp +++ b/src/mame/drivers/poker72.cpp @@ -21,6 +21,8 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class poker72_state : public driver_device diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index bcddb13d8b2..6a7b0dc8509 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -218,20 +218,22 @@ Todo: ***************************************************************************/ #include "emu.h" +#include "includes/polepos.h" +#include "audio/namco52.h" +#include "audio/namco54.h" + #include "cpu/z80/z80.h" #include "cpu/z8000/z8000.h" #include "cpu/mb88xx/mb88xx.h" #include "machine/namco06.h" #include "machine/namco51.h" #include "machine/namco53.h" -#include "audio/namco52.h" -#include "audio/namco54.h" -#include "includes/polepos.h" +#include "machine/nvram.h" +#include "machine/watchdog.h" #include "sound/dac.h" #include "sound/tms5220.h" #include "sound/volt_reg.h" -#include "machine/nvram.h" -#include "machine/watchdog.h" +#include "speaker.h" #include "polepos.lh" #include "topracer.lh" diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp index bbd958b02df..4b5a7f55f37 100644 --- a/src/mame/drivers/policetr.cpp +++ b/src/mame/drivers/policetr.cpp @@ -87,10 +87,12 @@ PC5380-9651 5380-JY3306A 5380-N1045503A ***************************************************************************/ #include "emu.h" +#include "includes/policetr.h" + #include "cpu/mips/r3000.h" #include "machine/eepromser.h" -#include "includes/policetr.h" #include "sound/bsmt2000.h" +#include "speaker.h" /* constants */ diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp index 6771465d81a..cc70f11556f 100644 --- a/src/mame/drivers/poly.cpp +++ b/src/mame/drivers/poly.cpp @@ -36,10 +36,13 @@ #include "machine/6840ptm.h" #include "machine/6850acia.h" #include "machine/clock.h" +#include "machine/keyboard.h" #include "machine/mc6854.h" +#include "sound/spkrdev.h" #include "video/saa5050.h" -#include "machine/keyboard.h" -#include "sound/speaker.h" +#include "screen.h" +#include "speaker.h" + class poly_state : public driver_device { diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp index 6ba6267499b..1d991d6ab67 100644 --- a/src/mame/drivers/poly88.cpp +++ b/src/mame/drivers/poly88.cpp @@ -27,10 +27,14 @@ ****************************************************************************/ #include "emu.h" +#include "includes/poly88.h" + #include "cpu/i8085/i8085.h" #include "imagedev/cassette.h" #include "sound/wave.h" -#include "includes/poly88.h" +#include "screen.h" +#include "speaker.h" + static ADDRESS_MAP_START(poly88_mem, AS_PROGRAM, 8, poly88_state ) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp index 8ca87d1058a..9e957d405bf 100644 --- a/src/mame/drivers/polyplay.cpp +++ b/src/mame/drivers/polyplay.cpp @@ -132,11 +132,17 @@ this.) ***************************************************************************/ #include "emu.h" +#include "includes/polyplay.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "includes/polyplay.h" + +#include "screen.h" +#include "speaker.h" + #include "polyplay.lh" + static const z80_daisy_config daisy_chain_zre[] = { { Z80CTC_TAG }, diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp index d9c67a78e6b..27eddca1a71 100644 --- a/src/mame/drivers/pong.cpp +++ b/src/mame/drivers/pong.cpp @@ -59,6 +59,9 @@ TODO: Superpong is believed to use the Pong (Rev E) PCB with some minor modifica #include "machine/nl_pong.h" #include "machine/nl_pongd.h" +#include "screen.h" +#include "speaker.h" + #include "breakout.lh" #include diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp index 7a26d97eed7..b9d29968640 100644 --- a/src/mame/drivers/poolshrk.cpp +++ b/src/mame/drivers/poolshrk.cpp @@ -7,10 +7,13 @@ Atari Poolshark Driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6800/m6800.h" #include "includes/poolshrk.h" + +#include "cpu/m6800/m6800.h" #include "sound/discrete.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp index 12e69043404..4988e2caf7e 100644 --- a/src/mame/drivers/pooyan.cpp +++ b/src/mame/drivers/pooyan.cpp @@ -11,12 +11,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/pooyan.h" +#include "includes/konamipt.h" +#include "audio/timeplt.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" -#include "audio/timeplt.h" -#include "includes/pooyan.h" -#include "includes/konamipt.h" +#include "screen.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp index 794ae326bb8..93646d51a2b 100644 --- a/src/mame/drivers/popeye.cpp +++ b/src/mame/drivers/popeye.cpp @@ -18,12 +18,17 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "includes/popeye.h" + +#include "cpu/z80/z80.h" #include "machine/netlist.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #include "netlist/devices/net_lib.h" + /* This is the output stage of the audio circuit. * It is solely an impedance changer and could be left away */ diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp index ceddfcd3847..45368f8efd6 100644 --- a/src/mame/drivers/popobear.cpp +++ b/src/mame/drivers/popobear.cpp @@ -81,6 +81,8 @@ Component Side A B Solder Side #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" class popobear_state : public driver_device { diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp index b21d2f4c39f..d4f78eee780 100644 --- a/src/mame/drivers/portrait.cpp +++ b/src/mame/drivers/portrait.cpp @@ -86,11 +86,15 @@ DM81LS95 = TriState buffer **************************************************************************/ #include "emu.h" +#include "includes/portrait.h" + #include "cpu/z80/z80.h" #include "cpu/mcs48/mcs48.h" #include "machine/gen_latch.h" #include "machine/nvram.h" -#include "includes/portrait.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(portrait_state::ctrl_w) { diff --git a/src/mame/drivers/potgoldu.cpp b/src/mame/drivers/potgoldu.cpp index a950e50f19c..a9d32615689 100644 --- a/src/mame/drivers/potgoldu.cpp +++ b/src/mame/drivers/potgoldu.cpp @@ -21,6 +21,7 @@ #include "emu.h" #include "cpu/tms34010/tms34010.h" +#include "screen.h" class potgold_state : public driver_device diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp index 879b0c00e91..29fbf0c0d17 100644 --- a/src/mame/drivers/powerbal.cpp +++ b/src/mame/drivers/powerbal.cpp @@ -16,17 +16,22 @@ Magic Sticks: */ #include "emu.h" +#include "includes/playmark.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "sound/okim6295.h" -#include "includes/playmark.h" +#include "screen.h" +#include "speaker.h" + class powerbal_state : public playmark_state { public: powerbal_state(const machine_config &mconfig, device_type type, const char *tag) - : playmark_state(mconfig, type, tag), - m_eeprom(*this, "eeprom") { } + : playmark_state(mconfig, type, tag) + , m_eeprom(*this, "eeprom") + { } /* powerbal-specific */ int m_tilebank; diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp index 06953b82de4..fe58539eaa1 100644 --- a/src/mame/drivers/powerins.cpp +++ b/src/mame/drivers/powerins.cpp @@ -31,12 +31,14 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/powerins.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "sound/2203intf.h" -#include "includes/powerins.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp index 2ef15721130..e9ae497286d 100644 --- a/src/mame/drivers/pp01.cpp +++ b/src/mame/drivers/pp01.cpp @@ -8,10 +8,12 @@ ****************************************************************************/ - #include "emu.h" #include "includes/pp01.h" +#include "screen.h" +#include "speaker.h" + /* Address maps */ static ADDRESS_MAP_START(pp01_mem, AS_PROGRAM, 8, pp01_state ) diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp index 60422c41e82..0d06ff0da02 100644 --- a/src/mame/drivers/ppmast93.cpp +++ b/src/mame/drivers/ppmast93.cpp @@ -137,6 +137,8 @@ Dip locations added based on the notes above. #include "sound/dac.h" #include "sound/volt_reg.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" class ppmast93_state : public driver_device diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp index 1bca554476d..2810eb5afa3 100644 --- a/src/mame/drivers/prehisle.cpp +++ b/src/mame/drivers/prehisle.cpp @@ -11,10 +11,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/prehisle.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/3812intf.h" -#include "includes/prehisle.h" +#include "screen.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp index 94b547e7dfc..996f8ac0687 100644 --- a/src/mame/drivers/prestige.cpp +++ b/src/mame/drivers/prestige.cpp @@ -78,14 +78,18 @@ Notes: #include "emu.h" + #include "cpu/z80/z80.h" #include "machine/ram.h" -#include "rendlay.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" + +#include "rendlay.h" +#include "screen.h" #include "softlist.h" + class prestige_state : public driver_device { public: @@ -101,7 +105,7 @@ public: , m_bank3(*this, "bank3") , m_bank4(*this, "bank4") , m_bank5(*this, "bank5") - { } + { } required_device m_maincpu; required_device m_ram; diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp index 7a1e8cbc9be..3b87115ed8e 100644 --- a/src/mame/drivers/primo.cpp +++ b/src/mame/drivers/primo.cpp @@ -107,14 +107,15 @@ Interrupts: *******************************************************************************/ #include "emu.h" -#include "sound/speaker.h" -#include "sound/wave.h" #include "includes/primo.h" + #include "cpu/z80/z80.h" -#include "imagedev/cassette.h" -#include "imagedev/snapquik.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" + #include "formats/primoptp.h" -#include "bus/cbmiec/cbmiec.h" + static ADDRESS_MAP_START( primoa_port, AS_IO, 8, primo_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp index f2fb3385f80..18323aad76a 100644 --- a/src/mame/drivers/pro80.cpp +++ b/src/mame/drivers/pro80.cpp @@ -19,12 +19,17 @@ The cassette uses 2 bits for input, plus a D flipflop and a 74LS221 oneshot, wit #include "emu.h" + #include "cpu/z80/z80.h" #include "machine/z80pio.h" #include "imagedev/cassette.h" #include "sound/wave.h" + +#include "speaker.h" + #include "pro80.lh" + class pro80_state : public driver_device { public: diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index dbff3d2d993..6abac672b61 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -25,17 +25,21 @@ #include "emu.h" + #include "cpu/z80/z80.h" -#include "machine/z80pio.h" +#include "machine/meters.h" +#include "machine/roc10937.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" +#include "machine/z80pio.h" #include "sound/ay8910.h" #include "video/awpvid.h" -#include "machine/roc10937.h" -#include "machine/meters.h" + +#include "speaker.h" #include "proconn.lh" + class proconn_state : public driver_device { public: diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp index 0039a148067..6b4119ec559 100644 --- a/src/mame/drivers/prof180x.cpp +++ b/src/mame/drivers/prof180x.cpp @@ -24,11 +24,12 @@ #include "emu.h" +#include "includes/prof180x.h" + #include "cpu/z80/z80.h" #include "machine/ram.h" -#include "bus/centronics/ctronics.h" #include "machine/upd765.h" -#include "includes/prof180x.h" +#include "screen.h" #include "softlist.h" uint32_t prof180x_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp index 3db5b9fb7ea..5534af9c152 100644 --- a/src/mame/drivers/progolf.cpp +++ b/src/mame/drivers/progolf.cpp @@ -58,6 +58,9 @@ Twenty four 8116 rams. #include "video/mc6845.h" #include "machine/deco222.h" #include "machine/decocpu6.h" +#include "screen.h" +#include "speaker.h" + class progolf_state : public driver_device { diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index d689f6e56c3..670700347e8 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -45,15 +45,20 @@ ******************************************************************************/ #include "emu.h" + #include "cpu/m6800/m6800.h" +#include "imagedev/cassette.h" #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/clock.h" #include "machine/keyboard.h" -#include "imagedev/cassette.h" #include "sound/wave.h" + #include "bus/rs232/rs232.h" +#include "screen.h" +#include "speaker.h" + class proteus3_state : public driver_device { diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp index ebf33ed19d1..1f58d334425 100644 --- a/src/mame/drivers/psikyo.cpp +++ b/src/mame/drivers/psikyo.cpp @@ -66,12 +66,14 @@ This was pointed out by Bart Puype *****/ #include "emu.h" +#include "includes/psikyo.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2610intf.h" #include "sound/ymf278b.h" #include "sound/okim6295.h" -#include "includes/psikyo.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp index 4c8baad4221..f7a4f1addfd 100644 --- a/src/mame/drivers/psikyo4.cpp +++ b/src/mame/drivers/psikyo4.cpp @@ -131,7 +131,10 @@ ROMs - #include "emu.h" #include "includes/psikyo4.h" + #include "rendlay.h" +#include "speaker.h" + static GFXLAYOUT_RAW( layout_16x16x8, 16, 16, 16*8, 16*16*8 ) diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index 40d6ac54e22..5d31831df47 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -274,13 +274,14 @@ Notes: */ #include "emu.h" +#include "includes/psikyosh.h" #include "cpu/sh2/sh2.h" #include "machine/eepromser.h" #include "machine/watchdog.h" #include "sound/ymf278b.h" +#include "speaker.h" -#include "includes/psikyosh.h" static const gfx_layout layout_16x16x4 = { diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp index 32cb938fb87..382a0e05208 100644 --- a/src/mame/drivers/psion.cpp +++ b/src/mame/drivers/psion.cpp @@ -22,8 +22,12 @@ #include "emu.h" #include "includes/psion.h" + #include "rendlay.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + TIMER_DEVICE_CALLBACK_MEMBER(psion_state::nmi_timer) { diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp index 1b3536e4f50..b4d8124b2dd 100644 --- a/src/mame/drivers/psx.cpp +++ b/src/mame/drivers/psx.cpp @@ -10,16 +10,21 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/psx/psx.h" + +#include "bus/psx/ctlrport.h" #include "cpu/m6805/m6805.h" -#include "video/psx.h" -#include "imagedev/snapquik.h" +#include "cpu/psx/psx.h" #include "imagedev/chd_cd.h" +#include "imagedev/snapquik.h" +#include "machine/psxcd.h" +#include "machine/ram.h" #include "sound/spu.h" +#include "video/psx.h" + #include "debugger.h" -#include "machine/psxcd.h" -#include "bus/psx/ctlrport.h" #include "softlist.h" +#include "speaker.h" + #define PSXCD_TAG "psxcd" diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp index 0333e04e0a3..1c41e5ee726 100644 --- a/src/mame/drivers/psychic5.cpp +++ b/src/mame/drivers/psychic5.cpp @@ -330,10 +330,13 @@ Notes (23-Jan-2016 AS): */ #include "emu.h" +#include "includes/psychic5.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "includes/psychic5.h" +#include "screen.h" +#include "speaker.h" MACHINE_START_MEMBER(psychic5_state, psychic5) diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp index 86f5203f4a2..a1761baaf5c 100644 --- a/src/mame/drivers/pt68k4.cpp +++ b/src/mame/drivers/pt68k4.cpp @@ -54,18 +54,24 @@ TODO: 68230 device ****************************************************************************/ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "machine/mc68681.h" +#include "machine/pc_fdc.h" #include "machine/timekpr.h" #include "machine/wd_fdc.h" -#include "machine/pc_fdc.h" -#include "formats/imd_dsk.h" +#include "sound/spkrdev.h" + #include "bus/isa/isa.h" #include "bus/isa/isa_cards.h" -#include "bus/pc_kbd/pc_kbdc.h" #include "bus/pc_kbd/keyboards.h" -#include "sound/speaker.h" +#include "bus/pc_kbd/pc_kbdc.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/imd_dsk.h" + #define M68K_TAG "maincpu" #define DUART1_TAG "duart1" diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp index a5b419fdcb2..163d48a16b6 100644 --- a/src/mame/drivers/ptcsol.cpp +++ b/src/mame/drivers/ptcsol.cpp @@ -111,14 +111,20 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/i8085/i8085.h" -#include "machine/keyboard.h" -#include "sound/speaker.h" -#include "sound/wave.h" #include "imagedev/cassette.h" #include "machine/ay31015.h" -#include "formats/sol_cas.h" +#include "machine/keyboard.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/sol_cas.h" + struct cass_data_t { struct { diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp index d519858b38c..e14e863d215 100644 --- a/src/mame/drivers/pturn.cpp +++ b/src/mame/drivers/pturn.cpp @@ -80,6 +80,8 @@ ROMS: All ROM labels say only "PROM" and a number. #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class pturn_state : public driver_device diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp index fd630c64908..0003da071d5 100644 --- a/src/mame/drivers/punchout.cpp +++ b/src/mame/drivers/punchout.cpp @@ -115,12 +115,15 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" +#include "includes/punchout.h" + #include "cpu/z80/z80.h" #include "cpu/m6502/n2a03.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "rendlay.h" -#include "includes/punchout.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp index 868ad081443..2b6ea9a2b12 100644 --- a/src/mame/drivers/pv1000.cpp +++ b/src/mame/drivers/pv1000.cpp @@ -10,7 +10,11 @@ #include "cpu/z80/z80.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + + // PV-1000 Sound device class pv1000_sound_device : public device_t, @@ -43,7 +47,7 @@ private: extern const device_type PV1000; -const device_type PV1000 = &device_creator; +const device_type PV1000 = device_creator; pv1000_sound_device::pv1000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PV1000, "NEC D65010G031", tag, owner, clock, "pv1000_sound", __FILE__), diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp index 5e549743719..c2ae369f0c7 100644 --- a/src/mame/drivers/pv2000.cpp +++ b/src/mame/drivers/pv2000.cpp @@ -37,7 +37,9 @@ For BIOS CRC confirmation #include "imagedev/cassette.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class pv2000_state : public driver_device { diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp index 233b7b5c177..97263c9bdc3 100644 --- a/src/mame/drivers/pv9234.cpp +++ b/src/mame/drivers/pv9234.cpp @@ -22,6 +22,7 @@ be found! #include "emu.h" #include "cpu/arm7/arm7.h" +#include "screen.h" class pv9234_state : public driver_device diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp index 168f142a3ce..40208e508e0 100644 --- a/src/mame/drivers/pve500.cpp +++ b/src/mame/drivers/pve500.cpp @@ -45,13 +45,15 @@ #define DEBUGGING_INDUCE_SELFDIAGNOSE 0 #include "emu.h" -#include "cpu/z80/tmpz84c015.h" +#include "bus/rs232/rs232.h" /* actually meant to be RS422 ports */ #include "cpu/mb88xx/mb88xx.h" +#include "cpu/z80/tmpz84c015.h" +#include "machine/eepromser.h" +#include "machine/mb8421.h" #include "sound/beep.h" -#include "bus/rs232/rs232.h" /* actually meant to be RS422 ports */ +#include "speaker.h" + #include "pve500.lh" -#include "machine/mb8421.h" -#include "machine/eepromser.h" #define IO_EXPANDER_PORTA 0 #define IO_EXPANDER_PORTB 1 diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp index 0a06a626736..0a5d764f8ba 100644 --- a/src/mame/drivers/px4.cpp +++ b/src/mame/drivers/px4.cpp @@ -10,19 +10,25 @@ ***************************************************************************/ #include "emu.h" + +#include "bus/centronics/ctronics.h" +#include "bus/epson_sio/epson_sio.h" +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "machine/ram.h" -#include "bus/epson_sio/epson_sio.h" -#include "bus/centronics/ctronics.h" #include "imagedev/cassette.h" -#include "machine/ram.h" #include "machine/nvram.h" -#include "sound/speaker.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" -#include "coreutil.h" +#include "machine/ram.h" +#include "machine/ram.h" +#include "sound/spkrdev.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "coreutil.h" + #include "px4.lh" diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp index 23f9e0ee79c..a443bb7ddfd 100644 --- a/src/mame/drivers/px8.cpp +++ b/src/mame/drivers/px8.cpp @@ -31,9 +31,14 @@ #include "emu.h" #include "includes/px8.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #include "px8.lh" + /*************************************************************************** CONSTANTS ***************************************************************************/ diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp index 2e33ed2164d..fc6cc6250db 100644 --- a/src/mame/drivers/pyl601.cpp +++ b/src/mame/drivers/pyl601.cpp @@ -35,13 +35,19 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/m6800/m6800.h" -#include "video/mc6845.h" -#include "sound/speaker.h" -#include "formats/pyldin_dsk.h" -#include "machine/upd765.h" #include "machine/ram.h" +#include "machine/upd765.h" +#include "sound/spkrdev.h" +#include "video/mc6845.h" + #include "softlist.h" +#include "screen.h" +#include "speaker.h" + +#include "formats/pyldin_dsk.h" + class pyl601_state : public driver_device { diff --git a/src/mame/drivers/pyson.cpp b/src/mame/drivers/pyson.cpp index 77b705974a8..b117c8ee69c 100644 --- a/src/mame/drivers/pyson.cpp +++ b/src/mame/drivers/pyson.cpp @@ -153,6 +153,7 @@ Notes: #include "emu.h" #include "cpu/mips/mips3.h" #include "cpu/mips/r3000.h" +#include "screen.h" class pyson_state : public driver_device diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp index 74d4bf61664..02d1e525624 100644 --- a/src/mame/drivers/pzletime.cpp +++ b/src/mame/drivers/pzletime.cpp @@ -20,6 +20,9 @@ #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" #include "machine/eepromser.h" +#include "screen.h" +#include "speaker.h" + class pzletime_state : public driver_device { diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp index a13681e1c3c..86c65c32b4b 100644 --- a/src/mame/drivers/qdrmfgp.cpp +++ b/src/mame/drivers/qdrmfgp.cpp @@ -25,11 +25,14 @@ GP1 HDD data contents: ***************************************************************************/ #include "emu.h" +#include "includes/qdrmfgp.h" + #include "cpu/m68000/m68000.h" #include "machine/ataintf.h" -#include "sound/k054539.h" #include "machine/nvram.h" -#include "includes/qdrmfgp.h" +#include "sound/k054539.h" +#include "screen.h" +#include "speaker.h" #define IDE_HACK 1 diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp index 00a6e144564..d176bc61843 100644 --- a/src/mame/drivers/ql.cpp +++ b/src/mame/drivers/ql.cpp @@ -74,7 +74,7 @@ */ #include "emu.h" -#include "softlist.h" + #include "bus/ql/exp.h" #include "bus/ql/rom.h" #include "bus/rs232/rs232.h" @@ -84,9 +84,14 @@ #include "machine/qimi.h" #include "machine/ram.h" #include "machine/zx8302.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/zx8301.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + + #define SCREEN_TAG "screen" #define M68008_TAG "ic18" diff --git a/src/mame/drivers/quakeat.cpp b/src/mame/drivers/quakeat.cpp index b8878f28b92..f2b9c1d734c 100644 --- a/src/mame/drivers/quakeat.cpp +++ b/src/mame/drivers/quakeat.cpp @@ -63,6 +63,7 @@ TODO: #include "emu.h" #include "cpu/i386/i386.h" #include "machine/pcshare.h" +#include "screen.h" class quakeat_state : public pcat_base_state diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp index bcf7502206c..ca30f154fd7 100644 --- a/src/mame/drivers/quantum.cpp +++ b/src/mame/drivers/quantum.cpp @@ -56,6 +56,8 @@ NOTE: The Atari 136002-125 PROM in the sets below wasn't dumped from an actual #include "sound/discrete.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "screen.h" +#include "speaker.h" class quantum_state : public driver_device diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp index be86a5230c2..d04955d3249 100644 --- a/src/mame/drivers/quasar.cpp +++ b/src/mame/drivers/quasar.cpp @@ -34,6 +34,7 @@ I8085 Sound Board #include "cpu/s2650/s2650.h" #include "cpu/mcs48/mcs48.h" #include "sound/volt_reg.h" +#include "speaker.h" /************************************************************************ diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp index 14394cdd58c..c500ce37ecb 100644 --- a/src/mame/drivers/quizdna.cpp +++ b/src/mame/drivers/quizdna.cpp @@ -11,10 +11,13 @@ Quiz Gekiretsu Scramble (Gakuen Paradise 2) (c) 1993 Face *****************************************************************************/ #include "emu.h" +#include "includes/quizdna.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/quizdna.h" +#include "screen.h" +#include "speaker.h" #define MCLK 16000000 diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp index ca0e7a36ee1..cbcf43a90f4 100644 --- a/src/mame/drivers/quizo.cpp +++ b/src/mame/drivers/quizo.cpp @@ -28,6 +28,8 @@ Xtals 8MHz, 21.47727MHz #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class quizo_state : public driver_device diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp index 4c1f412a4c4..2ec0fe4fa5f 100644 --- a/src/mame/drivers/quizpani.cpp +++ b/src/mame/drivers/quizpani.cpp @@ -48,9 +48,13 @@ Stephh's notes (based on the games M68000 code and some tests) : *************************************************************************/ #include "emu.h" +#include "includes/quizpani.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "includes/quizpani.h" +#include "screen.h" +#include "speaker.h" + static ADDRESS_MAP_START( quizpani_map, AS_PROGRAM, 16, quizpani_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index 4f6b61ed3a5..a440a716014 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -91,6 +91,9 @@ Notes: #include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" + // very preliminary quizpun2 protection simulation diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp index 205c5bfec00..3bc63a6bb56 100644 --- a/src/mame/drivers/quizshow.cpp +++ b/src/mame/drivers/quizshow.cpp @@ -18,6 +18,8 @@ TODO: #include "cpu/s2650/s2650.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #include "quizshow.lh" diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index ef973a9b4e9..39d88731b0d 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -32,20 +32,24 @@ #include "emu.h" + #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "machine/pit8253.h" +#include "machine/am9517a.h" +#include "machine/i8255.h" +#include "machine/mc146818.h" #include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/qx10kbd.h" +#include "machine/ram.h" +#include "machine/upd765.h" #include "machine/z80dart.h" -#include "machine/mc146818.h" -#include "machine/i8255.h" -#include "machine/am9517a.h" #include "video/upd7220.h" -#include "machine/upd765.h" -#include "machine/ram.h" -#include "machine/qx10kbd.h" + +#include "screen.h" #include "softlist.h" + #define MAIN_CLK 15974400 #define RS232_TAG "rs232" diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp index 869cb28f145..0e74270699c 100644 --- a/src/mame/drivers/r2dtank.cpp +++ b/src/mame/drivers/r2dtank.cpp @@ -33,15 +33,17 @@ RAM = 4116 (x11) ********************************************************************/ #include "emu.h" -#include "machine/rescap.h" -#include "machine/6821pia.h" -#include "machine/74123.h" -#include "video/mc6845.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" -#include "sound/ay8910.h" +#include "machine/6821pia.h" +#include "machine/74123.h" #include "machine/gen_latch.h" #include "machine/nvram.h" +#include "machine/rescap.h" +#include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #define LOG_AUDIO_COMM (0) diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index 8f592bbae63..4e876c7a23c 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -63,15 +63,19 @@ Then it puts settings at 0x9e08 and 0x9e0a (bp 91acb) */ #include "emu.h" +#include "includes/raiden2.h" + #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/3812intf.h" //#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/raiden2.h" #include "machine/r2crypt.h" +#include "screen.h" +#include "speaker.h" + class r2dx_v33_state : public raiden2_state { diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index 771595bba2d..22befac6560 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -85,6 +85,8 @@ Custom: Imagetek I5000 (2ch video & 2ch sound) #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "sound/i5000.h" +#include "screen.h" +#include "speaker.h" class rabbit_state : public driver_device diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp index 3ecd30c7a86..e63771694aa 100644 --- a/src/mame/drivers/radio86.cpp +++ b/src/mame/drivers/radio86.cpp @@ -10,13 +10,19 @@ #include "emu.h" +#include "includes/radio86.h" + #include "cpu/i8085/i8085.h" -#include "sound/wave.h" -#include "machine/i8255.h" #include "imagedev/cassette.h" -#include "formats/rk_cas.h" -#include "includes/radio86.h" +#include "machine/i8255.h" +#include "sound/wave.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/rk_cas.h" + /* Address maps */ static ADDRESS_MAP_START(radio86_mem, AS_PROGRAM, 8, radio86_state ) diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index d3bf1fac4ec..03c61ce25ea 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -70,12 +70,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/raiden.h" + #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/raiden.h" #include "video/seibu_crtc.h" +#include "screen.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index d3351d4ab06..c41267d3750 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -169,16 +169,21 @@ Protection Notes: ********************************************************************************************************/ #include "emu.h" -#include "debugger.h" +#include "includes/raiden2.h" + #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/3812intf.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/raiden2.h" +#include "sound/ym2151.h" #include "machine/r2crypt.h" +#include "debugger.h" +#include "screen.h" +#include "speaker.h" + + void raiden2_state::machine_start() { save_item(NAME(bg_bank)); diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 6ec195e768d..536478746c0 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -340,6 +340,39 @@ WIRE CONNECTORS - SEEN ON SCHEMATICS - NOT PRESENT ON DEC-100 B (-A only?): W16 pulls J2 printer port pin 1 to GND when set (chassis to logical GND). W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND). ****************************************************************************/ +#include "emu.h" + +#include "cpu/i86/i86.h" +#include "cpu/z80/z80.h" +#include "video/vtvideo.h" +#include "video/upd7220.h" + +#include "machine/wd_fdc.h" +#include "formats/rx50_dsk.h" +#include "formats/pc_dsk.h" // PC Formats +#include "imagedev/flopdrv.h" + +#include "imagedev/harddriv.h" +#include "machine/wd2010.h" +#include "machine/corvushd.h" + +#include "machine/z80dart.h" +#include "bus/rs232/rs232.h" +#include "imagedev/bitbngr.h" +#include "machine/com8116.h" + +#include "machine/i8251.h" +#include "machine/clock.h" +#include "machine/dec_lk201.h" +#include "machine/nvram.h" + +#include "machine/ds1315.h" +#include "softlist.h" +#include "screen.h" + +#include "rainbow.lh" // BEZEL - LAYOUT with LEDs for diag 1-7, keyboard 8-11 and floppy 20-23 + + #define RD51_MAX_HEAD 8 #define RD51_MAX_CYLINDER 1024 #define RD51_SECTORS_PER_TRACK 17 @@ -442,36 +475,6 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND). #define DUAL_MONITOR 0x03 // ---------------------------------------------------------------------------------------------- -#include "emu.h" -#include "cpu/i86/i86.h" -#include "cpu/z80/z80.h" -#include "video/vtvideo.h" -#include "video/upd7220.h" - -#include "machine/wd_fdc.h" -#include "formats/rx50_dsk.h" -#include "formats/pc_dsk.h" // PC Formats -#include "imagedev/flopdrv.h" - -#include "imagedev/harddriv.h" -#include "machine/wd2010.h" -#include "machine/corvushd.h" - -#include "machine/z80dart.h" -#include "bus/rs232/rs232.h" -#include "imagedev/bitbngr.h" -#include "machine/com8116.h" - -#include "machine/i8251.h" -#include "machine/clock.h" -#include "machine/dec_lk201.h" -#include "machine/nvram.h" - -#include "machine/ds1315.h" -#include "softlist.h" - -#include "rainbow.lh" // BEZEL - LAYOUT with LEDs for diag 1-7, keyboard 8-11 and floppy 20-23 - #define LK201_TAG "lk201" #define FD1793_TAG "fd1793x" diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp index 0fafe690ce2..7ff9e2e5800 100644 --- a/src/mame/drivers/rallyx.cpp +++ b/src/mame/drivers/rallyx.cpp @@ -191,11 +191,14 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/rallyx.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/samples.h" -#include "includes/rallyx.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp index c11fab13496..7857d2ea4d3 100644 --- a/src/mame/drivers/rampart.cpp +++ b/src/mame/drivers/rampart.cpp @@ -25,11 +25,13 @@ #include "emu.h" +#include "includes/rampart.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "sound/okim6295.h" #include "sound/ym2413.h" -#include "includes/rampart.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_14_31818MHz diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp index 05dc3ec558f..cc565b9b069 100644 --- a/src/mame/drivers/rastan.cpp +++ b/src/mame/drivers/rastan.cpp @@ -154,14 +154,18 @@ Note: The 'rastsagaa' set's rom numbers were named as RSxx_37 through RSxx_42 ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" -#include "machine/watchdog.h" +#include "includes/rastan.h" #include "includes/taitoipt.h" #include "audio/taitosnd.h" -#include "sound/ym2151.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/watchdog.h" #include "sound/msm5205.h" -#include "includes/rastan.h" +#include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(rastan_state::rastan_bankswitch_w) { diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index 9064893edd5..51e03a03249 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -24,6 +24,8 @@ #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" /************************************* * diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index 818f99665f5..69873b3c8b5 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -70,13 +70,17 @@ ToDo: ****************************************************************************/ #include "emu.h" + #include "cpu/s2650/s2650.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/terminal.h" #include "sound/wave.h" +#include "speaker.h" + #include "ravens.lh" + #define TERMINAL_TAG "terminal" class ravens_state : public driver_device diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp index 2631795c844..8bef6c3c775 100644 --- a/src/mame/drivers/rbisland.cpp +++ b/src/mame/drivers/rbisland.cpp @@ -320,14 +320,16 @@ Stephh's notes (based on the game M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" +#include "includes/rbisland.h" #include "includes/taitoipt.h" #include "audio/taitosnd.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/ym2151.h" -#include "includes/rbisland.h" - +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(rbisland_state::jumping_sound_w) diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp index 59f83c6889e..52b4c6214ab 100644 --- a/src/mame/drivers/rbmk.cpp +++ b/src/mame/drivers/rbmk.cpp @@ -52,11 +52,15 @@ Notes: */ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" +#include "machine/eepromser.h" #include "sound/okim6295.h" #include "sound/ym2151.h" -#include "machine/eepromser.h" + +#include "screen.h" +#include "speaker.h" class rbmk_state : public driver_device diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index d9091585e84..5b3e9d30859 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -19,19 +19,23 @@ Issues: ****************************************************************************************************************/ #include "emu.h" + +#include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "machine/upd765.h" #include "cpu/z80/z80daisy.h" -#include "machine/z80pio.h" -#include "machine/z80dart.h" -#include "machine/z80ctc.h" -#include "machine/am9517a.h" #include "machine/7474.h" -#include "bus/rs232/rs232.h" +#include "machine/am9517a.h" #include "machine/clock.h" -#include "video/i8275.h" #include "machine/keyboard.h" +#include "machine/upd765.h" +#include "machine/z80ctc.h" +#include "machine/z80dart.h" +#include "machine/z80pio.h" #include "sound/beep.h" +#include "video/i8275.h" + +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 6c914262cec..6e0b2f11b1a 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -9,21 +9,26 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/i86/i186.h" -#include "machine/ram.h" -#include "machine/nvram.h" +#include "imagedev/cassette.h" +#include "machine/i8255.h" +#include "machine/keyboard.h" #include "machine/mm58167.h" +#include "machine/nvram.h" #include "machine/pic8259.h" -#include "machine/i8255.h" -#include "video/i82730.h" -#include "sound/speaker.h" +#include "machine/ram.h" +#include "machine/wd_fdc.h" #include "sound/sn76496.h" -#include "machine/keyboard.h" +#include "sound/spkrdev.h" +#include "video/i82730.h" + #include "bus/centronics/ctronics.h" -#include "machine/wd_fdc.h" -#include "imagedev/cassette.h" #include "bus/isbx/isbx.h" +#include "screen.h" +#include "speaker.h" + //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/drivers/rcorsair.cpp b/src/mame/drivers/rcorsair.cpp index acf53d6a4df..168d8d519c0 100644 --- a/src/mame/drivers/rcorsair.cpp +++ b/src/mame/drivers/rcorsair.cpp @@ -57,6 +57,7 @@ Notes added 2014-09-10: #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class rcorsair_state : public driver_device diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index a2bfaeead02..6ac7b25cc99 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -13,6 +13,7 @@ #include "emu.h" #include "cpu/m6809/m6809.h" +#include "screen.h" diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp index 65363abdaef..8a107b20811 100644 --- a/src/mame/drivers/rd110.cpp +++ b/src/mame/drivers/rd110.cpp @@ -18,10 +18,11 @@ */ #include "emu.h" -#include "machine/ram.h" +#include "cpu/mcs96/i8x9x.h" #include "machine/nvram.h" +#include "machine/ram.h" #include "video/msm6222b.h" -#include "cpu/mcs96/i8x9x.h" +#include "screen.h" static INPUT_PORTS_START( d110 ) PORT_START("SC0") diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp index 46812d9df5f..2f07d80a0b4 100644 --- a/src/mame/drivers/re900.cpp +++ b/src/mame/drivers/re900.cpp @@ -71,19 +71,23 @@ ***********************************************************************************/ - -#define MAIN_CLOCK XTAL_11_0592MHz -#define VDP_CLOCK XTAL_10_730MHz -#define TMS_CLOCK VDP_CLOCK / 24 - #include "emu.h" + #include "cpu/mcs51/mcs51.h" -#include "video/tms9928a.h" -#include "sound/ay8910.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/tms9928a.h" + +#include "speaker.h" + #include "re900.lh" +#define MAIN_CLOCK XTAL_11_0592MHz +#define VDP_CLOCK XTAL_10_730MHz +#define TMS_CLOCK VDP_CLOCK / 24 + + class re900_state : public driver_device { public: diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp index 414c69389c4..594629c2840 100644 --- a/src/mame/drivers/realbrk.cpp +++ b/src/mame/drivers/realbrk.cpp @@ -44,10 +44,12 @@ To Do: ***************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/realbrk.h" + +#include "cpu/m68000/m68000.h" #include "sound/ym2413.h" #include "sound/ymz280b.h" +#include "speaker.h" /* Read 4 ten bit dip switches */ diff --git a/src/mame/drivers/redclash.cpp b/src/mame/drivers/redclash.cpp index 6cd3042d8be..b05ea64ee5e 100644 --- a/src/mame/drivers/redclash.cpp +++ b/src/mame/drivers/redclash.cpp @@ -23,9 +23,12 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/redclash.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/redclash.h" +#include "screen.h" +#include "speaker.h" /* Sound comm between CPU's */ diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp index 8b8a3dfd2a1..107cbc7aa6f 100644 --- a/src/mame/drivers/relief.cpp +++ b/src/mame/drivers/relief.cpp @@ -20,12 +20,14 @@ #include "emu.h" +#include "includes/relief.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "machine/atarigen.h" #include "sound/okim6295.h" #include "sound/ym2413.h" -#include "includes/relief.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp index 0e918dfa31a..47a5871b089 100644 --- a/src/mame/drivers/renegade.cpp +++ b/src/mame/drivers/renegade.cpp @@ -103,10 +103,13 @@ $8000 - $ffff ROM ***************************************************************************/ #include "emu.h" +#include "includes/renegade.h" + #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" #include "sound/3526intf.h" -#include "includes/renegade.h" +#include "screen.h" +#include "speaker.h" /**************************************************************************/ diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp index 66c6ae1bad6..93faf5c73b7 100644 --- a/src/mame/drivers/replicator.cpp +++ b/src/mame/drivers/replicator.cpp @@ -25,11 +25,13 @@ // * implement avr8 WDR (watchdog reset) opcode #include "emu.h" -#include "rendlay.h" #include "cpu/avr8/avr8.h" #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/hd44780.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK 16000000 #define LOG_PORTS 0 diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index eefdd9f1dfc..aec4c2d9d30 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -45,6 +45,8 @@ Notes: #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/sn76496.h" +#include "screen.h" +#include "speaker.h" void retofinv_state::machine_start() diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index 3de5b113e7d..893bb5860d9 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -37,6 +37,9 @@ #include "imagedev/snapquik.h" #include "sound/beep.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + #define MAKE_BANK(lo, hi) ((lo) | ((hi)<<8)) diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp index 145b5c64fc5..d5b64dce64f 100644 --- a/src/mame/drivers/rgum.cpp +++ b/src/mame/drivers/rgum.cpp @@ -14,11 +14,13 @@ The ppi at 3000-3003 seems to be a dual port communication thing with the z80. */ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m6502/m65c02.h" -#include "video/mc6845.h" +#include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" class rgum_state : public driver_device diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp index 3bc0a373b93..fde81bfd102 100644 --- a/src/mame/drivers/risc2500.cpp +++ b/src/mame/drivers/risc2500.cpp @@ -17,6 +17,8 @@ #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #include "risc2500.lh" diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp index fa0d0771a90..8eba052f3c2 100644 --- a/src/mame/drivers/riscpc.cpp +++ b/src/mame/drivers/riscpc.cpp @@ -19,6 +19,8 @@ #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" +#include "screen.h" +#include "speaker.h" class riscpc_state : public driver_device diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp index 4eb15de6106..61e39626ef7 100644 --- a/src/mame/drivers/rltennis.cpp +++ b/src/mame/drivers/rltennis.cpp @@ -63,10 +63,14 @@ player - when there's nothing to play - first, empty 2k of ROMs are selected. #include "emu.h" #include "includes/rltennis.h" + #include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "sound/volt_reg.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + #define RLT_REFRESH_RATE 60 #define RLT_TIMER_FREQ (RLT_REFRESH_RATE*256) diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp index b5b7405b5f9..b9651de896c 100644 --- a/src/mame/drivers/rm380z.cpp +++ b/src/mame/drivers/rm380z.cpp @@ -168,6 +168,9 @@ Module timer tag static_vblank_timer name m_expire.seconds #include "emu.h" #include "includes/rm380z.h" +#include "screen.h" + + static ADDRESS_MAP_START(rm380z_mem, AS_PROGRAM, 8, rm380z_state) AM_RANGE( 0xe000, 0xefff ) AM_ROM AM_REGION(RM380Z_MAINCPU_TAG, 0) AM_RANGE( 0xf000, 0xf5ff ) AM_READWRITE(videoram_read,videoram_write) diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index d55d122d7c5..d319bcfa1bc 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -34,6 +34,8 @@ TODO: #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" class rmhaihai_state : public driver_device diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp index acad5d477d7..b0a50622cb0 100644 --- a/src/mame/drivers/rmnimbus.cpp +++ b/src/mame/drivers/rmnimbus.cpp @@ -11,16 +11,22 @@ #include "emu.h" #include "includes/rmnimbus.h" +#include "machine/rmnkbd.h" + #include "cpu/mcs51/mcs51.h" #include "imagedev/flopdrv.h" -#include "formats/pc_dsk.h" -#include "bus/scsi/scsihd.h" -#include "bus/scsi/s1410.h" -#include "bus/scsi/acb4070.h" + #include "bus/isa/fdc.h" #include "bus/rs232/rs232.h" -#include "machine/rmnkbd.h" +#include "bus/scsi/acb4070.h" +#include "bus/scsi/s1410.h" +#include "bus/scsi/scsihd.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/pc_dsk.h" + static SLOT_INTERFACE_START(rmnimbus_floppies) SLOT_INTERFACE( "35dd", FLOPPY_35_DD ) diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp index 192d4f32fa4..0be194f8d94 100644 --- a/src/mame/drivers/rmt32.cpp +++ b/src/mame/drivers/rmt32.cpp @@ -161,9 +161,10 @@ Notes: (All IC's listed for completeness) */ #include "emu.h" +#include "cpu/mcs96/i8x9x.h" #include "machine/ram.h" #include "video/sed1200.h" -#include "cpu/mcs96/i8x9x.h" +#include "screen.h" static INPUT_PORTS_START( mt32 ) PORT_START("SC0") diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index 481a38c7942..1fc107b2c53 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -50,12 +50,15 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/rockrage.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6809/hd6309.h" #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/rockrage.h" -#include "includes/konamipt.h" +#include "screen.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(rockrage_state::rockrage_interrupt) diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp index 15fbc197f78..fc532094a31 100644 --- a/src/mame/drivers/rocnrope.cpp +++ b/src/mame/drivers/rocnrope.cpp @@ -9,13 +9,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/rocnrope.h" +#include "includes/konamipt.h" +#include "audio/timeplt.h" + #include "cpu/m6809/m6809.h" #include "machine/konami1.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" -#include "audio/timeplt.h" -#include "includes/konamipt.h" -#include "includes/rocnrope.h" +#include "screen.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp index 3cb74af0a69..093f9218b14 100644 --- a/src/mame/drivers/rohga.cpp +++ b/src/mame/drivers/rohga.cpp @@ -108,13 +108,17 @@ ***************************************************************************/ #include "emu.h" +#include "includes/rohga.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "machine/decocrpt.h" #include "machine/gen_latch.h" -#include "includes/rohga.h" #include "sound/ym2151.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + READ16_MEMBER(rohga_state::rohga_irq_ack_r) { diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp index b795c02089c..e8c9651e2b8 100644 --- a/src/mame/drivers/rollerg.cpp +++ b/src/mame/drivers/rollerg.cpp @@ -13,12 +13,17 @@ ***************************************************************************/ #include "emu.h" +#include "includes/rollerg.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ #include "machine/watchdog.h" #include "sound/3812intf.h" #include "sound/k053260.h" -#include "includes/rollerg.h" + +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(rollerg_state::rollerg_0010_w) { diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp index 91ef405f523..c91c490d6cd 100644 --- a/src/mame/drivers/rollrace.cpp +++ b/src/mame/drivers/rollrace.cpp @@ -10,10 +10,13 @@ Issues: ***************************************************************************/ #include "emu.h" +#include "includes/rollrace.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" -#include "includes/rollrace.h" +#include "screen.h" +#include "speaker.h" void rollrace_state::machine_start() diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp index 8b3d83f1b7b..86bce2a785b 100644 --- a/src/mame/drivers/rotaryf.cpp +++ b/src/mame/drivers/rotaryf.cpp @@ -15,10 +15,15 @@ driver by Barry Rodewald */ #include "emu.h" + #include "cpu/i8085/i8085.h" #include "sound/samples.h" #include "sound/sn76477.h" +#include "screen.h" +#include "speaker.h" + + class rotaryf_state : public driver_device { public: @@ -28,7 +33,8 @@ public: m_samples(*this, "samples"), m_sn(*this, "snsnd"), m_videoram(*this, "videoram") - { } + { + } required_device m_maincpu; required_device m_samples; diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp index 3feedd95e9b..bb32d609302 100644 --- a/src/mame/drivers/roul.cpp +++ b/src/mame/drivers/roul.cpp @@ -65,9 +65,12 @@ Stephh's notes (based on the game Z80 code and some tests) : #include "emu.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" +#include "machine/nvram.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #include "roul.lh" -#include "machine/nvram.h" class roul_state : public driver_device diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp index a11149d963d..f0839becc48 100644 --- a/src/mame/drivers/route16.cpp +++ b/src/mame/drivers/route16.cpp @@ -71,14 +71,14 @@ #include "emu.h" #include "includes/route16.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" - - - +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp index 8520da0c303..9de28405c7c 100644 --- a/src/mame/drivers/rowamet.cpp +++ b/src/mame/drivers/rowamet.cpp @@ -23,12 +23,16 @@ ToDO: *************************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "machine/genpin.h" + +#include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "rowamet.lh" + class rowamet_state : public driver_device { public: diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp index 1c229246af0..2bdead129b4 100644 --- a/src/mame/drivers/royalmah.cpp +++ b/src/mame/drivers/royalmah.cpp @@ -101,6 +101,8 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" class royalmah_state : public driver_device diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp index c709755b7cf..ace85ef6b83 100644 --- a/src/mame/drivers/rpunch.cpp +++ b/src/mame/drivers/rpunch.cpp @@ -107,11 +107,13 @@ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/rpunch.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" #include "sound/ym2151.h" -#include "includes/rpunch.h" +#include "speaker.h" #define MASTER_CLOCK 16000000 diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index f3c1ac92e6d..241f2d5648e 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -16,12 +16,13 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "machine/ram.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" -#include "machine/z80pio.h" #include "machine/z80dma.h" -#include "machine/ram.h" +#include "machine/z80pio.h" #include "video/i8275.h" +#include "screen.h" class rt1715_state : public driver_device diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp index 56169afc1cf..30080a0aabf 100644 --- a/src/mame/drivers/runaway.cpp +++ b/src/mame/drivers/runaway.cpp @@ -13,10 +13,12 @@ ****************************************************************************/ #include "emu.h" +#include "includes/runaway.h" + #include "cpu/m6502/m6502.h" #include "machine/atari_vg.h" #include "sound/pokey.h" -#include "includes/runaway.h" +#include "speaker.h" TIMER_CALLBACK_MEMBER(runaway_state::interrupt_callback) diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp index 9be2143f413..3e98d7bdb21 100644 --- a/src/mame/drivers/rungun.cpp +++ b/src/mame/drivers/rungun.cpp @@ -36,14 +36,15 @@ *************************************************************************/ #include "emu.h" - +#include "includes/rungun.h" +#include "includes/konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/k054539.h" -#include "includes/konamipt.h" -#include "includes/rungun.h" +#include "speaker.h" + #include "rungun_dual.lh" diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index 7a94d61b1bc..10d428a1446 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -48,7 +48,9 @@ #include "machine/ram.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class rx78_state : public driver_device { diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index e7b5091223c..5a0a2df0658 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -19,11 +19,15 @@ ToDo: #include "emu.h" #include "includes/s11.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s11.lh" + static ADDRESS_MAP_START( s11_main_map, AS_PROGRAM, 8, s11_state ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x2100, 0x2103) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp index 05eab97c7c2..97c172ba119 100644 --- a/src/mame/drivers/s11a.cpp +++ b/src/mame/drivers/s11a.cpp @@ -22,11 +22,15 @@ Note: To start a game, certain switches need to be activated. You must first pr #include "emu.h" #include "includes/s11a.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s11a.lh" + static ADDRESS_MAP_START( s11a_main_map, AS_PROGRAM, 8, s11a_state ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x2100, 0x2103) AM_MIRROR(0x00fc) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp index 05443b13153..9504203e5ea 100644 --- a/src/mame/drivers/s11b.cpp +++ b/src/mame/drivers/s11b.cpp @@ -22,11 +22,15 @@ #include "emu.h" #include "includes/s11b.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s11b.lh" + static ADDRESS_MAP_START( s11b_main_map, AS_PROGRAM, 8, s11b_state ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x2100, 0x2103) AM_MIRROR(0x00fc) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp index 0e7f18e46a7..c18fb6f74a2 100644 --- a/src/mame/drivers/s11c.cpp +++ b/src/mame/drivers/s11c.cpp @@ -6,8 +6,11 @@ #include "emu.h" #include "includes/s11c.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" +#include "speaker.h" + #include "s11c.lh" diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp index 8fe0a73af6a..d64759c4239 100644 --- a/src/mame/drivers/s3.cpp +++ b/src/mame/drivers/s3.cpp @@ -38,13 +38,17 @@ ToDo: ************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s3.lh" + class s3_state : public genpin_class { public: diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp index 0ed0f6b95fa..41c30194278 100644 --- a/src/mame/drivers/s4.cpp +++ b/src/mame/drivers/s4.cpp @@ -32,11 +32,14 @@ ToDo: ************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s4.lh" diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index f52ee45639b..34ff6fa5924 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -47,12 +47,15 @@ ToDo: ************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/dac.h" #include "sound/hc55516.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s6.lh" diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp index ee5581f4819..d1a6eaa0e4b 100644 --- a/src/mame/drivers/s6a.cpp +++ b/src/mame/drivers/s6a.cpp @@ -40,12 +40,15 @@ ToDo: ************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/dac.h" #include "sound/hc55516.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s6a.lh" diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index d1f59c3775b..dd38d479a5e 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -57,14 +57,18 @@ ToDo: *****************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/dac.h" #include "sound/hc55516.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s7.lh" + class s7_state : public genpin_class { public: diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index 34eb9afd9c5..afa9baa5c14 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -45,13 +45,17 @@ ToDo: ************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s8.lh" + class s8_state : public genpin_class { public: diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp index 9232ee5c4fa..2158f1a5fb2 100644 --- a/src/mame/drivers/s8a.cpp +++ b/src/mame/drivers/s8a.cpp @@ -21,13 +21,17 @@ ToDo: ************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s8a.lh" + class s8a_state : public genpin_class { public: diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index a29202cd095..9ed3d272b49 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -35,9 +35,11 @@ ToDo: #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "machine/genpin.h" -#include "sound/hc55516.h" #include "sound/dac.h" +#include "sound/hc55516.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "s9.lh" class s9_state : public genpin_class diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index e5bde2e2117..31ac6dc22df 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -52,6 +52,8 @@ modified by Hau #include "emu.h" #include "cpu/i8085/i8085.h" #include "sound/samples.h" +#include "screen.h" +#include "speaker.h" class safarir_state : public driver_device { diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp index d99fd035066..45e52df5119 100644 --- a/src/mame/drivers/samcoupe.cpp +++ b/src/mame/drivers/samcoupe.cpp @@ -28,15 +28,16 @@ /* core includes */ #include "emu.h" #include "includes/samcoupe.h" -# -/* components */ + #include "cpu/z80/z80.h" #include "sound/saa1099.h" -/* devices */ +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + #include "formats/tzx_cas.h" #include "formats/coupedsk.h" -#include "softlist.h" /*************************************************************************** CONSTANTS diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp index 6ada148276e..6f93f857004 100644 --- a/src/mame/drivers/sandscrp.cpp +++ b/src/mame/drivers/sandscrp.cpp @@ -83,6 +83,8 @@ Is there another alt program rom set labeled 9 & 10? #include "video/kan_pand.h" #include "machine/kaneko_hit.h" #include "video/kaneko_tmap.h" +#include "screen.h" +#include "speaker.h" class sandscrp_state : public driver_device diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp index 5acaf1e6400..effa5a5886e 100644 --- a/src/mame/drivers/sangho.cpp +++ b/src/mame/drivers/sangho.cpp @@ -49,6 +49,8 @@ TODO: #include "cpu/z80/z80.h" #include "video/v9938.h" #include "sound/ym2413.h" +#include "screen.h" +#include "speaker.h" class sangho_state : public driver_device diff --git a/src/mame/drivers/sanremmg.cpp b/src/mame/drivers/sanremmg.cpp index d16bbd61ca4..c2e18c7a287 100644 --- a/src/mame/drivers/sanremmg.cpp +++ b/src/mame/drivers/sanremmg.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" +#include "screen.h" class sanremmg_state : public driver_device diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp index ed4706e0571..87ac4241e53 100644 --- a/src/mame/drivers/sanremo.cpp +++ b/src/mame/drivers/sanremo.cpp @@ -90,6 +90,16 @@ *******************************************************************************/ +#include "emu.h" +#include "cpu/z80/z80.h" +#include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + +#include "sanremo.lh" + #define MASTER_CLOCK XTAL_18MHz @@ -97,13 +107,6 @@ #define SND_CLOCK MASTER_CLOCK/12 #define CRTC_CLOCK MASTER_CLOCK/12 -#include "emu.h" -#include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "sound/ay8910.h" -#include "machine/nvram.h" -#include "sanremo.lh" - class sanremo_state : public driver_device { diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index afda5083ffc..cca28a27b31 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -33,10 +33,11 @@ Unable to proceed due to no info available (& in English). #include "emu.h" #include "cpu/i8085/i8085.h" #include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "machine/ram.h" #include "machine/keyboard.h" +#include "machine/ram.h" #include "machine/terminal.h" +#include "video/mc6845.h" +#include "screen.h" class sapi1_state : public driver_device { diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index 331b08d39c9..ead98088cfe 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -423,35 +423,41 @@ test1f diagnostic hacks: ****************************************************************************************************/ #include "emu.h" +#include "includes/saturn.h" + #include "cpu/m68000/m68000.h" -#include "machine/eepromser.h" -#include "cpu/sh2/sh2.h" #include "cpu/scudsp/scudsp.h" -#include "sound/scsp.h" -#include "sound/cdda.h" -#include "machine/smpc.h" -#include "machine/nvram.h" -#include "includes/saturn.h" +#include "cpu/sh2/sh2.h" #include "imagedev/chd_cd.h" -#include "coreutil.h" +#include "machine/eepromser.h" +#include "machine/nvram.h" +#include "machine/smpc.h" +#include "machine/stvcd.h" +#include "sound/cdda.h" +#include "sound/scsp.h" #include "video/stvvdp1.h" #include "video/stvvdp2.h" -#include "machine/stvcd.h" -#include "bus/saturn/sat_slot.h" -#include "bus/saturn/rom.h" -#include "bus/saturn/dram.h" #include "bus/saturn/bram.h" +#include "bus/saturn/dram.h" +#include "bus/saturn/rom.h" +#include "bus/saturn/sat_slot.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "coreutil.h" + class sat_console_state : public saturn_state { public: sat_console_state(const machine_config &mconfig, device_type type, const char *tag) - : saturn_state(mconfig, type, tag) - , m_exp(*this, "exp") - , m_nvram(*this, "nvram") - , m_smpc_nv(*this, "smpc_nv") + : saturn_state(mconfig, type, tag) + , m_exp(*this, "exp") + , m_nvram(*this, "nvram") + , m_smpc_nv(*this, "smpc_nv") { } DECLARE_INPUT_CHANGED_MEMBER(nmi_reset); diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index 0a16a00dcf9..68afb235f4c 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -123,11 +123,14 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/3812intf.h" #include "includes/sauro.h" + +#include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "sound/3812intf.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(sauro_state::sauro_sound_command_w) diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index 2f4a7ddca20..85f5f011270 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -44,6 +44,7 @@ CPU/Video Board Parts: #include "includes/sbasketb.h" #include "includes/konamipt.h" #include "audio/trackfld.h" + #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" @@ -51,6 +52,9 @@ CPU/Video Board Parts: #include "machine/watchdog.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(sbasketb_state::sbasketb_sh_irqtrigger_w) { diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp index 725c0aa0ac6..0d2db6317fa 100644 --- a/src/mame/drivers/sbc6510.cpp +++ b/src/mame/drivers/sbc6510.cpp @@ -51,11 +51,12 @@ ToDo: ****************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6510.h" #include "cpu/avr8/avr8.h" +#include "cpu/m6502/m6510.h" #include "machine/mos6526.h" -#include "sound/ay8910.h" #include "machine/terminal.h" +#include "sound/ay8910.h" +#include "speaker.h" #define TERMINAL_TAG "terminal" diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp index 2d0ad09d251..d0c75f64b7a 100644 --- a/src/mame/drivers/sbowling.cpp +++ b/src/mame/drivers/sbowling.cpp @@ -43,8 +43,10 @@ PROMs : NEC B406 (1kx4) x2 #include "cpu/i8085/i8085.h" #include "cpu/mcs48/mcs48.h" #include "machine/watchdog.h" -#include "video/resnet.h" #include "sound/ay8910.h" +#include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class sbowling_state : public driver_device diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index aaf052af8ac..575d01ebcf6 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -38,11 +38,14 @@ To Do: #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/wd_fdc.h" +#include "machine/com8116.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/com8116.h" +#include "machine/wd_fdc.h" #include "sound/beep.h" +#include "screen.h" +#include "speaker.h" + class sbrain_state : public driver_device { diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp index 839200e4f14..03027619d66 100644 --- a/src/mame/drivers/sbrkout.cpp +++ b/src/mame/drivers/sbrkout.cpp @@ -39,6 +39,8 @@ #include "machine/watchdog.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" #include "sbrkout.lh" class sbrkout_state : public driver_device diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp index 21c5f6747b0..1e0a91f9832 100644 --- a/src/mame/drivers/sbugger.cpp +++ b/src/mame/drivers/sbugger.cpp @@ -100,10 +100,13 @@ Sound PCB */ #include "emu.h" +#include "includes/sbugger.h" + #include "cpu/i8085/i8085.h" #include "machine/i8155.h" #include "sound/sn76496.h" -#include "includes/sbugger.h" +#include "screen.h" +#include "speaker.h" /* memory maps */ diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp index 66db53c118d..d2cb8ee3b8f 100644 --- a/src/mame/drivers/sc1.cpp +++ b/src/mame/drivers/sc1.cpp @@ -38,8 +38,10 @@ Port 82 in - upper byte = 0 thru 7 #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/speaker.h" #include "machine/z80pio.h" +#include "sound/spkrdev.h" +#include "speaker.h" + #include "sc1.lh" @@ -47,9 +49,9 @@ class sc1_state : public driver_device { public: sc1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_speaker(*this, "speaker") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_speaker(*this, "speaker") { } required_device m_maincpu; diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp index c91c070f141..fcf348ae093 100644 --- a/src/mame/drivers/sc2.cpp +++ b/src/mame/drivers/sc2.cpp @@ -13,8 +13,10 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/z80pio.h" #include "sound/beep.h" +#include "machine/z80pio.h" +#include "speaker.h" + #include "sc2.lh" class sc2_state : public driver_device diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp index b3b23842dea..00893cc6174 100644 --- a/src/mame/drivers/scobra.cpp +++ b/src/mame/drivers/scobra.cpp @@ -36,11 +36,13 @@ Notes/Tidbits: ***************************************************************************/ #include "emu.h" +#include "includes/scramble.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/scramble.h" +#include "speaker.h" class scobra_state : public scramble_state diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp index 80b8dca50de..1f2b7596edb 100644 --- a/src/mame/drivers/scorpion.cpp +++ b/src/mame/drivers/scorpion.cpp @@ -4,14 +4,11 @@ #include "emu.h" #include "includes/spectrum.h" #include "includes/spec128.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" + +#include "machine/beta.h" #include "sound/ay8910.h" -#include "sound/speaker.h" + #include "formats/tzx_cas.h" -#include "machine/beta.h" -#include "machine/ram.h" -#include "machine/spec_snqk.h" class scorpion_state : public spectrum_state diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp index b28e0888e2d..723bad4544f 100644 --- a/src/mame/drivers/scotrsht.cpp +++ b/src/mame/drivers/scotrsht.cpp @@ -35,12 +35,16 @@ Stephh's notes (based on the game M6502 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/scotrsht.h" +#include "includes/konamipt.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "sound/2203intf.h" -#include "includes/konamipt.h" -#include "includes/scotrsht.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(scotrsht_state::ctrl_w) { diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index 37da3330846..6dfe59d3b00 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -29,14 +29,15 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/scramble.h" + #include "cpu/s2650/s2650.h" -#include "sound/ay8910.h" -#include "machine/i8255.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" +#include "machine/i8255.h" #include "machine/watchdog.h" -#include "includes/scramble.h" - +#include "sound/ay8910.h" +#include "speaker.h" static ADDRESS_MAP_START( scramble_map, AS_PROGRAM, 8, scramble_state ) diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp index b151ee3cfc0..1070b75929e 100644 --- a/src/mame/drivers/scregg.cpp +++ b/src/mame/drivers/scregg.cpp @@ -52,9 +52,12 @@ it as ASCII text. ***************************************************************************/ #include "emu.h" +#include "includes/btime.h" + #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" -#include "includes/btime.h" +#include "speaker.h" + class scregg_state : public btime_state { diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp index 59c1dbca9f1..821dac8425c 100644 --- a/src/mame/drivers/scv.cpp +++ b/src/mame/drivers/scv.cpp @@ -11,7 +11,9 @@ #include "sound/upd1771.h" #include "bus/scv/slot.h" #include "bus/scv/rom.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class scv_state : public driver_device diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index 5e5e03d850a..41cc2729c94 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -61,14 +61,18 @@ *******************************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" -#include "sound/okim6295.h" #include "includes/sderby.h" + +#include "cpu/m68000/m68000.h" #include "machine/nvram.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" +#include "pmroulet.lh" #include "sderby.lh" #include "spacewin.lh" -#include "pmroulet.lh" + /*************************** * R/W Handlers * diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp index 808c736c53f..914a8ba7c0e 100644 --- a/src/mame/drivers/seabattl.cpp +++ b/src/mame/drivers/seabattl.cpp @@ -35,6 +35,9 @@ the sound board should be fully discrete. #include "cpu/s2650/s2650.h" #include "machine/s2636.h" #include "video/dm9368.h" +#include "screen.h" +#include "speaker.h" + #include "seabattl.lh" diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp index 85bd14c25af..59def9aee7f 100644 --- a/src/mame/drivers/sealy.cpp +++ b/src/mame/drivers/sealy.cpp @@ -27,12 +27,14 @@ Notes: ***************************************************************************/ -// 13.0 MHz? PCB is labeled with 13.5M -#define MAIN_CLOCK 13000000 - #include "emu.h" #include "cpu/h8/h83048.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + +// 13.0 MHz? PCB is labeled with 13.5M +#define MAIN_CLOCK 13000000 class sealy_state : public driver_device { diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp index e4ca5c22a37..4b9699a6694 100644 --- a/src/mame/drivers/seattle.cpp +++ b/src/mame/drivers/seattle.cpp @@ -185,15 +185,19 @@ **************************************************************************/ #include "emu.h" +#include "audio/cage.h" +#include "audio/dcs.h" + #include "cpu/adsp2100/adsp2100.h" #include "cpu/mips/mips3.h" -#include "audio/dcs.h" -#include "audio/cage.h" #include "machine/idectrl.h" #include "machine/midwayic.h" +#include "machine/nvram.h" #include "machine/smc91c9x.h" #include "video/voodoo.h" -#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + #include "calspeed.lh" #include "vaportrx.lh" #include "hyprdriv.lh" diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index b09da29d778..2154839f6d2 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -74,6 +74,9 @@ #include "emu.h" +#include "includes/megadriv.h" +#include "includes/segaipt.h" + #include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/315_5296.h" @@ -81,9 +84,7 @@ #include "sound/sn76496.h" #include "sound/2612intf.h" #include "sound/upd7759.h" -#include "includes/segaipt.h" - -#include "includes/megadriv.h" +#include "speaker.h" #define XL1_CLOCK XTAL_640kHz diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp index b8770aaf79b..e9fc82cf5e1 100644 --- a/src/mame/drivers/segae.cpp +++ b/src/mame/drivers/segae.cpp @@ -293,12 +293,14 @@ GND 8A 8B GND #include "emu.h" +#include "includes/segaipt.h" + #include "cpu/z80/z80.h" -#include "sound/sn76496.h" #include "machine/mc8123.h" #include "machine/segacrp2_device.h" +#include "sound/sn76496.h" #include "video/315_5124.h" -#include "includes/segaipt.h" +#include "speaker.h" class systeme_state : public driver_device diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index d374bc6d561..e964523a73a 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -107,13 +107,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/segag80r.h" +#include "machine/segag80.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" #include "sound/samples.h" #include "machine/i8255.h" #include "machine/segacrpt_device.h" -#include "machine/segag80.h" -#include "includes/segag80r.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp index d666177c92d..7cf4919bd57 100644 --- a/src/mame/drivers/segag80v.cpp +++ b/src/mame/drivers/segag80v.cpp @@ -135,11 +135,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/segag80v.h" +#include "machine/segag80.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/samples.h" -#include "machine/segag80.h" -#include "includes/segag80v.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index 0ef5a5d2ae2..13e3a4ea4ea 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -17,12 +17,14 @@ #include "emu.h" #include "includes/segahang.h" +#include "includes/segaipt.h" + #include "machine/fd1089.h" #include "machine/fd1094.h" #include "sound/2203intf.h" #include "sound/ym2151.h" #include "sound/segapcm.h" -#include "includes/segaipt.h" +#include "speaker.h" diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp index 5be8ec1a10d..ae6ba2372e1 100644 --- a/src/mame/drivers/segajw.cpp +++ b/src/mame/drivers/segajw.cpp @@ -35,6 +35,8 @@ Also seem to be running on the same/similar hardware: #include "sound/2612intf.h" #include "video/hd63484.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" #include "segajw.lh" diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp index baccda5a7e4..8a950115fda 100644 --- a/src/mame/drivers/segald.cpp +++ b/src/mame/drivers/segald.cpp @@ -22,6 +22,7 @@ Todo: #include "emu.h" #include "cpu/z80/z80.h" #include "machine/ldv1000.h" +#include "speaker.h" #define SCHEMATIC_CLOCK (20000000) diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp index 2b492439475..2f5cd4c3729 100644 --- a/src/mame/drivers/segam1.cpp +++ b/src/mame/drivers/segam1.cpp @@ -34,6 +34,8 @@ uses s24 style tilemaps (ram based?) #include "emu.h" #include "cpu/m68000/m68000.h" +#include "screen.h" +#include "speaker.h" @@ -41,9 +43,9 @@ class segam1_state : public driver_device { public: segam1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + { } virtual void video_start() override; uint32_t screen_update_segam1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index 16c68004b0b..ec48b1d206c 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -273,10 +273,12 @@ Notes: #include "emu.h" #include "includes/segaorun.h" +#include "includes/segaipt.h" + #include "machine/fd1089.h" #include "sound/ym2151.h" #include "sound/segapcm.h" -#include "includes/segaipt.h" +#include "speaker.h" #include "outrun.lh" diff --git a/src/mame/drivers/segapm.cpp b/src/mame/drivers/segapm.cpp index 5ccbe62838e..1f70e62bda1 100644 --- a/src/mame/drivers/segapm.cpp +++ b/src/mame/drivers/segapm.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "cpu/m68000/m68000.h" +#include "screen.h" class segapm_state : public driver_device diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index 6c72db14c1d..1e1de35534b 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -149,11 +149,14 @@ Tetris - - - - EPR12169 EPR12170 - #include "emu.h" #include "includes/segas16a.h" #include "includes/segaipt.h" + #include "machine/fd1089.h" #include "machine/nvram.h" #include "machine/segacrp2_device.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + //************************************************************************** // PPI READ/WRITE CALLBACKS diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index cfd0d6c79b9..5ce8c3737cc 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -870,9 +870,12 @@ S11 S13 S15 S17 |EPR12194 - - - EPR12195 - - #include "emu.h" #include "includes/segas16b.h" -#include "machine/mc8123.h" #include "includes/segaipt.h" + +#include "machine/mc8123.h" #include "sound/okim6295.h" +#include "speaker.h" + //************************************************************************** // CONSTANTS diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index 067311bd557..c44c31e66cf 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -32,11 +32,13 @@ ***************************************************************************/ #include "emu.h" -#include "machine/nvram.h" #include "includes/segas18.h" +#include "includes/segaipt.h" + +#include "machine/nvram.h" #include "sound/2612intf.h" #include "sound/rf5c68.h" -#include "includes/segaipt.h" +#include "speaker.h" /************************************* * diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp index 75e27d04679..47939a14c2a 100644 --- a/src/mame/drivers/segas24.cpp +++ b/src/mame/drivers/segas24.cpp @@ -338,12 +338,15 @@ Notes: #include "emu.h" #include "includes/segas24.h" #include "includes/segaipt.h" + #include "cpu/m68000/m68000.h" #include "machine/fd1094.h" #include "machine/nvram.h" #include "sound/volt_reg.h" #include "sound/ym2151.h" #include "video/segaic24.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_20MHz #define VIDEO_CLOCK XTAL_32MHz diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index d890f22ad09..30786ef711b 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -524,18 +524,22 @@ orunners: Interleaved with the dj and << >> buttons is the data the drives the ****************************************************************************/ #include "emu.h" +#include "includes/segas32.h" + #include "cpu/z80/z80.h" #include "cpu/v60/v60.h" #include "cpu/nec/v25.h" -#include "rendlay.h" -#include "includes/segas32.h" #include "machine/eepromser.h" #include "sound/2612intf.h" #include "sound/rf5c68.h" +#include "rendlay.h" +#include "speaker.h" + #include "radr.lh" -const device_type SEGA_S32_PCB = &device_creator; + +const device_type SEGA_S32_PCB = device_creator; segas32_state::segas32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGA_S32_PCB, "Sega System 32 PCB", tag, owner, clock, "segas32_pcb", __FILE__), @@ -2512,7 +2516,7 @@ static MACHINE_CONFIG_FRAGMENT( system32 ) MCFG_S32COMM_ADD("s32comm") MACHINE_CONFIG_END -const device_type SEGA_S32_REGULAR_DEVICE = &device_creator; +const device_type SEGA_S32_REGULAR_DEVICE = device_creator; segas32_regular_state::segas32_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segas32_state(mconfig, tag, owner, clock) @@ -2536,7 +2540,7 @@ static MACHINE_CONFIG_FRAGMENT( system32_v25 ) MCFG_V25_CONFIG(ga2_v25_opcode_table) MACHINE_CONFIG_END -const device_type SEGA_S32_V25_DEVICE = &device_creator; +const device_type SEGA_S32_V25_DEVICE = device_creator; segas32_v25_state::segas32_v25_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segas32_state(mconfig, tag, owner, clock) @@ -2599,7 +2603,7 @@ static MACHINE_CONFIG_FRAGMENT( multi32 ) MACHINE_CONFIG_END -const device_type SEGA_MULTI32_DEVICE = &device_creator; +const device_type SEGA_MULTI32_DEVICE = device_creator; sega_multi32_state::sega_multi32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segas32_state(mconfig, tag, owner, clock) diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp index 08ac876661e..66479d9bd54 100644 --- a/src/mame/drivers/segaufo.cpp +++ b/src/mame/drivers/segaufo.cpp @@ -47,6 +47,7 @@ #include "machine/315_5296.h" #include "sound/2612intf.h" #include "sound/upd7759.h" +#include "speaker.h" // the layouts are very similar to eachother #include "newufo.lh" diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index c33521f6361..986cbb1a5ee 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -262,12 +262,15 @@ ROMs: #include "emu.h" #include "includes/segaxbd.h" +#include "includes/segaipt.h" + #include "machine/nvram.h" #include "sound/ym2151.h" #include "sound/segapcm.h" -#include "includes/segaipt.h" +#include "speaker.h" + -const device_type SEGA_XBD_PCB = &device_creator; +const device_type SEGA_XBD_PCB = device_creator; segaxbd_state::segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGA_XBD_PCB, "Sega X-Board PCB", tag, owner, clock, "segaxbd_pcb", __FILE__), @@ -1866,7 +1869,7 @@ static MACHINE_CONFIG_FRAGMENT( xboard ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -const device_type SEGA_XBD_REGULAR_DEVICE = &device_creator; +const device_type SEGA_XBD_REGULAR_DEVICE = device_creator; segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segaxbd_state(mconfig, tag, owner, clock) @@ -1892,7 +1895,7 @@ static MACHINE_CONFIG_FRAGMENT( xboard_fd1094 ) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -const device_type SEGA_XBD_FD1094_DEVICE = &device_creator; +const device_type SEGA_XBD_FD1094_DEVICE = device_creator; segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segaxbd_state(mconfig, tag, owner, clock) @@ -1934,7 +1937,7 @@ static MACHINE_CONFIG_FRAGMENT( lastsurv_fd1094 ) MCFG_SOUND_ROUTE(1, "lspeaker", 0.43) MACHINE_CONFIG_END -const device_type SEGA_XBD_LASTSURV_FD1094_DEVICE = &device_creator; +const device_type SEGA_XBD_LASTSURV_FD1094_DEVICE = device_creator; segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segaxbd_state(mconfig, tag, owner, clock) @@ -1964,7 +1967,7 @@ static MACHINE_CONFIG_FRAGMENT( lastsurv ) MCFG_SOUND_ROUTE(1, "lspeaker", 0.43) MACHINE_CONFIG_END -const device_type SEGA_XBD_LASTSURV_DEVICE = &device_creator; +const device_type SEGA_XBD_LASTSURV_DEVICE = device_creator; segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segaxbd_state(mconfig, tag, owner, clock) @@ -2007,7 +2010,7 @@ static MACHINE_CONFIG_FRAGMENT( smgp_fd1094 ) MCFG_SOUND_ROUTE(1, "rearright", 1.0) MACHINE_CONFIG_END -const device_type SEGA_XBD_SMGP_FD1094_DEVICE = &device_creator; +const device_type SEGA_XBD_SMGP_FD1094_DEVICE = device_creator; segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segaxbd_state(mconfig, tag, owner, clock) @@ -2050,7 +2053,7 @@ static MACHINE_CONFIG_FRAGMENT( smgp ) MCFG_SOUND_ROUTE(1, "rearright", 1.0) MACHINE_CONFIG_END -const device_type SEGA_XBD_SMGP_DEVICE = &device_creator; +const device_type SEGA_XBD_SMGP_DEVICE = device_creator; segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segaxbd_state(mconfig, tag, owner, clock) @@ -2076,7 +2079,7 @@ static MACHINE_CONFIG_FRAGMENT( rascot ) MCFG_CPU_IO_MAP(rascot_z80_portmap) MACHINE_CONFIG_END -const device_type SEGA_XBD_RASCOT_DEVICE = &device_creator; +const device_type SEGA_XBD_RASCOT_DEVICE = device_creator; segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segaxbd_state(mconfig, tag, owner, clock) diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index e456ba3d3a7..235ca02a91b 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -58,11 +58,13 @@ MB89372 - Uses 3 serial data transfer protocols: ASYNC, COP & BOP. Has a built #include "emu.h" #include "includes/segaybd.h" +#include "includes/segaipt.h" + #include "machine/mb8421.h" #include "machine/nvram.h" -#include "sound/ym2151.h" #include "sound/segapcm.h" -#include "includes/segaipt.h" +#include "sound/ym2151.h" +#include "speaker.h" #include "pdrift.lh" diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index 38d2c6c6135..bbc030efa1a 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -846,18 +846,23 @@ Notes: */ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/seibuspi.h" + #include "cpu/i386/i386.h" +#include "cpu/z80/z80.h" +#include "machine/7200fifo.h" #include "machine/ds2404.h" #include "machine/eepromser.h" #include "machine/intelfsh.h" -#include "machine/7200fifo.h" +#include "machine/seibuspi.h" #include "sound/okim6295.h" #include "sound/ymf271.h" #include "sound/ymz280b.h" -#include "machine/seibuspi.h" #include "video/seibu_crtc.h" -#include "includes/seibuspi.h" + +#include "screen.h" +#include "speaker.h" + // default values written to CRTC (note: SYS386F does not have this chip) #define PIXEL_CLOCK (XTAL_28_63636MHz/4) diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp index e29c2260692..d0d3b8bea78 100644 --- a/src/mame/drivers/seicross.cpp +++ b/src/mame/drivers/seicross.cpp @@ -46,11 +46,15 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html #include "emu.h" #include "includes/seicross.h" + #include "cpu/m6800/m6800.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + void seicross_state::nvram_init(nvram_device &nvram, void *data, size_t size) { diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp index 8662811ba53..f68cfbb815e 100644 --- a/src/mame/drivers/seicupbl.cpp +++ b/src/mame/drivers/seicupbl.cpp @@ -15,11 +15,14 @@ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/gen_latch.h" #include "machine/seicop.h" #include "sound/okim6295.h" -#include "machine/gen_latch.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_8MHz diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp index 1926b208b9a..8f5b522356f 100644 --- a/src/mame/drivers/sengokmj.cpp +++ b/src/mame/drivers/sengokmj.cpp @@ -54,12 +54,15 @@ RSSENGO2.72 chr. *******************************************************************************************/ #include "emu.h" -#include "cpu/nec/nec.h" #include "audio/seibu.h" + +#include "cpu/nec/nec.h" +#include "machine/nvram.h" #include "sound/3812intf.h" #include "sound/okim6295.h" #include "video/seibu_crtc.h" -#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" class sengokmj_state : public driver_device diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index e0d5af33981..5390c5c9676 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -79,10 +79,14 @@ I/O read/write #include "emu.h" #include "includes/senjyo.h" + #include "cpu/z80/z80.h" #include "machine/segacrpt_device.h" #include "sound/sn76496.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + void senjyo_state::machine_start() { diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index f292518cda7..22ef3e0da83 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1360,21 +1360,26 @@ Note: on screen copyright is (c)1998 Coinmaster. ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" -#include "cpu/m6502/m65c02.h" #include "includes/seta.h" + +#include "cpu/m6502/m65c02.h" +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/msm6242.h" +#include "machine/nvram.h" #include "machine/pit8253.h" +#include "machine/watchdog.h" #include "sound/2203intf.h" #include "sound/2612intf.h" #include "sound/3812intf.h" #include "sound/okim6295.h" #include "sound/ym2151.h" -#include "machine/nvram.h" -#include "machine/watchdog.h" + +#include "screen.h" +#include "speaker.h" + #if __uPD71054_TIMER // this mess should be replaced with pit8254, see madshark diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index a35bcc51ff6..d960d447f06 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -109,12 +109,15 @@ reelquak: #include "emu.h" #include "includes/seta2.h" -#include "cpu/m68000/m68000.h" + #include "cpu/h8/h83006.h" +#include "cpu/m68000/m68000.h" +#include "machine/mcf5206e.h" #include "machine/nvram.h" #include "machine/ticket.h" #include "machine/watchdog.h" -#include "machine/mcf5206e.h" +#include "speaker.h" + /*************************************************************************** @@ -651,7 +654,7 @@ private: uint8_t m_serial[4]; }; -const device_type FUNCUBE_TOUCHSCREEN = &device_creator; +const device_type FUNCUBE_TOUCHSCREEN = device_creator; static INPUT_PORTS_START( funcube_touchscreen ) PORT_START("touch_btn") diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index 3efa952ebd6..a97deabca80 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -12,10 +12,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/sf.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/ym2151.h" -#include "includes/sf.h" +#include "screen.h" +#include "speaker.h" /* The protection of the Japanese (and alt US) version */ diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp index 426126dcb84..bd9ee52f5dc 100644 --- a/src/mame/drivers/sfbonus.cpp +++ b/src/mame/drivers/sfbonus.cpp @@ -274,11 +274,14 @@ MH86171 Color Palette RAMDAC #include "emu.h" #include "cpu/z80/z80.h" +#include "machine/nvram.h" #include "sound/okim6295.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" #include "pirpok2.lh" -#include "machine/nvram.h" + class sfbonus_state : public driver_device { diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp index 8934f40c330..16e4b6152df 100644 --- a/src/mame/drivers/sfcbox.cpp +++ b/src/mame/drivers/sfcbox.cpp @@ -118,21 +118,24 @@ How does the Super Famicom Box operates ***************************************************************************/ #include "emu.h" +#include "includes/snes.h" + #include "cpu/z180/z180.h" #include "machine/s3520cf.h" #include "video/mb90082.h" -#include "includes/snes.h" #include "rendlay.h" +#include "speaker.h" + class sfcbox_state : public snes_state { public: sfcbox_state(const machine_config &mconfig, device_type type, const char *tag) - : snes_state(mconfig, type, tag), - m_bios(*this, "bios"), - m_mb90082(*this,"mb90082"), - m_s3520cf(*this, "s3520cf") - { } + : snes_state(mconfig, type, tag) + , m_bios(*this, "bios") + , m_mb90082(*this,"mb90082") + , m_s3520cf(*this, "s3520cf") + { } required_device m_bios; required_device m_mb90082; diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp index f5211ae3dae..315aca95721 100644 --- a/src/mame/drivers/sfkick.cpp +++ b/src/mame/drivers/sfkick.cpp @@ -158,6 +158,8 @@ DIPSW-2 #include "machine/gen_latch.h" #include "machine/i8255.h" #include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" class sfkick_state : public driver_device diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp index e0e64fd58b9..d49ba948c5c 100644 --- a/src/mame/drivers/sg1000.cpp +++ b/src/mame/drivers/sg1000.cpp @@ -68,6 +68,7 @@ Notes: #include "includes/sg1000.h" #include "bus/rs232/rs232.h" #include "softlist.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp index 1fd74dd7204..daf023f95c1 100644 --- a/src/mame/drivers/sg1000a.cpp +++ b/src/mame/drivers/sg1000a.cpp @@ -119,6 +119,7 @@ CN4 CN5 #include "video/tms9928a.h" #include "machine/i8255.h" #include "machine/segacrpt_device.h" +#include "speaker.h" class sg1000a_state : public driver_device diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp index 5805a88c2e0..65c66f172f9 100644 --- a/src/mame/drivers/shadfrce.cpp +++ b/src/mame/drivers/shadfrce.cpp @@ -140,11 +140,13 @@ lev 7 : 0x7c : 0000 11d0 - just rte */ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/shadfrce.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/shadfrce.h" +#include "speaker.h" WRITE16_MEMBER(shadfrce_state::flip_screen) diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index 4e53418f39e..a20591b2ddc 100644 --- a/src/mame/drivers/shangha3.cpp +++ b/src/mame/drivers/shangha3.cpp @@ -34,11 +34,13 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/shangha3.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/2612intf.h" -#include "includes/shangha3.h" +#include "speaker.h" /* this looks like a simple protection check */ diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp index a81c08a0620..4245a0e287a 100644 --- a/src/mame/drivers/shanghai.cpp +++ b/src/mame/drivers/shanghai.cpp @@ -20,10 +20,13 @@ displayed. ***************************************************************************/ #include "emu.h" +#include "audio/seibu.h" + #include "cpu/nec/nec.h" #include "sound/2203intf.h" -#include "audio/seibu.h" #include "video/hd63484.h" +#include "screen.h" +#include "speaker.h" class shanghai_state : public driver_device diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index 1a5adeee78b..8386ffb9edb 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -52,10 +52,14 @@ Games by Nihon Game/Culture Brain: #include "emu.h" #include "includes/shangkid.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + /***************************************************************************************/ diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp index 613cf9e3620..cd914cb8b5e 100644 --- a/src/mame/drivers/shaolins.cpp +++ b/src/mame/drivers/shaolins.cpp @@ -9,10 +9,14 @@ driver by Allard van der Bas ***************************************************************************/ #include "emu.h" +#include "includes/shaolins.h" + #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "sound/sn76496.h" -#include "includes/shaolins.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index 7e8eba9c78f..c3ce31f1181 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -10,9 +10,13 @@ driver by Nicola Salmoria #include "emu.h" #include "includes/shisen.h" + #include "cpu/z80/z80.h" #include "sound/ym2151.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + READ8_MEMBER(shisen_state::dsw1_r) { diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index e839031a544..c5dfaf0108f 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -43,10 +43,13 @@ */ #include "emu.h" +#include "includes/shootout.h" + #include "cpu/m6502/m6502.h" #include "sound/2203intf.h" -#include "includes/shootout.h" #include "machine/deco222.h" +#include "screen.h" +#include "speaker.h" /*******************************************************************************/ diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp index 05a90de94ed..554150d2892 100644 --- a/src/mame/drivers/shougi.cpp +++ b/src/mame/drivers/shougi.cpp @@ -83,6 +83,8 @@ PROM : Type MB7051 #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class shougi_state : public driver_device diff --git a/src/mame/drivers/shtzone.cpp b/src/mame/drivers/shtzone.cpp index 0ae2cd0b470..c83dc552550 100644 --- a/src/mame/drivers/shtzone.cpp +++ b/src/mame/drivers/shtzone.cpp @@ -51,6 +51,7 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class shtzone_state : public driver_device { diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp index d79c5362997..1bf575d14f6 100644 --- a/src/mame/drivers/shuuz.cpp +++ b/src/mame/drivers/shuuz.cpp @@ -20,10 +20,12 @@ #include "emu.h" +#include "includes/shuuz.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "sound/okim6295.h" -#include "includes/shuuz.h" +#include "speaker.h" void shuuz_state::machine_start() diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp index 5b929909c4a..243ba0df289 100644 --- a/src/mame/drivers/sidearms.cpp +++ b/src/mame/drivers/sidearms.cpp @@ -45,12 +45,15 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/sidearms.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/2203intf.h" #include "sound/ym2151.h" -#include "includes/sidearms.h" +#include "screen.h" +#include "speaker.h" void sidearms_state::machine_start() { diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp index 1530e0ba7af..f69930110b5 100644 --- a/src/mame/drivers/sidepckt.cpp +++ b/src/mame/drivers/sidepckt.cpp @@ -132,11 +132,15 @@ Additional notes: ***************************************************************************/ #include "emu.h" +#include "includes/sidepckt.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6502/m6502.h" #include "sound/2203intf.h" #include "sound/3526intf.h" -#include "includes/sidepckt.h" +#include "screen.h" +#include "speaker.h" + // protection tables static const uint8_t sidepckt_prot_table_1[0x10]={0x05,0x03,0x02,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp index 9bee6451b65..099cf63f603 100644 --- a/src/mame/drivers/sigmab52.cpp +++ b/src/mame/drivers/sigmab52.cpp @@ -118,11 +118,6 @@ *******************************************************************************/ - -#define MAIN_CLOCK XTAL_18MHz -#define SEC_CLOCK XTAL_8MHz -#define AUX_CLOCK XTAL_3_579545MHz - #include "emu.h" #include "cpu/m6809/m6809.h" #include "machine/6840ptm.h" @@ -131,9 +126,16 @@ #include "machine/nvram.h" #include "sound/3812intf.h" #include "video/hd63484.h" +#include "screen.h" +#include "speaker.h" #include "sigmab52.lh" + +#define MAIN_CLOCK XTAL_18MHz +#define SEC_CLOCK XTAL_8MHz +#define AUX_CLOCK XTAL_3_579545MHz + class sigmab52_state : public driver_device { public: diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index e5f4e796a1a..6754bf7a421 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -111,13 +111,16 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "video/bufsprite.h" -#include "sound/okim9810.h" -#include "sound/ymz280b.h" #include "machine/eepromser.h" #include "machine/nvram.h" #include "machine/ticket.h" #include "machine/watchdog.h" +#include "sound/okim9810.h" +#include "sound/ymz280b.h" +#include "video/bufsprite.h" +#include "screen.h" +#include "speaker.h" + class sigmab98_state : public driver_device { diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp index a4ecac4b4e8..18c6a20e325 100644 --- a/src/mame/drivers/silkroad.cpp +++ b/src/mame/drivers/silkroad.cpp @@ -7,10 +7,13 @@ /* and preliminary sound hookup by R. Belmont + fixes by Pierpaolo Prazzoli */ #include "emu.h" +#include "includes/silkroad.h" + #include "cpu/m68000/m68000.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/silkroad.h" +#include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" /* diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index a365dd8a2fc..38457eed1b8 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -28,8 +28,10 @@ Very likely to be 'whatever crystals we had on hand which were close enough for #include "cpu/m68000/m68000.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" -#include "video/decospr.h" #include "sound/ym2151.h" +#include "video/decospr.h" +#include "screen.h" +#include "speaker.h" class silvmil_state : public driver_device diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp index ef947234d02..042794d2b21 100644 --- a/src/mame/drivers/simpl156.cpp +++ b/src/mame/drivers/simpl156.cpp @@ -91,12 +91,16 @@ Are the OKI M6295 clocks from Heavy Smash are correct at least for the Mitchell */ #include "emu.h" +#include "includes/simpl156.h" + #include "machine/decocrpt.h" #include "machine/deco156.h" #include "cpu/arm/arm.h" -#include "includes/simpl156.h" #include "machine/eepromser.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + static INPUT_PORTS_START( simpl156 ) PORT_START("IN0") diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp index 117110d950f..be92748a0c4 100644 --- a/src/mame/drivers/simpsons.cpp +++ b/src/mame/drivers/simpsons.cpp @@ -97,15 +97,16 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/simpsons.h" +#include "includes/konamipt.h" + #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ #include "cpu/z80/z80.h" - #include "machine/eepromser.h" #include "machine/watchdog.h" #include "sound/ym2151.h" #include "sound/k053260.h" -#include "includes/simpsons.h" -#include "includes/konamipt.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp index 2842d1ba1f9..70ae23c3fc4 100644 --- a/src/mame/drivers/skeetsht.cpp +++ b/src/mame/drivers/skeetsht.cpp @@ -17,6 +17,8 @@ #include "cpu/tms34010/tms34010.h" #include "sound/ay8910.h" #include "video/tlc34076.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp index de0a8fc86b4..77d7b3b67c7 100644 --- a/src/mame/drivers/skimaxx.cpp +++ b/src/mame/drivers/skimaxx.cpp @@ -40,6 +40,8 @@ #include "cpu/m68000/m68000.h" #include "cpu/tms34010/tms34010.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class skimaxx_state : public driver_device diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp index c7246308fd6..718fc4d14c6 100644 --- a/src/mame/drivers/skullxbo.cpp +++ b/src/mame/drivers/skullxbo.cpp @@ -20,9 +20,11 @@ #include "emu.h" +#include "includes/skullxbo.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" -#include "includes/skullxbo.h" +#include "speaker.h" diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp index 32a25ee6349..84ad8c752c5 100644 --- a/src/mame/drivers/skyarmy.cpp +++ b/src/mame/drivers/skyarmy.cpp @@ -24,10 +24,12 @@ - cpu clock .. now 4 mhz */ - #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + class skyarmy_state : public driver_device { diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp index a6ee208c139..d394ce6ad6d 100644 --- a/src/mame/drivers/skydiver.cpp +++ b/src/mame/drivers/skydiver.cpp @@ -89,9 +89,12 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6800/m6800.h" #include "includes/skydiver.h" + +#include "cpu/m6800/m6800.h" #include "sound/discrete.h" +#include "screen.h" +#include "speaker.h" #include "skydiver.lh" diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp index 7542ed58c7c..1292900c77f 100644 --- a/src/mame/drivers/skyfox.cpp +++ b/src/mame/drivers/skyfox.cpp @@ -20,9 +20,11 @@ Verified Dip locations and recommended settings with manual ***************************************************************************/ #include "emu.h" +#include "includes/skyfox.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/skyfox.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp index ab61672e02e..3dbbd540388 100644 --- a/src/mame/drivers/skykid.cpp +++ b/src/mame/drivers/skykid.cpp @@ -16,11 +16,14 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/skykid.h" + #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6800.h" #include "machine/watchdog.h" #include "sound/namco.h" -#include "includes/skykid.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(skykid_state::inputport_select_w) diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index 995fa3d821d..0efea30de67 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -117,21 +117,23 @@ ***************************************************************************************************/ - -#define MASTER_CLOCK XTAL_12MHz /* confirmed */ -#define HOPPER_PULSE 50 // guessed - #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/i8255.h" #include "machine/nvram.h" #include "machine/ticket.h" +#include "sound/ay8910.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" #include +#define MASTER_CLOCK XTAL_12MHz /* confirmed */ +#define HOPPER_PULSE 50 // guessed + + class skylncr_state : public driver_device { public: diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp index a21ee106272..7feae556898 100644 --- a/src/mame/drivers/skyraid.cpp +++ b/src/mame/drivers/skyraid.cpp @@ -7,9 +7,12 @@ Atari Sky Raider driver ***************************************************************************/ #include "emu.h" +#include "includes/skyraid.h" + #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" -#include "includes/skyraid.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index 276f9592ce5..d2d41191d3b 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -258,10 +258,12 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/slapfght.h" + #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" -#include "includes/slapfght.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp index 1c754a78cc1..2892cd7b4fa 100644 --- a/src/mame/drivers/slapshot.cpp +++ b/src/mame/drivers/slapshot.cpp @@ -134,12 +134,15 @@ Region byte at offset 0x031: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" +#include "includes/slapshot.h" #include "audio/taitosnd.h" -#include "sound/2610intf.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/timekpr.h" -#include "includes/slapshot.h" +#include "sound/2610intf.h" +#include "screen.h" +#include "speaker.h" /*********************************************************** diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp index 36975858218..692d48e2779 100644 --- a/src/mame/drivers/slc1.cpp +++ b/src/mame/drivers/slc1.cpp @@ -50,7 +50,9 @@ Pasting doesn't work, but if it did... #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "speaker.h" + #include "slc1.lh" diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp index 69e7f03c1ca..f56192b1537 100644 --- a/src/mame/drivers/sliver.cpp +++ b/src/mame/drivers/sliver.cpp @@ -65,11 +65,16 @@ Notes: */ #include "emu.h" + #include "cpu/m68000/m68000.h" +#include "cpu/mcs51/mcs51.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" -#include "cpu/mcs51/mcs51.h" #include "video/ramdac.h" + +#include "screen.h" +#include "speaker.h" + #include "jpeglib.h" diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp index 00117e54269..d9552c2a898 100644 --- a/src/mame/drivers/slotcarn.cpp +++ b/src/mame/drivers/slotcarn.cpp @@ -18,9 +18,12 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/i8255.h" +#include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK (XTAL_10MHz) #define CPU_CLOCK (MASTER_CLOCK / 4) diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp index f7ae90084d3..c753cd46f16 100644 --- a/src/mame/drivers/sm1800.cpp +++ b/src/mame/drivers/sm1800.cpp @@ -20,18 +20,19 @@ #include "machine/i8255.h" #include "machine/i8251.h" #include "video/i8275.h" +#include "screen.h" class sm1800_state : public driver_device { public: sm1800_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_uart(*this, "i8251"), - m_ppi(*this, "i8255"), - m_crtc(*this, "i8275"), - m_palette(*this, "palette") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_uart(*this, "i8251") + , m_ppi(*this, "i8255") + , m_crtc(*this, "i8275") + , m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp index ab918d75e9a..299c6330cdb 100644 --- a/src/mame/drivers/sm7238.cpp +++ b/src/mame/drivers/sm7238.cpp @@ -28,6 +28,7 @@ #include "machine/pic8259.h" #include "machine/km035.h" #include "machine/nvram.h" +#include "screen.h" #define KSM_COLUMNS 80 // or 132 diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index 3d1776728b2..1f62cd90fba 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -21,12 +21,15 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/sn76496.h" +#include "imagedev/flopdrv.h" +#include "machine/wd_fdc.h" #include "sound/beep.h" +#include "sound/sn76496.h" #include "video/mc6845.h" -#include "machine/wd_fdc.h" -#include "imagedev/flopdrv.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_4_028MHz diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index cab5f9c85f5..130bffc78cd 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -244,15 +244,15 @@ DC00 - Selection buttons #2, 9-16 (R) ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/sn76496.h" -#include "sound/ym2413.h" -#include "video/315_5124.h" #include "includes/sms.h" + +#include "cpu/z80/z80.h" #include "softlist.h" +#include "speaker.h" #include "sms1.lh" + #define MASTER_CLOCK_GG 32215905 #define MASTER_CLOCK_PALN 10746168 // The clocks for PAL and PAL-M used here differ from their nominal values, diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp index b9aa5a66d14..7fa9a6f3412 100644 --- a/src/mame/drivers/sms_bootleg.cpp +++ b/src/mame/drivers/sms_bootleg.cpp @@ -117,12 +117,11 @@ A Korean version has been seen too (unless this can be switched?) */ #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/sn76496.h" -#include "sound/ym2413.h" -#include "video/315_5124.h" #include "includes/sms_bootleg.h" +#include "cpu/z80/z80.h" +#include "speaker.h" + static ADDRESS_MAP_START( sms_supergame_map, AS_PROGRAM, 8, smsbootleg_state ) diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp index 4bfcaecae2b..ffcf08257a9 100644 --- a/src/mame/drivers/smsmcorp.cpp +++ b/src/mame/drivers/smsmcorp.cpp @@ -217,9 +217,11 @@ U145 1Brown PAL14H4CN #include "emu.h" #include "cpu/i86/i86.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/i8255.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class smsmfg_state : public driver_device diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp index 52425957519..f4b37f7b05e 100644 --- a/src/mame/drivers/snes.cpp +++ b/src/mame/drivers/snes.cpp @@ -27,15 +27,19 @@ ***************************************************************************/ #include "emu.h" +#include "includes/snes.h" #include "audio/snes_snd.h" + #include "cpu/spc700/spc700.h" -#include "includes/snes.h" #include "machine/snescx4.h" #include "bus/snes/snes_slot.h" #include "bus/snes/snes_carts.h" #include "bus/snes_ctrl/ctrl.h" + #include "softlist.h" +#include "speaker.h" + class snes_console_state : public snes_state { diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp index 0010ac07d65..9180ad2f9a0 100644 --- a/src/mame/drivers/snesb.cpp +++ b/src/mame/drivers/snesb.cpp @@ -148,6 +148,7 @@ Iron PCB (same as Final Fight 2?) #include "emu.h" #include "includes/snes.h" #include "cpu/mcs51/mcs51.h" +#include "speaker.h" class snesb_state : public snes_state { diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index 51b79cc09c8..13c282826f1 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -270,13 +270,15 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/snk.h" + +#include "cpu/z80/z80.h" #include "sound/snkwave.h" #include "sound/ay8910.h" #include "sound/3526intf.h" #include "sound/3812intf.h" #include "sound/8950intf.h" +#include "speaker.h" /*********************************************************************/ diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp index 11c33a9a8d5..c1f73160acc 100644 --- a/src/mame/drivers/snk6502.cpp +++ b/src/mame/drivers/snk6502.cpp @@ -280,10 +280,13 @@ Stephh's notes (based on the games M6502 code and some tests) : */ #include "emu.h" +#include "includes/snk6502.h" + #include "cpu/m6502/m6502.h" -#include "video/mc6845.h" #include "sound/samples.h" -#include "includes/snk6502.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_11_289MHz diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp index be39dc214f3..61302b76d23 100644 --- a/src/mame/drivers/snk68.cpp +++ b/src/mame/drivers/snk68.cpp @@ -43,10 +43,13 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/snk68.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/3812intf.h" -#include "includes/snk68.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index 5c7161a028f..1f2088476d1 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -614,16 +614,20 @@ ***********************************************************************************/ -#define MASTER_CLOCK XTAL_16MHz - #include "emu.h" +#include "includes/snookr10.h" + #include "cpu/m6502/m65sc02.h" +#include "machine/nvram.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + #include "snookr10.lh" -#include "includes/snookr10.h" -#include "machine/nvram.h" +#define MASTER_CLOCK XTAL_16MHz + /********************** * Read/Write Handlers * * - Input Ports - * diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp index b33963c7871..1cf0faeeead 100644 --- a/src/mame/drivers/snowbros.cpp +++ b/src/mame/drivers/snowbros.cpp @@ -76,12 +76,16 @@ a joystick. This is not an emulation bug. #include "emu.h" #include "includes/snowbros.h" + #include "cpu/m68000/m68000.h" +#include "cpu/mcs51/mcs51.h" // for semicom mcu #include "cpu/z80/z80.h" +#include "machine/watchdog.h" #include "sound/ym2151.h" #include "sound/3812intf.h" -#include "cpu/mcs51/mcs51.h" // for semicom mcu -#include "machine/watchdog.h" + +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(snowbros_state::snowbros_flipscreen_w) diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp index e3e6b734626..ce7218901ac 100644 --- a/src/mame/drivers/socrates.cpp +++ b/src/mame/drivers/socrates.cpp @@ -83,11 +83,16 @@ TODO: /* Core includes */ #include "emu.h" -#include "cpu/z80/z80.h" #include "audio/socrates.h" -#include "bus/generic/slot.h" + #include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "cpu/z80/z80.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class socrates_state : public driver_device { diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp index c4a9345de87..4912adeaf3d 100644 --- a/src/mame/drivers/solomon.cpp +++ b/src/mame/drivers/solomon.cpp @@ -9,9 +9,13 @@ driver by Mirko Buffoni ***************************************************************************/ #include "emu.h" +#include "includes/solomon.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/solomon.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(solomon_state::solomon_sh_command_w) { diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp index 41fd40305b1..ee93eaec869 100644 --- a/src/mame/drivers/sonson.cpp +++ b/src/mame/drivers/sonson.cpp @@ -51,10 +51,13 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/sonson.h" + #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" -#include "includes/sonson.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(sonson_state::sonson_sh_irqtrigger_w) diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index d6a6f3554ed..7740badf571 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -163,7 +163,10 @@ NOTES (2016-06-06) #include "emu.h" #include "includes/sorcerer.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + static ADDRESS_MAP_START( sorcerer_mem, AS_PROGRAM, 8, sorcerer_state) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp index 6c53747b815..d99a27c75a7 100644 --- a/src/mame/drivers/sothello.cpp +++ b/src/mame/drivers/sothello.cpp @@ -37,12 +37,13 @@ OSC : 8.0000MHz(X1) 21.477 MHz(X2) 384kHz(X3) */ #include "emu.h" -#include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" #include "sound/msm5205.h" #include "video/v9938.h" +#include "speaker.h" class sothello_state : public driver_device diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp index e52dcf0edac..d3635c9845d 100644 --- a/src/mame/drivers/spaceg.cpp +++ b/src/mame/drivers/spaceg.cpp @@ -165,7 +165,9 @@ Notes: #include "emu.h" #include "includes/mw8080bw.h" + #include "cpu/z80/z80.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index c7e1bc4ea1d..1b81403ad19 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -20,10 +20,14 @@ probably an original bug? */ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/iremipt.h" + +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + class spartanxtec_state : public driver_device { diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp index c3494b35116..3f61ac65e6d 100644 --- a/src/mame/drivers/spbactn.cpp +++ b/src/mame/drivers/spbactn.cpp @@ -132,11 +132,13 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF *******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/spbactn.h" + #include "cpu/m68000/m68000.h" -#include "sound/okim6295.h" +#include "cpu/z80/z80.h" #include "sound/3812intf.h" -#include "includes/spbactn.h" +#include "sound/okim6295.h" +#include "speaker.h" WRITE16_MEMBER(spbactn_state::soundcommand_w) diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp index 8a50e490ffc..10b26c44c55 100644 --- a/src/mame/drivers/spc1000.cpp +++ b/src/mame/drivers/spc1000.cpp @@ -129,20 +129,24 @@ NOTE: 2014-09-13: added code from someone's modified MESS driver for floppy */ #include "emu.h" + #include "cpu/z80/z80.h" +#include "imagedev/cassette.h" #include "machine/ram.h" #include "sound/ay8910.h" #include "sound/wave.h" #include "video/mc6847.h" -#include "imagedev/cassette.h" -#include "formats/spc1000_cas.h" -#include "bus/centronics/ctronics.h" +#include "bus/centronics/ctronics.h" #include "bus/spc1000/exp.h" #include "bus/spc1000/fdd.h" #include "bus/spc1000/vdp.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/spc1000_cas.h" + class spc1000_state : public driver_device { diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp index 78331202047..ee3fd20f9e7 100644 --- a/src/mame/drivers/spc1500.cpp +++ b/src/mame/drivers/spc1500.cpp @@ -222,17 +222,23 @@ TODO: */ #include "emu.h" + +#include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" -#include "machine/ram.h" +#include "imagedev/cassette.h" #include "machine/i8255.h" +#include "machine/ram.h" #include "sound/ay8910.h" #include "sound/wave.h" #include "video/mc6845.h" -#include "imagedev/cassette.h" + +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + #include "formats/spc1000_cas.h" -#include "bus/centronics/ctronics.h" + #define VDP_CLOCK XTAL_42_9545MHz -#include "softlist.h" class spc1500_state : public driver_device { diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp index 9e1d05d49f1..d30e8c22586 100644 --- a/src/mame/drivers/spcforce.cpp +++ b/src/mame/drivers/spcforce.cpp @@ -36,10 +36,14 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/spcforce.h" + #include "cpu/i8085/i8085.h" #include "cpu/mcs48/mcs48.h" #include "machine/gen_latch.h" -#include "includes/spcforce.h" +#include "screen.h" +#include "speaker.h" + void spcforce_state::machine_start() { diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp index 487f6985823..f8583a17e93 100644 --- a/src/mame/drivers/spdodgeb.cpp +++ b/src/mame/drivers/spdodgeb.cpp @@ -24,10 +24,12 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/spdodgeb.h" + #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" #include "sound/3812intf.h" -#include "includes/spdodgeb.h" +#include "speaker.h" WRITE8_MEMBER(spdodgeb_state::sound_command_w) diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp index 7558332bc2d..9e85d1ba47f 100644 --- a/src/mame/drivers/spec128.cpp +++ b/src/mame/drivers/spec128.cpp @@ -151,15 +151,16 @@ resulting mess can be seen in the F4 viewer display. *******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/spectrum.h" #include "includes/spec128.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" + +#include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "sound/speaker.h" + +#include "screen.h" + #include "formats/tzx_cas.h" -#include "machine/ram.h" + /****************************************************************************************************/ /* Spectrum 128 specific functions */ diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp index 479cdbffcc1..1530648d38c 100644 --- a/src/mame/drivers/special.cpp +++ b/src/mame/drivers/special.cpp @@ -11,8 +11,12 @@ #include "emu.h" #include "includes/special.h" + #include "sound/volt_reg.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + /* Address maps */ static ADDRESS_MAP_START(specialist_mem, AS_PROGRAM, 8, special_state ) diff --git a/src/mame/drivers/specpls3.cpp b/src/mame/drivers/specpls3.cpp index 2564a2aeda3..a187d43958d 100644 --- a/src/mame/drivers/specpls3.cpp +++ b/src/mame/drivers/specpls3.cpp @@ -150,16 +150,14 @@ http://www.z88forever.org.uk/zxplus3e/ #include "includes/spectrum.h" #include "includes/spec128.h" #include "includes/specpls3.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" + #include "sound/ay8910.h" -#include "sound/speaker.h" -#include "formats/tzx_cas.h" -/* +3 hardware */ -#include "machine/ram.h" +#include "screen.h" #include "softlist.h" +#include "formats/tzx_cas.h" + /****************************************************************************************************/ /* Spectrum + 3 specific functions */ /* This driver uses some of the spectrum_128 functions. The +3 is similar to a spectrum 128 diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp index aca18c8f8cc..29b3b71963e 100644 --- a/src/mame/drivers/spectra.cpp +++ b/src/mame/drivers/spectra.cpp @@ -35,9 +35,12 @@ #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6502/m6502.h" #include "machine/6532riot.h" #include "sound/sn76477.h" +#include "speaker.h" + #include "spectra.lh" diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index e0d8d945abf..79c1c4ab200 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -276,12 +276,18 @@ SamRam *******************************************************************************/ #include "emu.h" +#include "includes/spectrum.h" + #include "cpu/z80/z80.h" #include "sound/wave.h" -#include "includes/spectrum.h" -#include "formats/tzx_cas.h" #include "machine/spec_snqk.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/tzx_cas.h" + /****************************************************************************************************/ /* Spectrum 48k functions */ diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp index 18205a0c5d4..5e2d0c021a7 100644 --- a/src/mame/drivers/speedatk.cpp +++ b/src/mame/drivers/speedatk.cpp @@ -76,10 +76,14 @@ PS / PD : key matrix *****************************************************************************************/ #include "emu.h" +#include "includes/speedatk.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/speedatk.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_12MHz diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp index a4777576d2b..6617a853e1a 100644 --- a/src/mame/drivers/speedbal.cpp +++ b/src/mame/drivers/speedbal.cpp @@ -30,9 +30,13 @@ Interrupt frequency on audio CPU is not a periodical signal, but there are a lot ***************************************************************************/ #include "emu.h" +#include "includes/speedbal.h" + #include "cpu/z80/z80.h" #include "sound/3812intf.h" -#include "includes/speedbal.h" +#include "screen.h" +#include "speaker.h" + #include "speedbal.lh" diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp index 24fc6a2ccb9..99e75c8e18d 100644 --- a/src/mame/drivers/speedspn.cpp +++ b/src/mame/drivers/speedspn.cpp @@ -22,9 +22,13 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/speedspn.h" +#include "cpu/z80/z80.h" +#include "screen.h" +#include "speaker.h" + + /*** README INFO ************************************************************** ROMSET: speedspn diff --git a/src/mame/drivers/spiders.cpp b/src/mame/drivers/spiders.cpp index afebaa035b3..715faac00b3 100644 --- a/src/mame/drivers/spiders.cpp +++ b/src/mame/drivers/spiders.cpp @@ -190,14 +190,16 @@ ***************************************************************************/ #include "emu.h" -#include "machine/rescap.h" +#include "includes/spiders.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" -#include "video/mc6845.h" #include "machine/6821pia.h" #include "machine/74123.h" -#include "includes/spiders.h" #include "machine/nvram.h" +#include "machine/rescap.h" +#include "video/mc6845.h" +#include "screen.h" #define MAIN_CPU_MASTER_CLOCK (11200000) diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp index 6ed8ae51f9b..70962152bea 100644 --- a/src/mame/drivers/spinb.cpp +++ b/src/mame/drivers/spinb.cpp @@ -32,12 +32,17 @@ ToDo: #include "emu.h" #include "machine/genpin.h" -#include "cpu/z80/z80.h" + #include "cpu/mcs51/mcs51.h" +#include "cpu/z80/z80.h" +#include "machine/74157.h" +#include "machine/7474.h" #include "machine/i8255.h" #include "sound/msm5205.h" -#include "machine/7474.h" -#include "machine/74157.h" + +#include "screen.h" +#include "speaker.h" + class spinb_state : public genpin_class { diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 8178529d159..38bd11cecc0 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -44,11 +44,14 @@ More notes about Funny Strip protection issues at the bottom of source file (DRI ***************************************************************************/ #include "emu.h" +#include "includes/splash.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" #include "sound/3812intf.h" -#include "includes/splash.h" +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(splash_state::splash_sh_irqtrigger_w) { diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp index 03409649a3c..a449d8aca88 100644 --- a/src/mame/drivers/splus.cpp +++ b/src/mame/drivers/splus.cpp @@ -21,13 +21,17 @@ ***********************************************************************************/ #include "emu.h" -#include "sound/ay8910.h" -#include "machine/nvram.h" + #include "cpu/mcs51/mcs51.h" #include "machine/i2cmem.h" +#include "machine/nvram.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" #include "splus.lh" + #define DEBUG_OUTPUT 0 class splus_state : public driver_device diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp index 969faca2280..41cd5c08a4c 100644 --- a/src/mame/drivers/spoker.cpp +++ b/src/mame/drivers/spoker.cpp @@ -34,6 +34,8 @@ #include "sound/ym2413.h" #include "sound/okim6295.h" #include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" class spoker_state : public driver_device diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp index 7418d0f7939..56e59cdc589 100644 --- a/src/mame/drivers/spool99.cpp +++ b/src/mame/drivers/spool99.cpp @@ -93,8 +93,11 @@ Note #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/okim6295.h" #include "machine/eepromser.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" + class spool99_state : public driver_device { diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp index 8acd06cca06..812703941df 100644 --- a/src/mame/drivers/sprcros2.cpp +++ b/src/mame/drivers/sprcros2.cpp @@ -55,6 +55,8 @@ SC-61.5A #include "emu.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" +#include "screen.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_10MHz diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp index f57d3d54c84..6a21fc6d182 100644 --- a/src/mame/drivers/sprint2.cpp +++ b/src/mame/drivers/sprint2.cpp @@ -20,9 +20,11 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/sprint2.h" + +#include "cpu/m6502/m6502.h" #include "sound/discrete.h" +#include "speaker.h" #define MACHINE_IS_SPRINT1 (m_game == 1) #define MACHINE_IS_SPRINT2 (m_game == 2) diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp index 28267e732ba..668bf7ce965 100644 --- a/src/mame/drivers/sprint4.cpp +++ b/src/mame/drivers/sprint4.cpp @@ -7,9 +7,11 @@ Atari Sprint 4 driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" -#include "audio/sprint4.h" #include "includes/sprint4.h" +#include "audio/sprint4.h" + +#include "cpu/m6502/m6502.h" +#include "speaker.h" #define MASTER_CLOCK 12096000 diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp index 9a39559cf50..125651e6e69 100644 --- a/src/mame/drivers/sprint8.cpp +++ b/src/mame/drivers/sprint8.cpp @@ -7,8 +7,9 @@ Atari Sprint 8 driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6800/m6800.h" #include "includes/sprint8.h" +#include "cpu/m6800/m6800.h" +#include "speaker.h" diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp index 1396d404b8c..6d0553fd57f 100644 --- a/src/mame/drivers/spy.cpp +++ b/src/mame/drivers/spy.cpp @@ -20,13 +20,16 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/spy.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/3812intf.h" -#include "includes/konamipt.h" -#include "includes/spy.h" +#include "speaker.h" + INTERRUPT_GEN_MEMBER(spy_state::spy_interrupt) { diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 377f858786d..05c8126f29d 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -21,6 +21,9 @@ sound system appears to be the same as 'spartanxtec.cpp' #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #include "spyhunttec.lh" class spyhuntertec_state : public driver_device diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index 8cec6f28245..f3644c61104 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -55,15 +55,19 @@ ****************************************************************************/ #include "emu.h" + +#include "bus/generic/carts.h" #include "cpu/m6809/m6809.h" -#include "video/ef9365.h" #include "machine/6821pia.h" #include "machine/6850acia.h" -#include "sound/ay8910.h" #include "machine/wd_fdc.h" -#include "bus/generic/carts.h" +#include "sound/ay8910.h" +#include "video/ef9365.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_14MHz #define AY_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */ diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index b5bb65f22ef..1d7c3027880 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -58,12 +58,16 @@ Note: #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/srmp2.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/msm5205.h" -#include "includes/srmp2.h" -#include "machine/nvram.h" +#include "screen.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp index 901bc10c095..5add9eef53d 100644 --- a/src/mame/drivers/srmp6.cpp +++ b/src/mame/drivers/srmp6.cpp @@ -71,6 +71,9 @@ Dumped 06/15/2000 #include "emu.h" #include "cpu/m68000/m68000.h" #include "sound/nile.h" +#include "screen.h" +#include "speaker.h" + class srmp6_state : public driver_device { diff --git a/src/mame/drivers/srumbler.cpp b/src/mame/drivers/srumbler.cpp index 67f4ba16fea..92bcd4c26d9 100644 --- a/src/mame/drivers/srumbler.cpp +++ b/src/mame/drivers/srumbler.cpp @@ -13,11 +13,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/srumbler.h" + #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "sound/2203intf.h" -#include "includes/srumbler.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(srumbler_state::bankswitch_w) diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index b108c9cfee3..20e684d8493 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -6,10 +6,11 @@ Driver by Ryan Holtz */ - #include "emu.h" #include "cpu/ssem/ssem.h" #include "imagedev/snapquik.h" +#include "screen.h" + class ssem_state : public driver_device { diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp index 7ea734f7c43..b611d16a3ad 100644 --- a/src/mame/drivers/ssfindo.cpp +++ b/src/mame/drivers/ssfindo.cpp @@ -127,6 +127,8 @@ Notes: #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" +#include "screen.h" +#include "speaker.h" enum { diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp index c17263953fc..012ce5bad91 100644 --- a/src/mame/drivers/sshangha.cpp +++ b/src/mame/drivers/sshangha.cpp @@ -47,12 +47,16 @@ Stephh's notes (based on the games M68000 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/sshangha.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" #include "sound/okim6295.h" -#include "includes/sshangha.h" #include "machine/deco146.h" +#include "screen.h" +#include "speaker.h" + #define SSHANGHA_HACK 0 diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp index 7eb2c4eba6e..1d8eca3b2da 100644 --- a/src/mame/drivers/sshot.cpp +++ b/src/mame/drivers/sshot.cpp @@ -164,6 +164,7 @@ Given CS numbers this is released after the other GunChamp #include "emu.h" #include "cpu/scmp/scmp.h" +#include "screen.h" #include "gunchamps.lh" diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp index 89ed37dc7c2..badf29eccb7 100644 --- a/src/mame/drivers/ssingles.cpp +++ b/src/mame/drivers/ssingles.cpp @@ -150,6 +150,8 @@ Dumped by Chack'n #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" #define NUM_PENS (4*8) #define VMEM_SIZE 0x100 diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index 2c7cd1ff4c8..6bad5f3dc21 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -83,9 +83,12 @@ Notes: #include "emu.h" +#include "includes/sslam.h" + #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" -#include "includes/sslam.h" +#include "screen.h" +#include "speaker.h" #define oki_time_base 0x08 diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp index ce6287a4948..ce68b106b13 100644 --- a/src/mame/drivers/ssozumo.cpp +++ b/src/mame/drivers/ssozumo.cpp @@ -11,11 +11,14 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04 #include "emu.h" #include "includes/ssozumo.h" + #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" void ssozumo_state::machine_start() diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp index 204e9f66eb7..eef9029b87c 100644 --- a/src/mame/drivers/sspeedr.cpp +++ b/src/mame/drivers/sspeedr.cpp @@ -7,10 +7,13 @@ Taito Super Speed Race driver ***************************************************************************/ #include "emu.h" +#include "includes/sspeedr.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" +#include "screen.h" + #include "sspeedr.lh" -#include "includes/sspeedr.h" diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp index 22e8c43d2cf..83fb0847811 100644 --- a/src/mame/drivers/ssrj.cpp +++ b/src/mame/drivers/ssrj.cpp @@ -32,9 +32,13 @@ HW info : ************************************/ #include "emu.h" +#include "includes/ssrj.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/ssrj.h" +#include "screen.h" +#include "speaker.h" + void ssrj_state::machine_start() { diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp index 68bb374fdbf..97da000c732 100644 --- a/src/mame/drivers/sstrangr.cpp +++ b/src/mame/drivers/sstrangr.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" #include "sstrangr.lh" diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index b58cede8b8d..594f65a25e1 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -162,11 +162,14 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/ssv.h" + #include "cpu/v810/v810.h" #include "cpu/v60/v60.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/ssv.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/ssystem3.cpp b/src/mame/drivers/ssystem3.cpp index 613d489876b..bf793b6a82e 100644 --- a/src/mame/drivers/ssystem3.cpp +++ b/src/mame/drivers/ssystem3.cpp @@ -36,9 +36,10 @@ backup of playfield rom and picture/description of its board */ #include "emu.h" - #include "includes/ssystem3.h" + #include "cpu/m6502/m6502.h" +#include "screen.h" // in my opinion own cpu to display lcd field and to handle own buttons diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp index 57892ae33ad..5f45b8a23fb 100644 --- a/src/mame/drivers/st17xx.cpp +++ b/src/mame/drivers/st17xx.cpp @@ -35,10 +35,11 @@ */ - #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" +#include "screen.h" + #define SCREEN_TAG "screen" diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp index 022cb119e68..25955cf0f87 100644 --- a/src/mame/drivers/st_mp200.cpp +++ b/src/mame/drivers/st_mp200.cpp @@ -18,9 +18,12 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "sound/s14001a.h" +#include "speaker.h" + #include "st_mp200.lh" #define S14001_CLOCK (25e5) diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp index 0b96752214f..1a67ea6778a 100644 --- a/src/mame/drivers/stadhero.cpp +++ b/src/mame/drivers/stadhero.cpp @@ -21,12 +21,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/stadhero.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "sound/2203intf.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/stadhero.h" +#include "screen.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp index 9c42109b9f4..ec2c9fa09c0 100644 --- a/src/mame/drivers/starcrus.cpp +++ b/src/mame/drivers/starcrus.cpp @@ -12,9 +12,13 @@ palazzol@home.com ***************************************************************************/ #include "emu.h" +#include "includes/starcrus.h" + #include "cpu/i8085/i8085.h" #include "sound/samples.h" -#include "includes/starcrus.h" +#include "screen.h" +#include "speaker.h" + static ADDRESS_MAP_START( starcrus_map, AS_PROGRAM, 8, starcrus_state ) AM_RANGE(0x0000, 0x0fff) AM_ROM diff --git a/src/mame/drivers/starfire.cpp b/src/mame/drivers/starfire.cpp index 70bdce04ba0..795cf1b859e 100644 --- a/src/mame/drivers/starfire.cpp +++ b/src/mame/drivers/starfire.cpp @@ -47,9 +47,11 @@ starfira has one less rom in total than starfire but everything passes as ***************************************************************************/ #include "emu.h" +#include "includes/starfire.h" + #include "cpu/z80/z80.h" #include "sound/samples.h" -#include "includes/starfire.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp index c98d491a4e8..126fb856326 100644 --- a/src/mame/drivers/starshp1.cpp +++ b/src/mame/drivers/starshp1.cpp @@ -10,8 +10,9 @@ Atari Starship 1 driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/starshp1.h" +#include "cpu/m6502/m6502.h" +#include "speaker.h" diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp index 59320b60504..6b9a0cb0acf 100644 --- a/src/mame/drivers/starwars.cpp +++ b/src/mame/drivers/starwars.cpp @@ -25,6 +25,9 @@ ***************************************************************************/ #include "emu.h" +#include "includes/starwars.h" +#include "includes/slapstic.h" + #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "video/vector.h" @@ -32,8 +35,8 @@ #include "sound/tms5220.h" #include "sound/pokey.h" #include "machine/x2212.h" -#include "includes/starwars.h" -#include "includes/slapstic.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK (XTAL_12_096MHz) diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index d226c24900d..01c42e33525 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -72,24 +72,26 @@ quaquiz2 - no inputs, needs NVRAM #include "emu.h" #include "cpu/i8085/i8085.h" -#include "sound/ay8910.h" #include "machine/i8255.h" -#include "video/tms9927.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/tms9927.h" +#include "screen.h" +#include "speaker.h" class statriv2_state : public driver_device { public: statriv2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_tms(*this, "tms"), - m_videoram(*this, "videoram"), - m_question_offset(*this, "question_offset"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_tms(*this, "tms") + , m_videoram(*this, "videoram") + , m_question_offset(*this, "question_offset") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + { } required_device m_maincpu; required_device m_tms; diff --git a/src/mame/drivers/stfight.cpp b/src/mame/drivers/stfight.cpp index 2f6586d9bcd..7882a12f711 100644 --- a/src/mame/drivers/stfight.cpp +++ b/src/mame/drivers/stfight.cpp @@ -263,6 +263,8 @@ TODO: #include "sound/2203intf.h" +#include "speaker.h" + static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, stfight_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp index 196684e83f1..b95b9627174 100644 --- a/src/mame/drivers/stlforce.cpp +++ b/src/mame/drivers/stlforce.cpp @@ -70,10 +70,13 @@ TO DO : */ #include "emu.h" +#include "includes/stlforce.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "sound/okim6295.h" -#include "includes/stlforce.h" +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER(stlforce_state::eeprom_w) diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp index 16a18ecdd2c..89970ff4aff 100644 --- a/src/mame/drivers/stratos.cpp +++ b/src/mame/drivers/stratos.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "cpu/m6502/m65c02.h" #include "machine/nvram.h" +#include "screen.h" class stratos_state : public driver_device { diff --git a/src/mame/drivers/strnskil.cpp b/src/mame/drivers/strnskil.cpp index 33335cf6d58..3e43a9345f7 100644 --- a/src/mame/drivers/strnskil.cpp +++ b/src/mame/drivers/strnskil.cpp @@ -19,10 +19,13 @@ Notes: *****************************************************************************/ #include "emu.h" +#include "includes/strnskil.h" + #include "cpu/z80/z80.h" #include "cpu/mb88xx/mb88xx.h" #include "sound/sn76496.h" -#include "includes/strnskil.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 267a0679f12..20d4d341bfd 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -184,6 +184,7 @@ Notes: */ #include "emu.h" + #include "cpu/cosmac/cosmac.h" #include "sound/beep.h" #include "sound/cdp1864.h" @@ -192,7 +193,10 @@ Notes: #include "bus/generic/slot.h" #include "bus/generic/carts.h" + #include "softlist.h" +#include "speaker.h" + #define CDP1802_TAG "ic1" #define CDP1861_TAG "ic2" diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index a3767fdb07e..92e9641004e 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -83,6 +83,9 @@ Bprom dump by f205v #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + class stuntair_state : public driver_device { diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 212e6cec3e8..c73059efdaf 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -35,19 +35,25 @@ ************************************************************************************************************************/ #include "emu.h" -#include "cpu/sh2/sh2.h" +#include "includes/stv.h" +#include "audio/rax.h" + #include "cpu/m68000/m68000.h" #include "cpu/scudsp/scudsp.h" +#include "cpu/sh2/sh2.h" +#include "imagedev/chd_cd.h" #include "machine/eepromser.h" -#include "sound/scsp.h" -#include "sound/cdda.h" -#include "audio/rax.h" #include "machine/smpc.h" #include "machine/stvprot.h" -#include "includes/stv.h" -#include "imagedev/chd_cd.h" -#include "coreutil.h" +#include "sound/cdda.h" +#include "sound/scsp.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "coreutil.h" + #define FIRST_SPEEDUP_SLOT (2) // in case we remove/alter the BIOS speedups later diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp index e2a4b7178e9..c860afdd287 100644 --- a/src/mame/drivers/sub.cpp +++ b/src/mame/drivers/sub.cpp @@ -112,6 +112,8 @@ PCB2 (Top board, CPU board) #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp index db541799019..33b61913da6 100644 --- a/src/mame/drivers/subhuntr.cpp +++ b/src/mame/drivers/subhuntr.cpp @@ -21,6 +21,8 @@ QTY Type position #include "emu.h" #include "cpu/s2650/s2650.h" #include "machine/s2636.h" +#include "screen.h" +#include "speaker.h" class subhuntr_state : public driver_device diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp index e0420d3ca23..84d1c34425b 100644 --- a/src/mame/drivers/subs.cpp +++ b/src/mame/drivers/subs.cpp @@ -20,10 +20,14 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/subs.h" + +#include "cpu/m6502/m6502.h" #include "sound/discrete.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" + /************************************* * diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index 9dfe27bb789..cca15d88f5d 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -224,6 +224,8 @@ To Do: #include "sound/okim6295.h" #include "sound/ym2413.h" #include "sound/3812intf.h" +#include "screen.h" +#include "speaker.h" #include "victor5.lh" #include "victor21.lh" diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index 291589fb135..58593f5c348 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -44,11 +44,13 @@ To do: #include "cpu/h8/h83048.h" #include "cpu/i86/i186.h" #include "cpu/z180/z180.h" -#include "sound/3812intf.h" -#include "sound/okim6295.h" #include "machine/nvram.h" #include "machine/subsino.h" #include "machine/ticket.h" +#include "sound/3812intf.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" enum tilesize_t diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp index 4556bc83e5c..323958899a0 100644 --- a/src/mame/drivers/summit.cpp +++ b/src/mame/drivers/summit.cpp @@ -19,6 +19,7 @@ needs inputs, prom decode, sound, artwork (lamps), probably some irq masking and #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "video/mc6845.h" +#include "screen.h" class summit_state : public driver_device diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp index e438a07a01f..7ec40dd829d 100644 --- a/src/mame/drivers/sun2.cpp +++ b/src/mame/drivers/sun2.cpp @@ -121,6 +121,7 @@ How the architecture works: #include "machine/z80scc.h" #include "machine/bankdev.h" #include "bus/rs232/rs232.h" +#include "screen.h" #define SCC1_TAG "scc1" #define SCC2_TAG "scc2" @@ -138,16 +139,16 @@ class sun2_state : public driver_device { public: sun2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_rom(*this, "bootprom"), - m_idprom(*this, "idprom"), - m_ram(*this, RAM_TAG), - m_type0space(*this, "type0"), - m_type1space(*this, "type1"), - m_type2space(*this, "type2"), - m_type3space(*this, "type3"), - m_bw2_vram(*this, "bw2_vram") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_rom(*this, "bootprom") + , m_idprom(*this, "idprom") + , m_ram(*this, RAM_TAG) + , m_type0space(*this, "type0") + , m_type1space(*this, "type1") + , m_type2space(*this, "type2") + , m_type3space(*this, "type3") + , m_bw2_vram(*this, "bw2_vram") { } required_device m_maincpu; diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp index acd6a799872..561f35739f7 100644 --- a/src/mame/drivers/sun3.cpp +++ b/src/mame/drivers/sun3.cpp @@ -179,15 +179,20 @@ fefc34a - start of mem_size, which queries ECC registers for each memory board ****************************************************************************/ #include "emu.h" + #include "cpu/m68000/m68000.h" -#include "machine/timekpr.h" -#include "machine/ram.h" -#include "machine/z80scc.h" #include "machine/bankdev.h" #include "machine/nvram.h" +#include "machine/ram.h" +#include "machine/timekpr.h" +#include "machine/z80scc.h" + #include "bus/rs232/rs232.h" #include "bus/sunkbd/sunkbd.h" +#include "screen.h" + + #define TIMEKEEPER_TAG "timekpr" #define SCC1_TAG "scc1" #define SCC2_TAG "scc2" diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp index 2d93a6f3718..a1b34b48752 100644 --- a/src/mame/drivers/sun3x.cpp +++ b/src/mame/drivers/sun3x.cpp @@ -129,19 +129,23 @@ ****************************************************************************/ #include "emu.h" -#include "emu.h" -#include "cpu/m68000/m68000.h" -#include "machine/timekpr.h" -#include "machine/z80scc.h" + #include "bus/scsi/scsi.h" -#include "bus/scsi/scsihd.h" #include "bus/scsi/scsicd.h" +#include "bus/scsi/scsihd.h" +#include "cpu/m68000/m68000.h" +#include "formats/mfi_dsk.h" +#include "formats/pc_dsk.h" #include "machine/ncr539x.h" +#include "machine/timekpr.h" #include "machine/upd765.h" -#include "formats/pc_dsk.h" -#include "formats/mfi_dsk.h" +#include "machine/z80scc.h" + #include "bus/rs232/rs232.h" +#include "screen.h" + + #define TIMEKEEPER_TAG "timekpr" #define SCC1_TAG "scc1" #define SCC2_TAG "scc2" @@ -161,7 +165,7 @@ public: m_fdc(*this, FDC_TAG), m_p_ram(*this, "p_ram"), m_bw2_vram(*this, "bw2_vram") - { } + { } required_device m_maincpu; required_device m_scc1; diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 3e77d8e21da..f0a13378a24 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -410,26 +410,30 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/sparc/sparc.h" -#include "machine/timekpr.h" -#include "machine/ram.h" -#include "machine/z80scc.h" -#include "machine/bankdev.h" -#include "machine/nvram.h" + #include "bus/rs232/rs232.h" #include "bus/sunkbd/sunkbd.h" -#include "machine/timekpr.h" +#include "cpu/sparc/sparc.h" +#include "machine/bankdev.h" +#include "machine/ncr5390.h" #include "machine/nscsi_bus.h" #include "machine/nscsi_cd.h" #include "machine/nscsi_hd.h" -#include "machine/ncr5390.h" +#include "machine/nvram.h" +#include "machine/ram.h" +#include "machine/timekpr.h" +#include "machine/timekpr.h" #include "machine/upd765.h" -#include "formats/pc_dsk.h" -#include "formats/mfi_dsk.h" +#include "machine/z80scc.h" #include "debug/debugcon.h" #include "debug/debugcmd.h" #include "debugger.h" +#include "screen.h" + +#include "formats/mfi_dsk.h" +#include "formats/pc_dsk.h" + #define SUN4_LOG_FCODES (0) diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index 6d8b54d0bae..b264d29e3fe 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -26,6 +26,7 @@ Year + Game By Board Hardware #include "emu.h" #include "includes/suna16.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/3526intf.h" @@ -33,6 +34,8 @@ Year + Game By Board Hardware #include "sound/dac.h" #include "sound/volt_reg.h" #include "sound/ym2151.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index d63735cf2e5..0e315115ea6 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -37,6 +37,7 @@ Notes: #include "emu.h" #include "includes/suna8.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/2203intf.h" @@ -44,6 +45,8 @@ Notes: #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #define SUNA8_MASTER_CLOCK XTAL_24MHz diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp index d4d4ff92354..7ccf5109050 100644 --- a/src/mame/drivers/supbtime.cpp +++ b/src/mame/drivers/supbtime.cpp @@ -23,11 +23,15 @@ down hardware (it doesn't write any good sound data btw, mostly zeros). ***************************************************************************/ #include "emu.h" +#include "includes/supbtime.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/supbtime.h" +#include "screen.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp index 7db30ec1645..26e37acb32a 100644 --- a/src/mame/drivers/supdrapo.cpp +++ b/src/mame/drivers/supdrapo.cpp @@ -57,16 +57,18 @@ ************************************************************************/ - -#define MASTER_CLOCK XTAL_12MHz -#define CPU_CLOCK MASTER_CLOCK/4 /* guess */ -#define SND_CLOCK MASTER_CLOCK/8 /* guess */ - #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_12MHz +#define CPU_CLOCK MASTER_CLOCK/4 /* guess */ +#define SND_CLOCK MASTER_CLOCK/8 /* guess */ class supdrapo_state : public driver_device { diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index a32ea281822..258aec04a26 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -28,6 +28,8 @@ All clock timing comes from crystal 1 #include "sound/okim6295.h" #include "video/bufsprite.h" #include "video/tigeroad_spr.h" +#include "screen.h" +#include "speaker.h" class supduck_state : public driver_device { diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index 0461b300d48..820c9c5b866 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -217,9 +217,14 @@ ToDo: ***********************************************************************************************************/ #include "emu.h" -#include "super80.lh" #include "includes/super80.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "super80.lh" + #define MASTER_CLOCK (XTAL_12MHz) #define PIXEL_CLOCK (MASTER_CLOCK/2) diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp index f0b49df03dc..436646a5880 100644 --- a/src/mame/drivers/superchs.cpp +++ b/src/mame/drivers/superchs.cpp @@ -41,13 +41,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/superchs.h" +#include "audio/taito_en.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "sound/es5506.h" -#include "audio/taito_en.h" +#include "screen.h" #include "superchs.lh" -#include "includes/superchs.h" /*********************************************************************/ diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp index 044661c4805..359110b6645 100644 --- a/src/mame/drivers/supercrd.cpp +++ b/src/mame/drivers/supercrd.cpp @@ -160,15 +160,17 @@ ***********************************************************************************/ - -#define MASTER_CLOCK XTAL_16MHz - #include "emu.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "video/mc6845.h" #include "machine/nvram.h" +#include "video/mc6845.h" #include "video/resnet.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_16MHz class supercrd_state : public driver_device diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp index 2b3dbb856ef..7705d317aee 100644 --- a/src/mame/drivers/superdq.cpp +++ b/src/mame/drivers/superdq.cpp @@ -19,14 +19,16 @@ *************************************************************************/ -#define MASTER_CLOCK 20000000 - - #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/sn76496.h" #include "machine/ldv1000.h" +#include "sound/sn76496.h" #include "video/resnet.h" +#include "speaker.h" + + +#define MASTER_CLOCK 20000000 + class superdq_state : public driver_device { diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index 56d9aa54adb..28a1d9e275c 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -172,6 +172,8 @@ code at z80:0093: #include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" SAMPLES_START_CB_MEMBER(hotsmash_state::pbillian_sh_start) diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp index c2b53c2c369..0a8e6388689 100644 --- a/src/mame/drivers/supertnk.cpp +++ b/src/mame/drivers/supertnk.cpp @@ -101,6 +101,8 @@ CRU lines: #include "cpu/tms9900/tms9980a.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp index b0df93878b7..45480e8454a 100644 --- a/src/mame/drivers/superwng.cpp +++ b/src/mame/drivers/superwng.cpp @@ -35,6 +35,9 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index 2459e7229aa..db7f74e59e1 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -80,6 +80,7 @@ DEBUG TRICKS: #include "cpu/m6502/m6502.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" #define SOUNDCPU_BOOT_HACK (1) diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index ec9fb798a3a..beec8b8ea15 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -24,9 +24,12 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "machine/i8255.h" #include "sound/2203intf.h" #include "sound/msm5205.h" -#include "machine/i8255.h" +#include "screen.h" +#include "speaker.h" + class suprgolf_state : public driver_device { diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp index 89c53cda56c..5ec6b24f543 100644 --- a/src/mame/drivers/suprloco.cpp +++ b/src/mame/drivers/suprloco.cpp @@ -22,10 +22,13 @@ Sega PCB 834-5137 ******************************************************************************/ #include "emu.h" +#include "includes/suprloco.h" + #include "cpu/z80/z80.h" #include "machine/segacrpt_device.h" #include "sound/sn76496.h" -#include "includes/suprloco.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(suprloco_state::soundport_w) { diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 34a3e480ce2..b92e5264bcd 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -147,12 +147,16 @@ NEP-16 */ #include "emu.h" -#include "sound/ymz280b.h" -#include "cpu/sh2/sh2.h" -#include "machine/nvram.h" -#include "video/sknsspr.h" #include "includes/suprnova.h" + +#include "cpu/sh2/sh2.h" #include "machine/msm6242.h" +#include "machine/nvram.h" +#include "sound/ymz280b.h" + +#include "screen.h" +#include "speaker.h" + static void hit_calc_orig(uint16_t p, uint16_t s, uint16_t org, uint16_t *l, uint16_t *r) { diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp index c6693b017c4..2bda5fe3f9c 100644 --- a/src/mame/drivers/suprridr.cpp +++ b/src/mame/drivers/suprridr.cpp @@ -84,10 +84,13 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/suprridr.h" + +#include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" void suprridr_state::machine_start() diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp index b6e2a0e700a..be6890306b1 100644 --- a/src/mame/drivers/suprslam.cpp +++ b/src/mame/drivers/suprslam.cpp @@ -83,12 +83,13 @@ EB26IC73.BIN 27C240 / Main Program ******************************************************************************/ #include "emu.h" +#include "includes/suprslam.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" - #include "sound/2610intf.h" -#include "video/vsystem_spr.h" -#include "includes/suprslam.h" +#include "screen.h" +#include "speaker.h" /*** SOUND *******************************************************************/ diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index df8cce02f09..2e226c1fa96 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -11,11 +11,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/surpratk.h" +#include "includes/konamipt.h" + #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/surpratk.h" +#include "speaker.h" + INTERRUPT_GEN_MEMBER(surpratk_state::surpratk_interrupt) { diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp index 4c45c6aed9e..e0ba58e1387 100644 --- a/src/mame/drivers/sv8000.cpp +++ b/src/mame/drivers/sv8000.cpp @@ -32,7 +32,9 @@ Looking at the code of the cartridges it seems there is: #include "video/mc6847.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" class sv8000_state : public driver_device { diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp index 6708230dfbc..ddd80d54f46 100644 --- a/src/mame/drivers/svi318.cpp +++ b/src/mame/drivers/svi318.cpp @@ -8,20 +8,25 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" -#include "machine/ram.h" +#include "imagedev/cassette.h" #include "machine/bankdev.h" #include "machine/i8255.h" -#include "video/tms9928a.h" +#include "machine/ram.h" #include "sound/ay8910.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" -#include "imagedev/cassette.h" -#include "formats/svi_cas.h" -#include "bus/generic/slot.h" +#include "video/tms9928a.h" + #include "bus/generic/carts.h" +#include "bus/generic/slot.h" #include "bus/svi3x8/expander/expander.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/svi_cas.h" //************************************************************************** diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index 1ac8bbe699c..bcd5649eb4a 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -8,10 +8,13 @@ #include "emu.h" #include "includes/svision.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "svision.lh" + #define MAKE8_RGB32(red3, green3, blue2) ( ( (red3)<<(16+5)) | ( (green3)<<(8+5)) | ( (blue2)<<(0+6)) ) #define MAKE9_RGB32(red3, green3, blue3) ( ( (red3)<<(16+5)) | ( (green3)<<(8+5)) | ( (blue3)<<(0+5)) ) #define MAKE12_RGB32(red4, green4, blue4) ( ( (red4)<<(16+4)) | ((green4)<<(8+4)) | ((blue4)<<(0+4)) ) diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index adb16ad8f1a..f67d892c818 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -16,10 +16,14 @@ #include "cpu/lc8670/lc8670.h" #include "imagedev/snapquik.h" #include "machine/intelfsh.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #include "svmu.lh" + #define PIXEL_SIZE 7 #define PIXEL_DISTANCE 1 diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index a1da07c95e8..733e921accb 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -253,6 +253,17 @@ ToDo: ****************************************************************************/ +// Includes +#include "emu.h" +#include "bus/centronics/ctronics.h" +#include "cpu/m68000/m68000.h" +#include "machine/6522via.h" +#include "machine/6850acia.h" +#include "machine/clock.h" +#include "sound/spkrdev.h" +#include "screen.h" + + // Defines #undef DEBUG_GA2OPR_W @@ -284,15 +295,6 @@ ToDo: #define DEBUG_SWYFT_VIA1 1 -// Includes -#include "emu.h" -#include "cpu/m68000/m68000.h" -#include "machine/clock.h" -#include "machine/6850acia.h" -#include "machine/6522via.h" -#include "sound/speaker.h" -#include "bus/centronics/ctronics.h" - class swyft_state : public driver_device { public: diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp index e2fffd8ee1c..a6674507be4 100644 --- a/src/mame/drivers/sym1.cpp +++ b/src/mame/drivers/sym1.cpp @@ -7,12 +7,16 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/m6502/m6502.h" -#include "machine/ram.h" -#include "sound/speaker.h" -#include "machine/mos6530n.h" #include "machine/6522via.h" #include "machine/74145.h" +#include "machine/mos6530n.h" +#include "machine/ram.h" +#include "sound/spkrdev.h" + +#include "speaker.h" + #include "sym1.lh" diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp index 3e263d74931..ecfb5e89659 100644 --- a/src/mame/drivers/sys2900.cpp +++ b/src/mame/drivers/sys2900.cpp @@ -37,6 +37,7 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class sys2900_state : public driver_device diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index 2322dd300f4..47f623c9bbe 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -218,12 +218,14 @@ seem to have access to. ******************************************************************************/ #include "emu.h" +#include "includes/system1.h" + #include "cpu/mcs51/mcs51.h" #include "machine/z80pio.h" #include "machine/segacrpt_device.h" #include "machine/mc8123.h" #include "sound/sn76496.h" -#include "includes/system1.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_20MHz diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 0f7bc02bb07..79d7e6376fc 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -89,15 +89,18 @@ */ #include "emu.h" -#include "cpu/z80/z80.h" -#include "includes/segaipt.h" #include "includes/system16.h" +#include "includes/segaipt.h" + #include "cpu/m68000/m68000.h" -#include "sound/ym2151.h" -#include "sound/2612intf.h" -#include "sound/rf5c68.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" +#include "sound/2612intf.h" #include "sound/okim6295.h" +#include "sound/rf5c68.h" +#include "sound/ym2151.h" +#include "speaker.h" + #define SHADOW_COLORS_MULTIPLIER 3 diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp index cc593cfd304..a8878e6c30c 100644 --- a/src/mame/drivers/tagteam.cpp +++ b/src/mame/drivers/tagteam.cpp @@ -28,10 +28,14 @@ TODO: #include "emu.h" #include "includes/tagteam.h" + #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + void tagteam_state::machine_start() { diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp index ffee9010381..521f4a6c53d 100644 --- a/src/mame/drivers/tail2nos.cpp +++ b/src/mame/drivers/tail2nos.cpp @@ -11,10 +11,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/tail2nos.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/2608intf.h" -#include "includes/tail2nos.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(tail2nos_state::sound_command_w) diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index 1bd08268b01..51158caca72 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -42,16 +42,20 @@ ToDO: *****************************************************************************************/ #include "emu.h" +#include "machine/genpin.h" + #include "cpu/i8085/i8085.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/votrax.h" #include "sound/volt_reg.h" +#include "speaker.h" + #include "taito.lh" + class taito_state : public genpin_class { public: diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 93c3fe445f7..e97878c4030 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -179,15 +179,18 @@ TODO! ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/taito_b.h" #include "includes/taitoipt.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/eepromser.h" -#include "audio/taitosnd.h" #include "sound/2203intf.h" #include "sound/2610intf.h" #include "sound/okim6295.h" -#include "includes/taito_b.h" +#include "speaker.h" + WRITE8_MEMBER(taitob_state::bankswitch_w) { diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index fdcbb3e53d9..3d4975db4f0 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -265,15 +265,18 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/taito_f2.h" #include "includes/taitoipt.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/watchdog.h" -#include "audio/taitosnd.h" -#include "includes/taito_f2.h" #include "sound/2203intf.h" #include "sound/2610intf.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" /********************************************************** diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index 0606a1e194f..dab3f71648f 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -33,12 +33,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/taito_f3.h" +#include "audio/taito_en.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" -#include "includes/taito_f3.h" #include "sound/es5506.h" -#include "audio/taito_en.h" #include "sound/okim6295.h" +#include "speaker.h" /******************************************************************************/ diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp index 9a2c1932e7e..ad53e20112c 100644 --- a/src/mame/drivers/taito_h.cpp +++ b/src/mame/drivers/taito_h.cpp @@ -143,12 +143,15 @@ some kind of zoom table? ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" +#include "includes/taito_h.h" #include "includes/taitoipt.h" #include "audio/taitosnd.h" + +#include "cpu/z80/z80.h" +#include "cpu/m68000/m68000.h" #include "sound/2610intf.h" -#include "includes/taito_h.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 268e222bdc3..85f7cb46a9f 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -65,6 +65,9 @@ puzznici note #include "sound/2610intf.h" #include "sound/msm5205.h" +#include "screen.h" +#include "speaker.h" + namespace { diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp index 224d5f3b746..4ad121ed8ef 100644 --- a/src/mame/drivers/taito_o.cpp +++ b/src/mame/drivers/taito_o.cpp @@ -31,10 +31,14 @@ TODO: *****************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/taito_o.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/taito_o.h" +#include "screen.h" +#include "speaker.h" + static const int clear_hack = 1; diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 215a125b58a..0ebaead9075 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -316,14 +316,18 @@ Stephh's notes (based on the game M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" +#include "includes/taito_x.h" #include "includes/taitoipt.h" #include "audio/taitosnd.h" -#include "includes/taito_x.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/cchip.h" #include "sound/2610intf.h" #include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" + READ16_MEMBER(taitox_state::superman_dsw_input_r) { diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index fa5da0a08a9..3b60793109f 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -968,17 +968,21 @@ DIP switches are not verified ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/taito_z.h" #include "includes/taitoipt.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/2610intf.h" #include "sound/flt_vol.h" -#include "includes/taito_z.h" +#include "screen.h" +#include "speaker.h" #include "contcirc.lh" #include "dblaxle.lh" + void taitoz_state::parse_cpu_control( ) { /* bit 0 enables cpu B */ diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp index 98d84752749..4bc372f2ab1 100644 --- a/src/mame/drivers/taitoair.cpp +++ b/src/mame/drivers/taitoair.cpp @@ -195,13 +195,16 @@ perhaps? The two writes seem to take only two values. */ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" -#include "includes/taitoipt.h" #include "includes/taitoair.h" +#include "includes/taitoipt.h" #include "audio/taitosnd.h" + +#include "cpu/m68000/m68000.h" #include "cpu/tms32025/tms32025.h" +#include "cpu/z80/z80.h" #include "sound/2610intf.h" +#include "speaker.h" + /*********************************************************** MEMORY handlers diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp index 17f9344ae1f..12d18960d51 100644 --- a/src/mame/drivers/taitogn.cpp +++ b/src/mame/drivers/taitogn.cpp @@ -331,17 +331,21 @@ Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with #include "emu.h" #include "audio/taito_zm.h" + #include "cpu/psx/psx.h" #include "machine/at28c16.h" #include "machine/ataflash.h" #include "machine/bankdev.h" +#include "machine/cat702.h" #include "machine/intelfsh.h" #include "machine/mb3773.h" +#include "machine/ram.h" #include "machine/rf5c296.h" -#include "machine/cat702.h" #include "machine/znmcu.h" #include "sound/spu.h" #include "video/psx.h" +#include "speaker.h" + class taitogn_state : public driver_device { diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp index 8e857650e7f..6a21eacf9dd 100644 --- a/src/mame/drivers/taitojc.cpp +++ b/src/mame/drivers/taitojc.cpp @@ -377,15 +377,18 @@ Notes: */ #include "emu.h" -#include "cpu/tms32051/tms32051.h" +#include "includes/taitojc.h" +#include "audio/taito_en.h" + #include "cpu/m68000/m68000.h" #include "cpu/mc68hc11/mc68hc11.h" +#include "cpu/tms32051/tms32051.h" +#include "machine/eepromser.h" +#include "machine/taitoio.h" #include "sound/es5506.h" #include "sound/okim6295.h" -#include "machine/taitoio.h" -#include "machine/eepromser.h" -#include "audio/taito_en.h" -#include "includes/taitojc.h" + +#include "speaker.h" #include "dendego.lh" diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp index 1e3d6578a6a..1f5e1fcf184 100644 --- a/src/mame/drivers/taitosj.cpp +++ b/src/mame/drivers/taitosj.cpp @@ -167,8 +167,10 @@ TODO: #include "emu.h" #include "includes/taitosj.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" +#include "speaker.h" WRITE8_MEMBER(taitosj_state::taitosj_sndnmi_msk_w) diff --git a/src/mame/drivers/taitotx.cpp b/src/mame/drivers/taitotx.cpp index 864d9e0e830..1aff70a3115 100644 --- a/src/mame/drivers/taitotx.cpp +++ b/src/mame/drivers/taitotx.cpp @@ -118,6 +118,7 @@ #include "emu.h" #include "cpu/i386/i386.h" +#include "screen.h" class taito_type_x_state : public driver_device { diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp index 0e9268ee8ad..d04f99726c3 100644 --- a/src/mame/drivers/taitowlf.cpp +++ b/src/mame/drivers/taitowlf.cpp @@ -25,9 +25,10 @@ clocks 50MHz (near 3DFX) and 14.31818MHz (near RAMDAC) */ +#include "emu.h" + #define ENABLE_VGA 0 -#include "emu.h" #include "cpu/i386/i386.h" #include "machine/lpci.h" #include "machine/pcshare.h" @@ -35,6 +36,7 @@ clocks 50MHz (near 3DFX) and 14.31818MHz (near RAMDAC) #if ENABLE_VGA #include "video/pc_vga.h" #endif +#include "screen.h" class taitowlf_state : public pcat_base_state { diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp index 36dd47e59e7..9a654fe3ecd 100644 --- a/src/mame/drivers/tamag1.cpp +++ b/src/mame/drivers/tamag1.cpp @@ -10,7 +10,9 @@ #include "emu.h" #include "cpu/e0c6200/e0c6s46.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" #include "tama.lh" diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index fbd4aadea87..8a14fd740de 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -62,7 +62,7 @@ void t1000_mb_device::device_start() { } -const device_type T1000_MOTHERBOARD = &device_creator; +const device_type T1000_MOTHERBOARD = device_creator; class tandy1000_state : public driver_device { diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index f99b575f520..5220fb7e5a9 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -24,8 +24,12 @@ #include "emu.h" #include "includes/tandy2k.h" + #include "machine/pckeybrd.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #define LOG 1 diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp index bd1f7938c70..790f5432829 100644 --- a/src/mame/drivers/tank8.cpp +++ b/src/mame/drivers/tank8.cpp @@ -7,9 +7,10 @@ Atari Tank 8 driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6800/m6800.h" #include "includes/tank8.h" +#include "cpu/m6800/m6800.h" #include "sound/discrete.h" +#include "speaker.h" diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp index 9db62e1f5e2..fd53ec06a7e 100644 --- a/src/mame/drivers/tankbatt.cpp +++ b/src/mame/drivers/tankbatt.cpp @@ -59,9 +59,12 @@ Known issues: ***************************************************************************/ #include "emu.h" +#include "includes/tankbatt.h" + #include "cpu/m6502/m6502.h" #include "sound/samples.h" -#include "includes/tankbatt.h" +#include "screen.h" +#include "speaker.h" void tankbatt_state::machine_start() diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp index 3624a255485..cefbaf8934a 100644 --- a/src/mame/drivers/tankbust.cpp +++ b/src/mame/drivers/tankbust.cpp @@ -19,9 +19,12 @@ To do: ***************************************************************************/ #include "emu.h" +#include "includes/tankbust.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "includes/tankbust.h" +#include "screen.h" +#include "speaker.h" void tankbust_state::machine_start() diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp index a0b9c4c572f..3f5fa1c362b 100644 --- a/src/mame/drivers/taotaido.cpp +++ b/src/mame/drivers/taotaido.cpp @@ -63,14 +63,15 @@ zooming might be wrong ***************************************************************************/ - - #include "emu.h" +#include "includes/taotaido.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "sound/2610intf.h" -#include "video/vsystem_spr.h" -#include "includes/taotaido.h" +#include "screen.h" +#include "speaker.h" + #define TAOTAIDO_SHOW_ALL_INPUTS 0 diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp index b09c1bd95be..2ded0fe499c 100644 --- a/src/mame/drivers/tapatune.cpp +++ b/src/mame/drivers/tapatune.cpp @@ -41,6 +41,8 @@ #include "machine/ticket.h" #include "sound/bsmt2000.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index 81d810a1211..6a82c2b6c5f 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -11,9 +11,13 @@ The DS5002FP has 32KB undumped gameplay code making the game unplayable :_( ***************************************************************************/ #include "emu.h" +#include "includes/targeth.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "includes/targeth.h" +#include "screen.h" +#include "speaker.h" + static const gfx_layout tilelayout16_0x080000 = { diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index cdaf9f6ed0d..c2a0e534600 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -28,6 +28,8 @@ #include "video/k054156_k054157_k056832.h" #include "video/k055555.h" #include "machine/eepromser.h" +#include "speaker.h" + #define CUSTOM_DRAW 1 diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 7d500174c79..768128b7a86 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -140,11 +140,14 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/nec/nec.h" #include "includes/tatsumi.h" -#include "sound/ym2151.h" + +#include "cpu/nec/nec.h" +#include "cpu/z80/z80.h" #include "machine/nvram.h" +#include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" #include "roundup5.lh" diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp index 290f03c17d5..cf981a9cdff 100644 --- a/src/mame/drivers/tattack.cpp +++ b/src/mame/drivers/tattack.cpp @@ -46,6 +46,7 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class tattack_state : public driver_device diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index e6198db3d6f..2de47b6e89c 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -49,18 +49,23 @@ Z - more scan lines per row (cursor is bigger) ****************************************************************************/ #include "emu.h" + #include "bus/rs232/rs232.h" #include "cpu/m6809/m6809.h" +#include "imagedev/cassette.h" #include "machine/6821pia.h" #include "machine/6840ptm.h" #include "machine/6850acia.h" #include "machine/clock.h" -#include "video/mc6845.h" #include "machine/keyboard.h" -#include "imagedev/cassette.h" #include "machine/wd_fdc.h" -#include "sound/wave.h" #include "sound/beep.h" +#include "sound/wave.h" +#include "video/mc6845.h" + +#include "screen.h" +#include "speaker.h" + #include "tavernie.lh" class tavernie_state : public driver_device diff --git a/src/mame/drivers/taxidriv.cpp b/src/mame/drivers/taxidriv.cpp index b811df8009c..b36d5dcfae8 100644 --- a/src/mame/drivers/taxidriv.cpp +++ b/src/mame/drivers/taxidriv.cpp @@ -12,10 +12,13 @@ OTHER: 5 * M5L8255AP ***************************************************************************/ #include "emu.h" +#include "includes/taxidriv.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "includes/taxidriv.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" void taxidriv_state::machine_start() diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index 5e372595193..f7ff8bbbb5c 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -15,10 +15,14 @@ Might be some priority glitches ***/ #include "emu.h" +#include "includes/tbowl.h" + #include "cpu/z80/z80.h" #include "sound/3812intf.h" + #include "rendlay.h" -#include "includes/tbowl.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(tbowl_state::coincounter_w) diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp index 6530eb6bd51..4a6a51709cf 100644 --- a/src/mame/drivers/tceptor.cpp +++ b/src/mame/drivers/tceptor.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/tceptor.h" + #include "cpu/m6502/m65c02.h" #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6800.h" @@ -19,8 +20,11 @@ #include "sound/ym2151.h" #include "sound/volt_reg.h" #include "rendlay.h" +#include "speaker.h" + #include "tceptor2.lh" + /*******************************************************************/ diff --git a/src/mame/drivers/tcl.cpp b/src/mame/drivers/tcl.cpp index 88e43458c33..9b64631fb91 100644 --- a/src/mame/drivers/tcl.cpp +++ b/src/mame/drivers/tcl.cpp @@ -44,6 +44,8 @@ Notes: #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class tcl_state : public driver_device diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp index ef0756c4a34..1e7d5c4f792 100644 --- a/src/mame/drivers/tdv2324.cpp +++ b/src/mame/drivers/tdv2324.cpp @@ -102,8 +102,11 @@ #include "emu.h" #include "includes/tdv2324.h" + +#include "screen.h" #include "softlist.h" + READ8_MEMBER( tdv2324_state::tdv2324_main_io_30 ) { return 0xff; diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp index a45c5022e99..c305b936050 100644 --- a/src/mame/drivers/tec1.cpp +++ b/src/mame/drivers/tec1.cpp @@ -73,9 +73,11 @@ JMON ToDo: #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/speaker.h" -#include "sound/wave.h" #include "imagedev/cassette.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "speaker.h" + #include "tec1.lh" diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp index c9f11f0d603..f06f31e2d96 100644 --- a/src/mame/drivers/tecmo.cpp +++ b/src/mame/drivers/tecmo.cpp @@ -55,11 +55,13 @@ f80b ???? ***************************************************************************/ #include "emu.h" +#include "includes/tecmo.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/3526intf.h" #include "sound/3812intf.h" -#include "includes/tecmo.h" +#include "speaker.h" WRITE8_MEMBER(tecmo_state::bankswitch_w) diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp index 6a34ed999a9..86b2cb1ba9c 100644 --- a/src/mame/drivers/tecmo16.cpp +++ b/src/mame/drivers/tecmo16.cpp @@ -26,11 +26,14 @@ Notes: ******************************************************************************/ #include "emu.h" +#include "includes/tecmo16.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/tecmo16.h" +#include "sound/ym2151.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp index 7dbac955c3d..6c9e5a7c88d 100644 --- a/src/mame/drivers/tecmosys.cpp +++ b/src/mame/drivers/tecmosys.cpp @@ -183,12 +183,14 @@ ae500w07.ad1 - M6295 Samples (23c4001) */ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/tecmosys.h" + #include "cpu/m68000/m68000.h" -#include "sound/okim6295.h" +#include "cpu/z80/z80.h" #include "sound/262intf.h" +#include "sound/okim6295.h" #include "sound/ymz280b.h" +#include "speaker.h" // It looks like this needs a synch between z80 and 68k ??? See z80:006A-0091 diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index c97671a8230..9c6eba4621d 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -89,11 +89,15 @@ TO DO : */ #include "emu.h" +#include "includes/tehkanwc.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" + #include "gridiron.lh" -#include "includes/tehkanwc.h" void tehkanwc_state::machine_start() diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp index 2ce8c38351f..b15cb5f7d13 100644 --- a/src/mame/drivers/tek405x.cpp +++ b/src/mame/drivers/tek405x.cpp @@ -27,7 +27,10 @@ #include "emu.h" #include "includes/tek405x.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + //************************************************************************** // MACROS / CONSTANTS diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp index 407658e0280..4aa5f7239c8 100644 --- a/src/mame/drivers/tek410x.cpp +++ b/src/mame/drivers/tek410x.cpp @@ -19,6 +19,8 @@ #include "emu.h" #include "cpu/i86/i186.h" +#include "screen.h" + #define I80188_TAG "i80188" #define SCREEN_TAG "screen" diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp index baa1b57970e..f1bb716e35e 100644 --- a/src/mame/drivers/tek440x.cpp +++ b/src/mame/drivers/tek440x.cpp @@ -42,11 +42,13 @@ ***************************************************************************/ #include "emu.h" +#include "bus/rs232/rs232.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "machine/mos6551.h" // debug tty #include "machine/mc146818.h" -#include "bus/rs232/rs232.h" +#include "screen.h" + class tek440x_state : public driver_device { diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp index f6216f97b05..facbf3e3fb7 100644 --- a/src/mame/drivers/tekxp33x.cpp +++ b/src/mame/drivers/tekxp33x.cpp @@ -38,6 +38,8 @@ #include "emu.h" #include "cpu/mips/r3000.h" #include "cpu/tms34010/tms34010.h" +#include "screen.h" + #define SCREEN_TAG "screen" diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp index 52aa2e411b1..23b38702f8d 100644 --- a/src/mame/drivers/tempest.cpp +++ b/src/mame/drivers/tempest.cpp @@ -283,6 +283,8 @@ Note: Roms for Tempest Analog Vector-Generator PCB Assembly A037383-03 or A03738 #include "video/vector.h" #include "machine/atari_vg.h" #include "sound/pokey.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK (XTAL_12_096MHz) diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp index d16ac63cb67..b97a4e95311 100644 --- a/src/mame/drivers/terak.cpp +++ b/src/mame/drivers/terak.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "cpu/t11/t11.h" +#include "screen.h" + class terak_state : public driver_device { diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index c9e2b6bd0dc..61e3a7ee078 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -82,12 +82,15 @@ AT-2 #include "emu.h" #include "includes/terracre.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/3526intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" static const uint16_t mAmazonProtData[] = diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index 379f92d38d9..ec9e10ff388 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -49,14 +49,19 @@ stepstag: ***************************************************************************/ #include "emu.h" +#include "includes/tetrisp2.h" + #include "cpu/m68000/m68000.h" +#include "machine/nvram.h" +#include "machine/watchdog.h" #include "sound/okim6295.h" #include "sound/ymz280b.h" + +#include "screen.h" +#include "speaker.h" + #include "rocknms.lh" #include "stepstag.lh" -#include "includes/tetrisp2.h" -#include "machine/nvram.h" -#include "machine/watchdog.h" /*************************************************************************** diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp index 9aeefbe5e37..fcc5d569b8c 100644 --- a/src/mame/drivers/tgtpanic.cpp +++ b/src/mame/drivers/tgtpanic.cpp @@ -13,6 +13,7 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class tgtpanic_state : public driver_device diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index e427dd226e8..1ce7ade58b6 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -13,12 +13,15 @@ */ #include "emu.h" +#include "cpu/cop400/cop400.h" #include "cpu/z80/z80.h" #include "machine/ldstub.h" #include "machine/ldv1000.h" -#include "cpu/cop400/cop400.h" +#include "speaker.h" + #include "thayers.lh" + #define LOG 0 struct ssi263_t diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index 02273c20b22..de0200ec9b9 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -30,10 +30,13 @@ #include "emu.h" #include "cpu/m6502/r65c02.h" -#include "video/seta001.h" -#include "sound/ay8910.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "sound/ay8910.h" +#include "video/seta001.h" +#include "screen.h" +#include "speaker.h" + class thedealr_state : public driver_device { @@ -44,7 +47,7 @@ public: m_subcpu(*this, "subcpu"), m_seta001(*this, "spritegen"), m_palette(*this, "palette") - { } + { } // devices required_device m_maincpu; diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp index 4917798bcc6..512d4c902b8 100644 --- a/src/mame/drivers/thedeep.cpp +++ b/src/mame/drivers/thedeep.cpp @@ -27,11 +27,15 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/thedeep.h" + #include "cpu/m6502/m65c02.h" #include "cpu/mcs51/mcs51.h" -#include "includes/thedeep.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" +#include "screen.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp index 28ebfb31d38..bd8fe558636 100644 --- a/src/mame/drivers/thepit.cpp +++ b/src/mame/drivers/thepit.cpp @@ -153,11 +153,14 @@ Player 2 and Player 1 share the same controls ! ***************************************************************************/ #include "emu.h" +#include "includes/thepit.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/thepit.h" +#include "screen.h" +#include "speaker.h" #define MASTER_CLOCK (18432000) diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp index 071e348f26a..b7adbd56750 100644 --- a/src/mame/drivers/thief.cpp +++ b/src/mame/drivers/thief.cpp @@ -25,10 +25,14 @@ Credits: ******************************************************************/ #include "emu.h" +#include "includes/thief.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/samples.h" -#include "includes/thief.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_20MHz diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index d08ae214174..8d91433c861 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -78,17 +78,21 @@ #include "emu.h" #include "includes/thomson.h" + #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" -#include "formats/cd90_640_dsk.h" -#include "formats/basicdsk.h" #include "imagedev/flopdrv.h" #include "machine/6821pia.h" #include "machine/clock.h" #include "machine/ram.h" #include "machine/wd_fdc.h" #include "sound/volt_reg.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/basicdsk.h" +#include "formats/cd90_640_dsk.h" /**************************** common *******************************/ diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index dff9d269dc4..a231bc3ce3e 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -16,10 +16,13 @@ pf: but some gameplay bugs - sprite positioning is incorrect, no enemies, jump a ***************************************************************************/ #include "emu.h" +#include "includes/thoop2.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "sound/okim6295.h" -#include "includes/thoop2.h" +#include "screen.h" +#include "speaker.h" void thoop2_state::machine_start() diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp index 2521c4e20f1..da56a785aa1 100644 --- a/src/mame/drivers/thunderj.cpp +++ b/src/mame/drivers/thunderj.cpp @@ -37,10 +37,11 @@ #include "emu.h" +#include "includes/thunderj.h" #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "machine/atarigen.h" -#include "includes/thunderj.h" +#include "speaker.h" diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp index eb6557969fa..b384a0b94cc 100644 --- a/src/mame/drivers/thunderx.cpp +++ b/src/mame/drivers/thunderx.cpp @@ -33,13 +33,15 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/thunderx.h" +#include "includes/konamipt.h" + #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/ym2151.h" -#include "includes/konamipt.h" -#include "includes/thunderx.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(thunderx_state::vblank_interrupt) diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp index 37dfbd6007d..5ebfadb696f 100644 --- a/src/mame/drivers/ti630.cpp +++ b/src/mame/drivers/ti630.cpp @@ -38,6 +38,8 @@ It means we probably would have to emulate a modem device for it to treat commun #include "cpu/mcs51/mcs51.h" #include "video/hd44780.h" #include "rendlay.h" +#include "screen.h" + class ti630_state : public driver_device { diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp index 7ae4ab0b623..1c0f4ae2f41 100644 --- a/src/mame/drivers/ti74.cpp +++ b/src/mame/drivers/ti74.cpp @@ -70,11 +70,12 @@ ***************************************************************************/ #include "emu.h" +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" #include "cpu/tms7000/tms7000.h" -#include "video/hd44780.h" #include "machine/nvram.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" +#include "video/hd44780.h" +#include "screen.h" #include "softlist.h" #include "ti74.lh" diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp index 179149c33d6..fc8aab49ddf 100644 --- a/src/mame/drivers/ti85.cpp +++ b/src/mame/drivers/ti85.cpp @@ -202,10 +202,14 @@ TI-86 ports: ***************************************************************************/ #include "emu.h" +#include "includes/ti85.h" + #include "cpu/z80/z80.h" #include "imagedev/snapquik.h" -#include "includes/ti85.h" #include "machine/bankdev.h" +#include "screen.h" +#include "speaker.h" + /* port i/o functions */ diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp index 34eabdebae4..9d79267f0bc 100644 --- a/src/mame/drivers/ti89.cpp +++ b/src/mame/drivers/ti89.cpp @@ -17,13 +17,15 @@ ****************************************************************************/ - #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/ti89.h" -#include "machine/nvram.h" + +#include "cpu/m68000/m68000.h" #include "machine/intelfsh.h" +#include "machine/nvram.h" #include "rendlay.h" +#include "screen.h" + uint8_t ti68k_state::keypad_r() { diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index 82415956646..b38df29fea5 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -82,6 +82,7 @@ would just have taken three extra tracks on the main board and a OR gate in an A #include "emu.h" #include "machine/tms9901.h" #include "cpu/tms9900/tms9995.h" +#include "screen.h" class ti99_2_state : public driver_device { diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp index 00a4c3d779c..b846210f33c 100644 --- a/src/mame/drivers/ti99_4p.cpp +++ b/src/mame/drivers/ti99_4p.cpp @@ -116,14 +116,14 @@ *****************************************************************************/ #include "emu.h" +#include "bus/ti99_peb/peribox.h" +#include "bus/ti99x/joyport.h" #include "cpu/tms9900/tms9900.h" -#include "sound/wave.h" - -#include "machine/tms9901.h" #include "imagedev/cassette.h" -#include "bus/ti99x/joyport.h" -#include "bus/ti99_peb/peribox.h" #include "machine/ram.h" +#include "machine/tms9901.h" +#include "sound/wave.h" +#include "speaker.h" #define TMS9901_TAG "tms9901" #define SGCPU_TAG "sgcpu" diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index 68960c44902..d42e0a4261f 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -52,9 +52,11 @@ #include "bus/ti99x/joyport.h" #include "bus/ti99_peb/peribox.h" -#include "softlist.h" #include "machine/ram.h" +#include "softlist.h" +#include "speaker.h" + // Debugging #define TRACE_READY 0 #define TRACE_INTERRUPTS 0 diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp index 8cc915b6a64..5d5c52888ca 100644 --- a/src/mame/drivers/ti99_8.cpp +++ b/src/mame/drivers/ti99_8.cpp @@ -188,6 +188,7 @@ Known Issues (MZ, 2010-11-07) #include "bus/ti99_peb/peribox.h" #include "softlist.h" +#include "speaker.h" // Debugging #define TRACE_READY 0 diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp index 2af637a0f19..69ee80cead6 100644 --- a/src/mame/drivers/tiamc1.cpp +++ b/src/mame/drivers/tiamc1.cpp @@ -117,15 +117,20 @@ */ +#include "emu.h" +#include "includes/tiamc1.h" + +#include "cpu/i8085/i8085.h" +#include "machine/i8255.h" +#include "screen.h" +#include "speaker.h" + + #define MASTER_CLOCK (15750000) #define CPU_CLOCK (MASTER_CLOCK / 9) #define SND_CLOCK (MASTER_CLOCK / 9) #define PIXEL_CLOCK (MASTER_CLOCK / 3) -#include "emu.h" -#include "cpu/i8085/i8085.h" -#include "machine/i8255.h" -#include "includes/tiamc1.h" void tiamc1_state::machine_reset() { diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp index 40f27fce750..d7f52c1cf0b 100644 --- a/src/mame/drivers/ticalc1x.cpp +++ b/src/mame/drivers/ticalc1x.cpp @@ -21,6 +21,8 @@ #include "emu.h" #include "includes/hh_tms1k.h" +#include "speaker.h" + // internal artwork #include "cmulti8.lh" #include "dataman.lh" diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index e4305c097da..9cc0f2afb4a 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -23,12 +23,14 @@ #include "emu.h" #include "cpu/tms34010/tms34010.h" +#include "machine/nvram.h" #include "machine/ticket.h" -#include "video/tlc34076.h" +#include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/okim6295.h" -#include "machine/nvram.h" -#include "machine/watchdog.h" +#include "video/tlc34076.h" +#include "screen.h" +#include "speaker.h" class tickee_state : public driver_device diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index 25164f91ad0..2d949670cbd 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -47,6 +47,8 @@ single plane board. #include "emu.h" #include "includes/tigeroad.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp index 6104269de12..91149a0d020 100644 --- a/src/mame/drivers/tiki100.cpp +++ b/src/mame/drivers/tiki100.cpp @@ -24,7 +24,11 @@ #include "emu.h" #include "includes/tiki100.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + /* Memory Banking */ diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp index 90b46467809..2e95c9de071 100644 --- a/src/mame/drivers/tim011.cpp +++ b/src/mame/drivers/tim011.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "cpu/z180/z180.h" #include "machine/upd765.h" +#include "screen.h" #define FDC9266_TAG "u43" diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp index 382293af94c..5e80ae8c2f5 100644 --- a/src/mame/drivers/tim100.cpp +++ b/src/mame/drivers/tim100.cpp @@ -17,11 +17,12 @@ Notes: *******************************************************************************************************/ #include "emu.h" +#include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" +#include "machine/clock.h" #include "machine/i8251.h" #include "video/i8275.h" -#include "bus/rs232/rs232.h" -#include "machine/clock.h" +#include "screen.h" class tim100_state : public driver_device { diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp index 0f130df9535..06147a0c131 100644 --- a/src/mame/drivers/timelimt.cpp +++ b/src/mame/drivers/timelimt.cpp @@ -14,11 +14,15 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/timelimt.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/timelimt.h" +#include "screen.h" +#include "speaker.h" + /***************************************************************************/ diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index c1f189bde95..5c782878f65 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -48,13 +48,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/timeplt.h" +#include "includes/konamipt.h" +#include "audio/timeplt.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" -#include "includes/konamipt.h" -#include "audio/timeplt.h" #include "sound/ay8910.h" -#include "includes/timeplt.h" #define MASTER_CLOCK XTAL_18_432MHz diff --git a/src/mame/drivers/timetrv.cpp b/src/mame/drivers/timetrv.cpp index 044392c7e4c..b1e966c2bcc 100644 --- a/src/mame/drivers/timetrv.cpp +++ b/src/mame/drivers/timetrv.cpp @@ -27,6 +27,7 @@ CPU is an Intel 80188 #include "emu.h" #include "cpu/i86/i186.h" +#include "screen.h" class timetrv_state : public driver_device diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index 84cec4ee21d..01478571d19 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -147,20 +147,19 @@ http://www.z88forever.org.uk/zxplus3e/ *******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" #include "includes/spectrum.h" #include "includes/spec128.h" #include "includes/timex.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" -#include "sound/speaker.h" -#include "sound/ay8910.h" -#include "formats/tzx_cas.h" -#include "machine/spec_snqk.h" + +#include "cpu/z80/z80.h" #include "machine/beta.h" -#include "machine/ram.h" +#include "sound/ay8910.h" + +#include "screen.h" #include "softlist.h" -#include "machine/spec_snqk.h" + +#include "formats/tzx_cas.h" + /****************************************************************************************************/ /* TS2048 specific functions */ diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index ab986c29b12..5209008003c 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -400,11 +400,14 @@ K28 modules: #include "emu.h" #include "includes/hh_tms1k.h" -#include "sound/tms5110.h" -#include "machine/tms6100.h" -#include "bus/generic/slot.h" + #include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "machine/tms6100.h" +#include "sound/tms5110.h" + #include "softlist.h" +#include "speaker.h" // internal artwork #include "k28m2.lh" diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp index 00a2f492878..f4c212e1d2e 100644 --- a/src/mame/drivers/tispellb.cpp +++ b/src/mame/drivers/tispellb.cpp @@ -58,7 +58,9 @@ #include "emu.h" #include "includes/hh_tms1k.h" + #include "machine/tms6100.h" +#include "speaker.h" // internal artwork #include "spellb.lh" diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp index f83f6058186..3ce8c5593dd 100644 --- a/src/mame/drivers/tk2000.cpp +++ b/src/mame/drivers/tk2000.cpp @@ -15,14 +15,20 @@ ************************************************************************/ #include "emu.h" +#include "video/apple2.h" + +#include "cpu/m6502/m6502.h" +#include "imagedev/cassette.h" +#include "imagedev/flopdrv.h" #include "machine/bankdev.h" #include "machine/ram.h" -#include "sound/speaker.h" -#include "imagedev/flopdrv.h" -#include "imagedev/cassette.h" +#include "sound/spkrdev.h" + +#include "screen.h" +#include "speaker.h" + #include "formats/ap2_dsk.h" -#include "cpu/m6502/m6502.h" -#include "video/apple2.h" + #define A2_CPU_TAG "maincpu" #define A2_BUS_TAG "a2bus" diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp index d19c135dfa1..0677dc63199 100644 --- a/src/mame/drivers/tk80bs.cpp +++ b/src/mame/drivers/tk80bs.cpp @@ -26,6 +26,7 @@ TODO: #include "cpu/i8085/i8085.h" #include "machine/i8255.h" #include "machine/keyboard.h" +#include "screen.h" class tk80bs_state : public driver_device { diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index 801503c2521..0aca5c2a070 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -60,16 +60,21 @@ ******************************************************************************************/ #include "emu.h" + #include "cpu/tms9900/tms9980a.h" +#include "imagedev/cassette.h" #include "machine/tms9901.h" #include "machine/tms9902.h" -#include "video/tms9928a.h" -#include "imagedev/cassette.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" +#include "video/tms9928a.h" + +#include "speaker.h" + #include "tm990189.lh" #include "tm990189v.lh" + #define TMS9901_0_TAG "tms9901_usr" #define TMS9901_1_TAG "tms9901_sys" @@ -77,15 +82,16 @@ class tm990189_state : public driver_device { public: tm990189_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_tms9980a(*this, "maincpu"), - m_speaker(*this, "speaker"), - m_cass(*this, "cassette"), - m_tms9918(*this, "tms9918" ), - m_maincpu(*this, "maincpu"), - m_cassette(*this, "cassette"), - m_tms9901_usr(*this, TMS9901_0_TAG), - m_tms9901_sys(*this, TMS9901_1_TAG) { } + : driver_device(mconfig, type, tag) + , m_tms9980a(*this, "maincpu") + , m_speaker(*this, "speaker") + , m_cass(*this, "cassette") + , m_tms9918(*this, "tms9918") + , m_maincpu(*this, "maincpu") + , m_cassette(*this, "cassette") + , m_tms9901_usr(*this, TMS9901_0_TAG) + , m_tms9901_sys(*this, TMS9901_1_TAG) + { } required_device m_tms9980a; required_device m_speaker; @@ -451,7 +457,7 @@ protected: virtual void device_start() override; }; -const device_type TM990_189_RS232 = &device_creator; +const device_type TM990_189_RS232 = device_creator; tm990_189_rs232_image_device::tm990_189_rs232_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TM990_189_RS232, "TM990/189 RS232 port", tag, owner, clock, "tm990_189_rs232_image", __FILE__), diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp index f007a779173..6df266eda4f 100644 --- a/src/mame/drivers/tmaster.cpp +++ b/src/mame/drivers/tmaster.cpp @@ -99,6 +99,8 @@ Chips: #include "machine/watchdog.h" #include "sound/okim6295.h" #include "video/cesblit.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index 432aadc2e86..ccb0e237740 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -115,7 +115,10 @@ Notes: #include "emu.h" #include "includes/tmc1800.h" + #include "sound/beep.h" +#include "speaker.h" + /* Read/Write Handlers */ diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp index 81185e93e83..d59a58bb42a 100644 --- a/src/mame/drivers/tmc2000e.cpp +++ b/src/mame/drivers/tmc2000e.cpp @@ -34,6 +34,9 @@ #include "emu.h" #include "includes/tmc2000e.h" +#include "speaker.h" + + /* Read/Write Handlers */ READ8_MEMBER( tmc2000e_state::vismac_r ) diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index 3040b47386b..76f82812c5a 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -34,6 +34,8 @@ #include "machine/eepromser.h" #include "sound/i5000.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class tmmjprd_state : public driver_device diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index 0c4dfafd384..117680078a3 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -54,18 +54,21 @@ Updates: ***************************************************************************/ #include "emu.h" -#include "machine/eepromser.h" +#include "includes/tmnt.h" +#include "includes/konamipt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "sound/ym2151.h" -#include "sound/okim6295.h" -#include "sound/samples.h" -#include "sound/k054539.h" +#include "machine/eepromser.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/tmnt.h" -#include "includes/konamipt.h" +#include "sound/k054539.h" +#include "sound/okim6295.h" +#include "sound/samples.h" +#include "sound/ym2151.h" +#include "speaker.h" + READ16_MEMBER(tmnt_state::k052109_word_noA12_r) { diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp index a131ca4444f..13beb6fadc4 100644 --- a/src/mame/drivers/tmspoker.cpp +++ b/src/mame/drivers/tmspoker.cpp @@ -207,13 +207,14 @@ *******************************************************************************/ - -#define MASTER_CLOCK XTAL_6MHz /* confirmed */ - #include "emu.h" #include "cpu/tms9900/tms9980a.h" -#include "video/mc6845.h" #include "sound/sn76477.h" +#include "video/mc6845.h" +#include "screen.h" + + +#define MASTER_CLOCK XTAL_6MHz /* confirmed */ class tmspoker_state : public driver_device diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index bb901a80f6b..d0a7352cd0f 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -623,10 +623,14 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06 #include "emu.h" #include "includes/tnzs.h" #include "includes/taitoipt.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/volt_reg.h" #include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" + SAMPLES_START_CB_MEMBER(kageki_state::init_samples) { diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index cd89cc365c2..6fea2e940d4 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -606,12 +606,14 @@ Stephh's and AWJ's notes (based on the games M68000 and Z80 code and some tests) ***************************************************************************/ #include "emu.h" +#include "includes/toaplan1.h" +#include "includes/toaplipt.h" + +#include "cpu/tms32010/tms32010.h" #include "cpu/z80/z80.h" #include "cpu/z180/z180.h" -#include "cpu/tms32010/tms32010.h" -#include "includes/toaplipt.h" -#include "includes/toaplan1.h" #include "sound/3812intf.h" +#include "speaker.h" /***************************** 68000 Memory Map *****************************/ diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index ce751775a85..ff16f261af6 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -362,15 +362,18 @@ To reset the NVRAM in Othello Derby, hold P1 Button 1 down while booting. #include "emu.h" +#include "includes/toaplan2.h" +#include "includes/toaplipt.h" + #include "cpu/nec/v25.h" #include "cpu/z80/z80.h" #include "cpu/z180/z180.h" #include "machine/nvram.h" -#include "sound/ym2151.h" #include "sound/3812intf.h" +#include "sound/ym2151.h" #include "sound/ymz280b.h" -#include "includes/toaplan2.h" -#include "includes/toaplipt.h" +#include "speaker.h" + #define UNICODE_YEN "\xC2\xA5" #define PWRKICK_HOPPER_PULSE 50 // time between hopper pulses in milliseconds (probably wrong) diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index e2b56a2adc5..0a6b57de6b5 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -93,12 +93,15 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/toki.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/toki.h" +#include "speaker.h" + WRITE16_MEMBER(toki_state::tokib_soundcommand_w) { diff --git a/src/mame/drivers/tokyocop.cpp b/src/mame/drivers/tokyocop.cpp index 79858537a41..0261cbe55e8 100644 --- a/src/mame/drivers/tokyocop.cpp +++ b/src/mame/drivers/tokyocop.cpp @@ -24,6 +24,7 @@ I/O Board with Altera Flex EPF15K50EQC240-3 #include "emu.h" #include "cpu/i386/i386.h" +#include "screen.h" class tokyocop_state : public driver_device diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp index 76dd559079d..dfd9ebf8ee5 100644 --- a/src/mame/drivers/tomcat.cpp +++ b/src/mame/drivers/tomcat.cpp @@ -37,6 +37,8 @@ #include "sound/pokey.h" #include "sound/tms5220.h" #include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp index c972ac250d2..efef89e5df8 100644 --- a/src/mame/drivers/tonton.cpp +++ b/src/mame/drivers/tonton.cpp @@ -25,10 +25,11 @@ #include "emu.h" #include "cpu/z80/z80.h" +#include "machine/nvram.h" +#include "machine/ticket.h" #include "sound/ay8910.h" #include "video/v9938.h" -#include "machine/ticket.h" -#include "machine/nvram.h" +#include "speaker.h" class tonton_state : public driver_device { diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp index d35126e0033..e039a1d0434 100644 --- a/src/mame/drivers/toobin.cpp +++ b/src/mame/drivers/toobin.cpp @@ -20,10 +20,11 @@ #include "emu.h" +#include "includes/toobin.h" #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "machine/atarigen.h" -#include "includes/toobin.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_32MHz diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index 66c587d1aba..a7c1abdd37f 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -156,16 +156,20 @@ From JP manual ***************************************************************************/ #include "emu.h" +#include "includes/topspeed.h" +#include "includes/taitoipt.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "machine/z80ctc.h" #include "machine/taitoio.h" -#include "audio/taitosnd.h" -#include "sound/ym2151.h" -#include "sound/msm5205.h" +#include "machine/z80ctc.h" #include "sound/flt_vol.h" -#include "includes/taitoipt.h" -#include "includes/topspeed.h" +#include "sound/msm5205.h" +#include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" + #include "topspeed.lh" diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index a94bdc0928d..a60cb5ede94 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -46,6 +46,8 @@ TODO: #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "sound/sn76477.h" +#include "screen.h" +#include "speaker.h" class toratora_state : public driver_device diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp index a826ebacafe..2c7d91f6c7d 100644 --- a/src/mame/drivers/tourtabl.cpp +++ b/src/mame/drivers/tourtabl.cpp @@ -14,6 +14,8 @@ #include "machine/watchdog.h" #include "sound/tiaintf.h" #include "video/tia.h" +#include "screen.h" +#include "speaker.h" class tourtabl_state : public driver_device diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 3966a61b465..a4090b82075 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -283,25 +283,31 @@ http://blog.system11.org/?p=1943 ****************************************************************************/ #include "emu.h" -#include "cpu/i8085/i8085.h" #include "machine/pcecommn.h" + +#include "cpu/h6280/h6280.h" +#include "cpu/i8085/i8085.h" #include "video/huc6260.h" #include "video/huc6270.h" -#include "cpu/h6280/h6280.h" #include "sound/c6280.h" #include "machine/i8155.h" -#include "softlist.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + + class tourvision_state : public pce_common_state { public: tourvision_state(const machine_config &mconfig, device_type type, const char *tag) - : pce_common_state(mconfig, type, tag), - m_subcpu(*this, "subcpu"), - m_cart(*this, "cartslot") - { } + : pce_common_state(mconfig, type, tag) + , m_subcpu(*this, "subcpu") + , m_cart(*this, "cartslot") + { } DECLARE_WRITE8_MEMBER(tourvision_8085_d000_w); DECLARE_WRITE8_MEMBER(tourvision_i8155_a_w); diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp index 015f3e01dc7..0a2bfe6af56 100644 --- a/src/mame/drivers/toypop.cpp +++ b/src/mame/drivers/toypop.cpp @@ -26,10 +26,14 @@ ****************************************/ #include "emu.h" +#include "machine/namcoio.h" + #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" -#include "machine/namcoio.h" #include "sound/namco.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_6_144MHz diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp index cd1cb1905ff..3cf5ee6bd08 100644 --- a/src/mame/drivers/tp84.cpp +++ b/src/mame/drivers/tp84.cpp @@ -64,15 +64,17 @@ C004 76489 #4 trigger ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/tp84.h" +#include "includes/konamipt.h" + #include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" -#include "sound/sn76496.h" #include "sound/flt_rc.h" -#include "includes/konamipt.h" -#include "includes/tp84.h" +#include "sound/sn76496.h" +#include "speaker.h" void tp84_state::machine_start() diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index a9220cf428f..b749b17c225 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -183,8 +183,9 @@ MAIN BOARD: #include "emu.h" #include "includes/trackfld.h" #include "includes/konamipt.h" -#include "audio/trackfld.h" #include "audio/hyprolyb.h" +#include "audio/trackfld.h" + #include "cpu/z80/z80.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" @@ -193,6 +194,9 @@ MAIN BOARD: #include "machine/watchdog.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_18_432MHz #define SOUND_CLOCK XTAL_14_31818MHz diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp index a77efc57efe..97874e0b349 100644 --- a/src/mame/drivers/tranz330.cpp +++ b/src/mame/drivers/tranz330.cpp @@ -22,8 +22,12 @@ #include "emu.h" #include "includes/tranz330.h" + +#include "speaker.h" + #include "tranz330.lh" + static void construct_address_map_tranz330_mem(address_map &map) { map.configure(AS_PROGRAM, 8); diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp index 2ea0f82f416..9eb1c058c42 100644 --- a/src/mame/drivers/travrusa.cpp +++ b/src/mame/drivers/travrusa.cpp @@ -51,9 +51,11 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines) ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "audio/irem.h" #include "includes/travrusa.h" +#include "audio/irem.h" + +#include "cpu/z80/z80.h" +#include "screen.h" static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, travrusa_state ) diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp index b71dc1319a7..236a86267ef 100644 --- a/src/mame/drivers/triforce.cpp +++ b/src/mame/drivers/triforce.cpp @@ -445,6 +445,8 @@ Notes: #include "emu.h" #include "cpu/powerpc/ppc.h" #include "machine/naomigd.h" +#include "screen.h" + class triforce_state : public driver_device { diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp index 9f6e1d288c1..a165bc4183a 100644 --- a/src/mame/drivers/triplhnt.cpp +++ b/src/mame/drivers/triplhnt.cpp @@ -9,9 +9,10 @@ Atari Triple Hunt Driver ***************************************************************************/ #include "emu.h" +#include "includes/triplhnt.h" #include "cpu/m6800/m6800.h" #include "machine/nvram.h" -#include "includes/triplhnt.h" +#include "speaker.h" diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index c62f0b23407..f3c3e3aa306 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -137,6 +137,10 @@ There don't seem to be any JV1 boot disks for Model III/4. #include "emu.h" #include "includes/trs80.h" + +#include "screen.h" +#include "speaker.h" + #include "formats/trs80_dsk.h" #include "formats/dmk_dsk.h" diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index 11d41386006..2231afb6e36 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -23,8 +23,11 @@ #include "emu.h" #include "includes/trs80m2.h" + +#include "screen.h" #include "softlist.h" + #define KEYBOARD_TAG "keyboard" diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp index ad9fb1fd633..24dee6ebd60 100644 --- a/src/mame/drivers/truco.cpp +++ b/src/mame/drivers/truco.cpp @@ -201,16 +201,20 @@ *******************************************************************************************************/ -#define MASTER_CLOCK XTAL_12MHz /* confirmed */ -#define CPU_CLOCK (MASTER_CLOCK/16) /* guess */ -#define CRTC_CLOCK (MASTER_CLOCK/8) /* guess */ - #include "emu.h" #include "includes/truco.h" + #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" #include "sound/volt_reg.h" #include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_12MHz /* confirmed */ +#define CPU_CLOCK (MASTER_CLOCK/16) /* guess */ +#define CRTC_CLOCK (MASTER_CLOCK/8) /* guess */ /******************************************* * Read/Write Handlers * diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp index 5eb979039b8..6f3d262d701 100644 --- a/src/mame/drivers/trucocl.cpp +++ b/src/mame/drivers/trucocl.cpp @@ -36,9 +36,13 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets. #include "emu.h" #include "includes/trucocl.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(trucocl_state::irq_enable_w) { diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp index 7e630d1717e..ea31e27cf16 100644 --- a/src/mame/drivers/trvmadns.cpp +++ b/src/mame/drivers/trvmadns.cpp @@ -90,6 +90,8 @@ Technology = NMOS #include "emu.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class trvmadns_state : public driver_device diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp index 7d32adce5a8..0c5eb0f4544 100644 --- a/src/mame/drivers/trvquest.cpp +++ b/src/mame/drivers/trvquest.cpp @@ -37,11 +37,14 @@ Notes: */ #include "emu.h" +#include "includes/gameplan.h" + #include "cpu/m6809/m6809.h" #include "machine/6522via.h" -#include "sound/ay8910.h" -#include "includes/gameplan.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "speaker.h" + READ8_MEMBER(gameplan_state::trvquest_question_r) { diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp index 5ff8ea95660..24887efe4cb 100644 --- a/src/mame/drivers/tryout.cpp +++ b/src/mame/drivers/tryout.cpp @@ -20,9 +20,13 @@ $208 strikes count ****************************************************************/ #include "emu.h" +#include "includes/tryout.h" + #include "cpu/m6502/m6502.h" #include "sound/2203intf.h" -#include "includes/tryout.h" +#include "screen.h" +#include "speaker.h" + WRITE8_MEMBER(tryout_state::nmi_ack_w) { diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 70b30542dfa..db2260f484e 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -56,6 +56,7 @@ PAGE SEL bit in PORT0 set to 1: #include "machine/wd_fdc.h" #include "machine/z80sti.h" #include "video/mc6845.h" +#include "screen.h" class ts803_state : public driver_device diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 29d88419a53..391f10a70c6 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -40,10 +40,13 @@ the "America" release. #include "emu.h" #include "includes/tsamurai.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" void tsamurai_state::machine_start() diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp index 0d328891f0d..5478f1f124b 100644 --- a/src/mame/drivers/tsispch.cpp +++ b/src/mame/drivers/tsispch.cpp @@ -112,6 +112,7 @@ /* Core includes */ #include "emu.h" #include "includes/tsispch.h" + #include "cpu/i86/i86.h" #include "cpu/upd7725/upd7725.h" #include "machine/i8251.h" @@ -119,6 +120,8 @@ #include "machine/terminal.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + // defines #define DEBUG_PARAM 1 diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp index 89faf78435c..0581ac6ddb9 100644 --- a/src/mame/drivers/ttchamp.cpp +++ b/src/mame/drivers/ttchamp.cpp @@ -68,8 +68,10 @@ we currently simulate this as the PIC is read protected. #include "emu.h" #include "cpu/nec/nec.h" -#include "sound/okim6295.h" #include "machine/nvram.h" +#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class ttchamp_state : public driver_device diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index bedbfe33415..12284ffd479 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -101,12 +101,14 @@ TP-S.1 TP-S.2 TP-S.3 TP-B.1 8212 TP-B.2 TP-B.3 TP-B.4 #include "emu.h" +#include "includes/tubep.h" + #include "cpu/m6800/m6800.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" #include "sound/msm5205.h" -#include "includes/tubep.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index 201dbce16ae..b8d88f8cc84 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -29,6 +29,8 @@ always false - counter was reloaded and incremented before interrupt occurs #include "cpu/m6502/m6502.h" #include "machine/6821pia.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class tugboat_state : public driver_device diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index 3854d8d855d..c800a3e1f25 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -298,6 +298,8 @@ Stephh's notes (based on the games M68000 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/tumbleb.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" @@ -306,7 +308,8 @@ Stephh's notes (based on the games M68000 code and some tests) : #include "sound/ym2151.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/tumbleb.h" +#include "screen.h" +#include "speaker.h" #define TUMBLEP_HACK 0 diff --git a/src/mame/drivers/tumblep.cpp b/src/mame/drivers/tumblep.cpp index 35b9fd46b66..f0d237ede43 100644 --- a/src/mame/drivers/tumblep.cpp +++ b/src/mame/drivers/tumblep.cpp @@ -42,13 +42,16 @@ Stephh's notes (based on the games M68000 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/tumblep.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "machine/decocrpt.h" #include "sound/ym2151.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "includes/tumblep.h" +#include "screen.h" +#include "speaker.h" #define TUMBLEP_HACK 0 diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp index d45840ddc43..38430300be4 100644 --- a/src/mame/drivers/tunhunt.cpp +++ b/src/mame/drivers/tunhunt.cpp @@ -46,9 +46,11 @@ ***************************************************************************/ #include "emu.h" +#include "includes/tunhunt.h" + #include "cpu/m6502/m6502.h" #include "sound/pokey.h" -#include "includes/tunhunt.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp index 8002946d82d..fa8aa2e6f49 100644 --- a/src/mame/drivers/turrett.cpp +++ b/src/mame/drivers/turrett.cpp @@ -9,9 +9,11 @@ ****************************************************************************/ #include "emu.h" +#include "includes/turrett.h" + #include "cpu/mips/r3000.h" #include "machine/ataintf.h" -#include "includes/turrett.h" +#include "speaker.h" @@ -336,7 +338,7 @@ public: } }; -const device_type TURRETT_HARDDISK = &device_creator; +const device_type TURRETT_HARDDISK = device_creator; SLOT_INTERFACE_START(turrett_devices) SLOT_INTERFACE("hdd", TURRETT_HARDDISK) diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp index a00e1e674a7..b32ccde28e3 100644 --- a/src/mame/drivers/tutankhm.cpp +++ b/src/mame/drivers/tutankhm.cpp @@ -51,12 +51,14 @@ ***************************************************************************/ #include "emu.h" +#include "includes/tutankhm.h" +#include "includes/konamipt.h" +#include "audio/timeplt.h" + #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" -#include "includes/konamipt.h" -#include "audio/timeplt.h" -#include "includes/tutankhm.h" +#include "screen.h" /************************************* diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp index 8a87122cd32..838a904207d 100644 --- a/src/mame/drivers/tutor.cpp +++ b/src/mame/drivers/tutor.cpp @@ -169,15 +169,20 @@ A=AMA, P=PRO, these keys don't exist, and so the games cannot be played. *********************************************************************************************************/ #include "emu.h" + #include "cpu/tms9900/tms9995.h" -#include "sound/wave.h" -#include "video/tms9928a.h" #include "imagedev/cassette.h" #include "sound/sn76496.h" +#include "sound/wave.h" +#include "video/tms9928a.h" + #include "bus/centronics/ctronics.h" -#include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/generic/slot.h" + #include "softlist.h" +#include "speaker.h" + class tutor_state : public driver_device { diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp index 60471c5915d..adc6615e63c 100644 --- a/src/mame/drivers/tv910.cpp +++ b/src/mame/drivers/tv910.cpp @@ -21,11 +21,12 @@ ****************************************************************************/ #include "emu.h" +#include "bus/rs232/rs232.h" #include "cpu/m6502/m6502.h" -#include "video/mc6845.h" -#include "machine/mos6551.h" #include "machine/kb3600.h" -#include "bus/rs232/rs232.h" +#include "machine/mos6551.h" +#include "video/mc6845.h" +#include "screen.h" #define ACIA_TAG "acia1" #define CRTC_TAG "crtc" diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp index 93bda1fa95b..cec50bc958c 100644 --- a/src/mame/drivers/tv950.cpp +++ b/src/mame/drivers/tv950.cpp @@ -35,11 +35,12 @@ ****************************************************************************/ #include "emu.h" +#include "bus/rs232/rs232.h" #include "cpu/m6502/m6502.h" -#include "video/mc6845.h" #include "machine/6522via.h" #include "machine/mos6551.h" -#include "bus/rs232/rs232.h" +#include "video/mc6845.h" +#include "screen.h" #define ACIA1_TAG "acia1" #define ACIA2_TAG "acia2" diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp index fc7dd583340..a8f093c087b 100644 --- a/src/mame/drivers/tv990.cpp +++ b/src/mame/drivers/tv990.cpp @@ -30,13 +30,16 @@ ****************************************************************************/ #include "emu.h" +#include "bus/rs232/rs232.h" #include "cpu/m68000/m68000.h" -#include "machine/ins8250.h" #include "machine/8042kbdc.h" -#include "bus/rs232/rs232.h" -#include "machine/pc_lpt.h" +#include "machine/ins8250.h" #include "machine/nvram.h" +#include "machine/pc_lpt.h" #include "sound/beep.h" +#include "screen.h" +#include "speaker.h" + #define UART0_TAG "ns16450_0" #define UART1_TAG "ns16450_1" diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index ad7f22aac7c..1804e78dd04 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -13,21 +13,25 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "video/mc6845.h" -#include "machine/ram.h" #include "audio/tvc.h" -#include "bus/centronics/ctronics.h" + +#include "cpu/z80/z80.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "formats/tvc_cas.h" +#include "machine/ram.h" +#include "video/mc6845.h" -#include "bus/tvc/tvc.h" -#include "bus/tvc/hbf.h" +#include "bus/centronics/ctronics.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/tvc/tvc.h" +#include "bus/tvc/hbf.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/tvc_cas.h" #define TVC_RAM_BANK 1 #define TVC_ROM_BANK 2 diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp index 587be636c36..293d3638621 100644 --- a/src/mame/drivers/tvcapcom.cpp +++ b/src/mame/drivers/tvcapcom.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "cpu/powerpc/ppc.h" +#include "screen.h" class tvcapcom_state : public driver_device { diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp index 7f27b7e16e4..4fee6adf61a 100644 --- a/src/mame/drivers/tvgame.cpp +++ b/src/mame/drivers/tvgame.cpp @@ -13,7 +13,9 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" class tvgame_state : public driver_device diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index 4d6ff2ef0e6..e1844f3d911 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -46,15 +46,16 @@ Known Issues: */ #include "emu.h" +#include "includes/twin16.h" +#include "includes/konamipt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "sound/ym2151.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/twin16.h" -#include "includes/konamipt.h" - +#include "sound/ym2151.h" +#include "speaker.h" #define CPUA_IRQ_ENABLE (m_CPUA_register & 0x20) diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp index 78414fd7a58..d05a5f46654 100644 --- a/src/mame/drivers/twincobr.cpp +++ b/src/mame/drivers/twincobr.cpp @@ -378,14 +378,15 @@ Shark Zame #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/twincobr.h" +#include "includes/toaplipt.h" + #include "cpu/m68000/m68000.h" -#include "cpu/tms32010/tms32010.h" #include "cpu/mcs48/mcs48.h" -#include "includes/toaplipt.h" -#include "includes/twincobr.h" +#include "cpu/tms32010/tms32010.h" +#include "cpu/z80/z80.h" #include "sound/3812intf.h" - +#include "speaker.h" diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index 051608c3d04..f15375168ea 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -238,12 +238,14 @@ Notes: #include "machine/ataintf.h" #include "machine/fdc37c665gt.h" #include "machine/i2cmem.h" +#include "machine/ram.h" #include "machine/rtc65271.h" #include "machine/watchdog.h" #include "machine/x76f041.h" #include "sound/spu.h" #include "sound/cdda.h" #include "sound/rf5c400.h" +#include "speaker.h" class twinkle_state : public driver_device { diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp index e47f6099980..fcfa4544a1a 100644 --- a/src/mame/drivers/twins.cpp +++ b/src/mame/drivers/twins.cpp @@ -65,19 +65,22 @@ this requires the -joystick_contradictory switch on the commandline. #include "sound/ay8910.h" #include "machine/i2cmem.h" #include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + class twins_state : public driver_device { public: twins_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_paletteram(*this, "paletteram"), - m_palette(*this, "palette"), - m_i2cmem(*this, "i2cmem"), - m_spritesinit(0), - m_videorambank(0) - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_paletteram(*this, "paletteram") + , m_palette(*this, "palette") + , m_i2cmem(*this, "i2cmem") + , m_spritesinit(0) + , m_videorambank(0) + { } required_device m_maincpu; optional_shared_ptr m_paletteram; diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp index 13a7844c1d7..98de0440aeb 100644 --- a/src/mame/drivers/tx0.cpp +++ b/src/mame/drivers/tx0.cpp @@ -7,9 +7,11 @@ */ #include "emu.h" -#include "cpu/pdp1/tx0.h" #include "includes/tx0.h" + +#include "cpu/pdp1/tx0.h" #include "video/crt.h" +#include "screen.h" /* @@ -377,7 +379,7 @@ protected: virtual void device_start() override { } }; -const device_type TX0_READTAPE = &device_creator; +const device_type TX0_READTAPE = device_creator; tx0_readtape_image_device::tx0_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TX0_READTAPE, "TX0 Tape Reader", tag, owner, clock, "tx0_readtape_image", __FILE__), @@ -410,7 +412,7 @@ protected: virtual void device_start() override { } }; -const device_type TX0_PUNCHTAPE = &device_creator; +const device_type TX0_PUNCHTAPE = device_creator; tx0_punchtape_image_device::tx0_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TX0_PUNCHTAPE, "TX0 Tape Puncher", tag, owner, clock, "tx0_punchtape_image", __FILE__), @@ -444,7 +446,7 @@ protected: virtual void device_start() override { } }; -const device_type TX0_PRINTER = &device_creator; +const device_type TX0_PRINTER = device_creator; tx0_printer_image_device::tx0_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TX0_PRINTER, "TX0 Typewriter", tag, owner, clock, "tx0_printer_image", __FILE__), @@ -477,7 +479,7 @@ protected: virtual void device_start() override; }; -const device_type TX0_MAGTAPE = &device_creator; +const device_type TX0_MAGTAPE = device_creator; tx0_magtape_image_device::tx0_magtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TX0_MAGTAPE, "TX0 Magnetic Tape", tag, owner, clock, "tx0_magtape_image", __FILE__), diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index 88afc8c75ab..bf397deb3fc 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -41,14 +41,16 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/tx1.h" + #include "cpu/i86/i86.h" +#include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "sound/ay8910.h" -#include "rendlay.h" -#include "includes/tx1.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "sound/ay8910.h" +#include "rendlay.h" +#include "speaker.h" #include "tx1.lh" #include "buggyboy.lh" diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp index 88785d74e40..9a205c149b2 100644 --- a/src/mame/drivers/uapce.cpp +++ b/src/mame/drivers/uapce.cpp @@ -93,14 +93,18 @@ Alien Crush & Pac_Land: dumps made from PC-Engine dumps of JP versions */ #include "emu.h" -#include "cpu/z80/z80.h" +#include "machine/pcecommn.h" + #include "cpu/h6280/h6280.h" +#include "cpu/z80/z80.h" #include "video/huc6260.h" #include "video/huc6270.h" #include "sound/c6280.h" -#include "machine/pcecommn.h" #include "sound/discrete.h" +#include "screen.h" +#include "speaker.h" + class uapce_state : public pce_common_state { diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp index db66b91d523..8154368c50e 100644 --- a/src/mame/drivers/uknc.cpp +++ b/src/mame/drivers/uknc.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "cpu/t11/t11.h" +#include "screen.h" class uknc_state : public driver_device diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp index 77aabf6aa2f..c39b3815374 100644 --- a/src/mame/drivers/ultraman.cpp +++ b/src/mame/drivers/ultraman.cpp @@ -12,12 +12,15 @@ ***************************************************************************/ #include "emu.h" +#include "includes/ultraman.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/ultraman.h" +#include "speaker.h" + WRITE16_MEMBER(ultraman_state::sound_cmd_w) { diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp index b4ee892ce4c..8d8c8731c97 100644 --- a/src/mame/drivers/ultratnk.cpp +++ b/src/mame/drivers/ultratnk.cpp @@ -7,9 +7,10 @@ Atari Ultra Tank driver ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/ultratnk.h" #include "audio/sprint4.h" +#include "cpu/m6502/m6502.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_12_096MHz diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp index f7489774d36..b60b1f91378 100644 --- a/src/mame/drivers/ultrsprt.cpp +++ b/src/mame/drivers/ultrsprt.cpp @@ -9,9 +9,12 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/powerpc/ppc.h" -#include "sound/k054539.h" #include "machine/eepromser.h" +#include "sound/k054539.h" #include "sound/k056800.h" +#include "screen.h" +#include "speaker.h" + class ultrsprt_state : public driver_device { diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp index 936af9d7dd6..772dee4513c 100644 --- a/src/mame/drivers/umipoker.cpp +++ b/src/mame/drivers/umipoker.cpp @@ -16,11 +16,16 @@ ***************************************************************************/ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" +#include "machine/nvram.h" #include "sound/3812intf.h" #include "sound/okim6295.h" -#include "machine/nvram.h" + +#include "screen.h" +#include "speaker.h" + #include "saiyukip.lh" diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp index 2a32dd649ea..21ba3b7481d 100644 --- a/src/mame/drivers/undrfire.cpp +++ b/src/mame/drivers/undrfire.cpp @@ -189,12 +189,14 @@ Board contains only 29 ROMs and not much else. ***************************************************************************/ #include "emu.h" +#include "includes/undrfire.h" +#include "audio/taito_en.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/watchdog.h" #include "sound/es5506.h" -#include "audio/taito_en.h" -#include "includes/undrfire.h" +#include "screen.h" #include "cbombers.lh" diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp index 1a855f83822..abb021d6cf3 100644 --- a/src/mame/drivers/unichamp.cpp +++ b/src/mame/drivers/unichamp.cpp @@ -37,12 +37,17 @@ ************************************************************************/ #include "emu.h" + #include "cpu/cp1610/cp1610.h" #include "video/gic.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + class unichamp_state : public driver_device { diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp index 86500eab80a..0cd5aa02ebd 100644 --- a/src/mame/drivers/unico.cpp +++ b/src/mame/drivers/unico.cpp @@ -25,12 +25,15 @@ Year + Game PCB Notes ***************************************************************************/ #include "emu.h" +#include "includes/unico.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" -#include "includes/unico.h" -#include "sound/ym2151.h" #include "sound/3812intf.h" #include "sound/okim6295.h" +#include "sound/ym2151.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp index b8b6dc62193..00fbd9cdb72 100644 --- a/src/mame/drivers/unior.cpp +++ b/src/mame/drivers/unior.cpp @@ -43,7 +43,9 @@ ToDo: #include "machine/i8255.h" #include "machine/i8257.h" #include "video/i8275.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" class unior_state : public driver_device diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp index ca67999c223..fc141caecb6 100644 --- a/src/mame/drivers/unistar.cpp +++ b/src/mame/drivers/unistar.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class unistar_state : public driver_device @@ -21,7 +22,7 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_p_chargen(*this, "chargen") - { } + { } DECLARE_PALETTE_INIT(unistar); uint32_t screen_update_unistar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index d419f478fc5..88a78da0e6c 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -27,6 +27,7 @@ #include "machine/nvram.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" +#include "screen.h" class univac_state : public driver_device diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp index e1a338113b0..2eb0c34cca2 100644 --- a/src/mame/drivers/unixpc.cpp +++ b/src/mame/drivers/unixpc.cpp @@ -20,6 +20,8 @@ #include "machine/ram.h" #include "machine/wd_fdc.h" #include "machine/bankdev.h" +#include "screen.h" + #include "unixpc.lh" diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index dcb26296c3e..67460abb150 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -22,7 +22,10 @@ TODO: #include "emu.h" #include "cpu/i8085/i8085.h" #include "machine/i8155.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "screen.h" +#include "speaker.h" + class horse_state : public driver_device { diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp index 20a79f6a81f..e82ca3eb601 100644 --- a/src/mame/drivers/upscope.cpp +++ b/src/mame/drivers/upscope.cpp @@ -26,10 +26,11 @@ **********************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "includes/amiga.h" +#include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/amigafdc.h" +#include "speaker.h" class upscope_state : public amiga_state diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp index ab4fd3878ae..055c580a33e 100644 --- a/src/mame/drivers/usgames.cpp +++ b/src/mame/drivers/usgames.cpp @@ -26,11 +26,15 @@ Sound: AY-3-8912 */ #include "emu.h" -#include "cpu/m6809/m6809.h" -#include "video/mc6845.h" -#include "sound/ay8910.h" #include "includes/usgames.h" + +#include "cpu/m6809/m6809.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + void usgames_state::machine_start() { diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index 0a65815816a..2a1ea0fbec1 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -24,10 +24,14 @@ Paste facility was tested but doesn't work, so all code remnants removed. #include "emu.h" #include "includes/ut88.h" + #include "formats/rk_cas.h" #include "softlist.h" #include "ut88mini.lh" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + static GFXDECODE_START( ut88 ) GFXDECODE_ENTRY( "chargen", 0x0000, ut88_charlayout, 0, 1 ) diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp index f857d40c529..1f07f7a1372 100644 --- a/src/mame/drivers/uzebox.cpp +++ b/src/mame/drivers/uzebox.cpp @@ -13,12 +13,17 @@ ****************************************************************************/ #include "emu.h" + #include "cpu/avr8/avr8.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "bus/snes_ctrl/ctrl.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" // overclocked to 8 * NTSC burst frequency #define MASTER_CLOCK 28618180 diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index 53772cbbbd6..899640d33d1 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -151,8 +151,12 @@ Notes: #include "emu.h" #include "includes/v1050.h" + #include "bus/rs232/rs232.h" + #include "softlist.h" +#include "speaker.h" + void v1050_state::set_interrupt(int line, int state) { diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index 79ae7acec9b..66540576ac6 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -52,13 +52,16 @@ ToDo: #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" #include "machine/6840ptm.h" -#include "machine/clock.h" -#include "video/mc6845.h" #include "machine/6850acia.h" -#include "machine/mm58274c.h" +#include "machine/clock.h" #include "machine/keyboard.h" -#include "sound/speaker.h" +#include "machine/mm58274c.h" #include "machine/wd_fdc.h" +#include "sound/spkrdev.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + class v6809_state : public driver_device { diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 55cde0286e4..06a5b2abfde 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -61,13 +61,15 @@ TODO: *********************************************************************/ #include "emu.h" -#include "cpu/mcs51/mcs51.h" #include "cpu/e132xs/e132xs.h" +#include "cpu/mcs51/mcs51.h" #include "machine/eepromser.h" #include "machine/nvram.h" +#include "sound/okim6295.h" #include "sound/qs1000.h" #include "sound/ym2151.h" -#include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" class vamphalf_state : public driver_device diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index a62d3f80ae6..ef99c3874ee 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -17,12 +17,16 @@ ***************************************************************************/ #include "emu.h" +#include "includes/vaportra.h" + #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "sound/2203intf.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/vaportra.h" +#include "screen.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp index aab81092505..bc3f7c329ec 100644 --- a/src/mame/drivers/vastar.cpp +++ b/src/mame/drivers/vastar.cpp @@ -103,10 +103,13 @@ Vsync : 60.58hz #include "emu.h" +#include "includes/vastar.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/vastar.h" +#include "screen.h" +#include "speaker.h" void vastar_state::machine_start() diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp index 616a6593f6b..aa933868d46 100644 --- a/src/mame/drivers/vball.cpp +++ b/src/mame/drivers/vball.cpp @@ -85,11 +85,13 @@ VBlank = 58Hz *********************************************************************************************************************/ #include "emu.h" +#include "includes/vball.h" + #include "cpu/m6502/m6502.h" #include "cpu/z80/z80.h" #include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/vball.h" +#include "speaker.h" #define MAIN_CLOCK XTAL_12MHz #define CPU_CLOCK MAIN_CLOCK / 6 diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp index 544a67c8a5d..18d5cc65ecb 100644 --- a/src/mame/drivers/vboy.cpp +++ b/src/mame/drivers/vboy.cpp @@ -27,13 +27,18 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/v810/v810.h" #include "audio/vboy.h" + +#include "cpu/v810/v810.h" #include "bus/vboy/slot.h" #include "bus/vboy/rom.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #include "vboy.lh" + #define READ_BGMAP(bgoffs) m_bgmap[(bgoffs) & 0xffff] #define READ_WORLD(wldoffs) READ_BGMAP((0x1d800 >> 1) + wldoffs) #define READ_COLTAB1(wldoffs) READ_BGMAP((0x1dc00 >> 1) + wldoffs) diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index cbb93613e74..ab4b2c560f0 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -134,6 +134,8 @@ Q-0900^76203F0161063005080E492DCD4890597877103F020E75105A0A0C1E89F4101879 #include "emu.h" #include "includes/vc4000.h" #include "softlist.h" +#include "speaker.h" + READ8_MEMBER( vc4000_state::vc4000_key_r ) { diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp index 84682063c58..b16c1aec187 100644 --- a/src/mame/drivers/vcombat.cpp +++ b/src/mame/drivers/vcombat.cpp @@ -83,14 +83,16 @@ TODO : This is a partially working driver. Most of the memory maps for */ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "cpu/i860/i860.h" +#include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" -#include "video/tlc34076.h" #include "video/mc6845.h" +#include "video/tlc34076.h" #include "rendlay.h" +#include "screen.h" +#include "speaker.h" class vcombat_state : public driver_device diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp index bec44471b92..fd253aa90b6 100644 --- a/src/mame/drivers/vd.cpp +++ b/src/mame/drivers/vd.cpp @@ -17,16 +17,19 @@ #include "emu.h" #include "machine/genpin.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" +#include "speaker.h" + #include "vd.lh" class vd_state : public driver_device { public: vd_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") { } DECLARE_READ8_MEMBER(ack_r); diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp index 8567fa3d3d6..88bbe937128 100644 --- a/src/mame/drivers/vector06.cpp +++ b/src/mame/drivers/vector06.cpp @@ -26,7 +26,9 @@ TODO: #include "emu.h" #include "includes/vector06.h" #include "formats/vector06_dsk.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" /* Address maps */ static ADDRESS_MAP_START(vector06_mem, AS_PROGRAM, 8, vector06_state) diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp index 402f30b27cb..5759a3a6c9f 100644 --- a/src/mame/drivers/vectrex.cpp +++ b/src/mame/drivers/vectrex.cpp @@ -12,13 +12,17 @@ Bruce Tomlin (hardware info) #include "emu.h" #include "includes/vectrex.h" + #include "cpu/m6809/m6809.h" #include "machine/6522via.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/volt_reg.h" #include "video/vector.h" + #include "softlist.h" +#include "speaker.h" + static ADDRESS_MAP_START(vectrex_map, AS_PROGRAM, 8, vectrex_state ) AM_RANGE(0x0000, 0x7fff) AM_NOP // cart area, handled at machine_start diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp index 0626200b647..f07f81b2c6c 100644 --- a/src/mame/drivers/vega.cpp +++ b/src/mame/drivers/vega.cpp @@ -80,6 +80,8 @@ TODO: #include "machine/i8255.h" #include "machine/ins8154.h" #include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" struct vega_obj @@ -102,13 +104,15 @@ class vega_state : public driver_device public: vega_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_i8255(*this, "ppi8255"), - m_ins8154(*this, "ins8154"), - m_ay8910(*this, "ay8910"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") {} + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_i8255(*this, "ppi8255") + , m_ins8154(*this, "ins8154") + , m_ay8910(*this, "ay8910") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + { + } required_device m_maincpu; required_device m_i8255; diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index f0e9e1ade1b..efc1b61154d 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -14,11 +14,13 @@ *********************************************************************/ #include "emu.h" +#include "includes/eolith.h" + #include "cpu/e132xs/e132xs.h" #include "machine/at28c16.h" #include "machine/gen_latch.h" #include "sound/qs1000.h" -#include "includes/eolith.h" +#include "speaker.h" class vegaeo_state : public eolith_state diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 33e7e4cabce..52ed8641791 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -275,14 +275,16 @@ **************************************************************************/ #include "emu.h" +#include "audio/dcs.h" + #include "cpu/adsp2100/adsp2100.h" #include "cpu/mips/mips3.h" -#include "audio/dcs.h" -#include "machine/timekpr.h" #include "machine/idectrl.h" #include "machine/midwayic.h" #include "machine/smc91c9x.h" +#include "machine/timekpr.h" #include "video/voodoo.h" +#include "screen.h" /************************************* diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index 28aae924d76..694faee3bf3 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -89,15 +89,17 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/vendetta.h" +#include "includes/konamipt.h" #include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ +#include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "machine/watchdog.h" #include "sound/ym2151.h" #include "sound/k053260.h" -#include "includes/konamipt.h" -#include "includes/vendetta.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp index ca0a87b71a2..7070aff0c52 100644 --- a/src/mame/drivers/vertigo.cpp +++ b/src/mame/drivers/vertigo.cpp @@ -12,11 +12,13 @@ ***************************************************************************/ #include "emu.h" +#include "includes/vertigo.h" + #include "cpu/m6805/m6805.h" #include "cpu/m68000/m68000.h" #include "machine/pit8253.h" #include "machine/nvram.h" -#include "includes/vertigo.h" +#include "screen.h" diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp index 44d754f7a85..41c73f6d31a 100644 --- a/src/mame/drivers/vg5k.cpp +++ b/src/mame/drivers/vg5k.cpp @@ -49,29 +49,35 @@ #include "emu.h" + #include "cpu/z80/z80.h" -#include "formats/vg5k_cas.h" #include "imagedev/cassette.h" #include "imagedev/printer.h" #include "machine/ram.h" #include "sound/dac.h" -#include "sound/wave.h" #include "sound/volt_reg.h" +#include "sound/wave.h" #include "video/ef9345.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/vg5k_cas.h" + class vg5k_state : public driver_device { public: vg5k_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ef9345(*this, "ef9345"), - m_dac(*this, "dac"), - m_printer(*this, "printer"), - m_cassette(*this, "cassette"), - m_ram(*this, RAM_TAG) - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ef9345(*this, "ef9345") + , m_dac(*this, "dac") + , m_printer(*this, "printer") + , m_cassette(*this, "cassette") + , m_ram(*this, RAM_TAG) + { } required_device m_maincpu; required_device m_ef9345; diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 872307109ab..7e540c62ec1 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -4,30 +4,33 @@ // A "virtual" driver to play vgm files // Use with mame vgmplay -bitb file.vgm -#include - #include "emu.h" -#include "debugger.h" + #include "imagedev/bitbngr.h" -#include "cpu/m6502/n2a03.h" #include "cpu/h6280/h6280.h" -#include "sound/2612intf.h" -#include "sound/ym2151.h" -#include "sound/ym2413.h" +#include "cpu/m6502/n2a03.h" #include "sound/2203intf.h" +#include "sound/2612intf.h" #include "sound/3526intf.h" #include "sound/3812intf.h" #include "sound/ay8910.h" +#include "sound/c352.h" #include "sound/c6280.h" -#include "sound/sn76496.h" +#include "sound/gb.h" #include "sound/k053260.h" -#include "sound/segapcm.h" #include "sound/multipcm.h" -#include "sound/gb.h" -#include "sound/pokey.h" -#include "sound/c352.h" #include "sound/okim6295.h" +#include "sound/pokey.h" +#include "sound/segapcm.h" +#include "sound/sn76496.h" +#include "sound/ym2151.h" +#include "sound/ym2413.h" + +#include "debugger.h" +#include "speaker.h" + +#include #define AS_IO16 AS_1 #define MCFG_CPU_IO16_MAP MCFG_CPU_DATA_MAP @@ -125,7 +128,7 @@ private: void blocks_clear(); }; -const device_type VGMPLAY = &device_creator; +const device_type VGMPLAY = device_creator; class vgmplay_state : public driver_device { diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp index e2540ebd8e7..b6a207cf2b7 100644 --- a/src/mame/drivers/vic10.cpp +++ b/src/mame/drivers/vic10.cpp @@ -10,7 +10,9 @@ */ #include "emu.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "bus/pet/cass.h" #include "bus/vic10/exp.h" #include "bus/vcs_ctrl/ctrl.h" diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index 22e5f0462a1..67a3547188a 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -10,7 +10,9 @@ */ #include "emu.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" #include "bus/cbmiec/cbmiec.h" #include "bus/pet/cass.h" #include "bus/vcs_ctrl/ctrl.h" diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index a6a2d6a64a5..a4a1910b3c1 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -52,8 +52,6 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/i8085/i8085.h" #include "includes/vicdual.h" #include "audio/carnival.h" #include "audio/depthch.h" @@ -61,6 +59,10 @@ #include "audio/pulsar.h" #include "audio/vicdual.h" +#include "cpu/i8085/i8085.h" +#include "cpu/z80/z80.h" +#include "speaker.h" + #include "depthch.lh" diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp index 86f2e8c1b32..5b59ebbff2c 100644 --- a/src/mame/drivers/victor9k.cpp +++ b/src/mame/drivers/victor9k.cpp @@ -23,7 +23,6 @@ */ #include "emu.h" -#include "softlist.h" #include "bus/centronics/ctronics.h" #include "bus/ieee488/ieee488.h" #include "bus/rs232/rs232.h" @@ -40,6 +39,9 @@ #include "machine/z80dart.h" #include "sound/hc55516.h" #include "video/mc6845.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" #define I8088_TAG "8l" #define I8253_TAG "13h" diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp index 59782424003..f5a134439c1 100644 --- a/src/mame/drivers/vidbrain.cpp +++ b/src/mame/drivers/vidbrain.cpp @@ -37,9 +37,12 @@ #include "emu.h" #include "includes/vidbrain.h" + #include "machine/rescap.h" #include "sound/volt_reg.h" #include "softlist.h" +#include "speaker.h" + #include "vidbrain.lh" diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 083befd86e5..ed83948190a 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -18,11 +18,14 @@ solarwar *************************************************************************/ #include "emu.h" +#include "includes/videopin.h" + #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" -#include "includes/videopin.h" -#include "videopin.lh" #include "sound/discrete.h" +#include "speaker.h" + +#include "videopin.lh" void videopin_state::update_plunger() diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index 282246b1242..26b0b171ac2 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -273,25 +273,30 @@ **************************************************************************/ -#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */ -#define CPU_CLOCK_ALT (XTAL_8MHz) /* alternative main cpu clock for newer games */ -#define SOUND_CLOCK (XTAL_8MHz) /* sound cpu clock */ -#define VIDEO_CLOCK (XTAL_7.8643MHz) - - #include "emu.h" + #include "cpu/mcs48/mcs48.h" #include "cpu/mcs51/mcs51.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/volt_reg.h" -#include "videopkr.lh" + +#include "screen.h" +#include "speaker.h" + +#include "babydad.lh" +#include "babypkr.lh" #include "blckjack.lh" #include "videocba.lh" #include "videodad.lh" -#include "babypkr.lh" -#include "babydad.lh" +#include "videopkr.lh" + + +#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */ +#define CPU_CLOCK_ALT (XTAL_8MHz) /* alternative main cpu clock for newer games */ +#define SOUND_CLOCK (XTAL_8MHz) /* sound cpu clock */ +#define VIDEO_CLOCK (XTAL_7.8643MHz) class videopkr_state : public driver_device diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 944c5cd1239..cebf0c1a97a 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -24,10 +24,14 @@ Bottom board - M75-B-A (all versions regardless of mask ROM/EPROM) #include "emu.h" #include "includes/vigilant.h" #include "includes/iremipt.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/volt_reg.h" #include "sound/ym2151.h" +#include "screen.h" +#include "speaker.h" + void vigilant_state::machine_start() { diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index 4026b81fa5e..01fcc6b65b0 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -74,14 +74,17 @@ Detailed list of bugs: *******************************************************************************/ #include "emu.h" + #include "cpu/unsp/unsp.h" #include "machine/i2cmem.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" #include "softlist.h" + #define PAGE_ENABLE_MASK 0x0008 #define PAGE_DEPTH_FLAG_MASK 0x3000 diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp index aa8a0653db5..93dbb21c466 100644 --- a/src/mame/drivers/vindictr.cpp +++ b/src/mame/drivers/vindictr.cpp @@ -20,9 +20,11 @@ #include "emu.h" +#include "includes/vindictr.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" -#include "includes/vindictr.h" +#include "speaker.h" diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index 8411fc750ef..a70675f905a 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -221,7 +221,9 @@ Notes: #include "emu.h" #include "includes/vip.h" + #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index 92d6a128102..2ce03887b29 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -348,11 +348,14 @@ some other components. It will be documented at a later date. #include "emu.h" #include "cpu/powerpc/ppc.h" -#include "machine/lpci.h" #include "machine/ataintf.h" #include "machine/idehd.h" +#include "machine/lpci.h" #include "machine/timekpr.h" #include "video/voodoo.h" +#include "screen.h" +#include "speaker.h" + #define VIPER_DEBUG_LOG #define VIPER_DEBUG_EPIC_INTS 0 diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index bedd268d398..719666cbce5 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -2,14 +2,16 @@ // copyright-holders:Carl #include "emu.h" +#include "bus/isa/isa_cards.h" #include "cpu/i86/i286.h" +#include "machine/8042kbdc.h" #include "machine/at.h" #include "sound/262intf.h" #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/pc_vga.h" -#include "bus/isa/isa_cards.h" -#include "machine/8042kbdc.h" +#include "speaker.h" + class vis_audio_device : public device_t, public device_isa16_card_interface @@ -39,7 +41,7 @@ private: emu_timer *m_pcm; }; -const device_type VIS_AUDIO = &device_creator; +const device_type VIS_AUDIO = device_creator; vis_audio_device::vis_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VIS_AUDIO, "vis_pcm", tag, owner, clock, "vis_pcm", __FILE__), @@ -250,7 +252,7 @@ private: uint8_t m_crtc_regs[0x31]; }; -const device_type VIS_VGA = &device_creator; +const device_type VIS_VGA = device_creator; vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : svga_device(mconfig, VIS_VGA, "vis_vga", tag, owner, clock, "vis_vga", __FILE__), diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 43f2c5ebdc0..bf001194069 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -55,7 +55,10 @@ Notes: #include "emu.h" #include "includes/vixen.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp index 19783e644d9..df9b4873af7 100644 --- a/src/mame/drivers/vk100.cpp +++ b/src/mame/drivers/vk100.cpp @@ -125,6 +125,20 @@ This test writes 00 to all the crtc registers and checks to be sure an rst7.5 Not sure exactly what this tests, likely tries firing the vector generator state machine and sees if the GO bit ever finishes and goes back to 0 */ +#include "emu.h" + +#include "bus/rs232/rs232.h" +#include "cpu/i8085/i8085.h" +#include "sound/beep.h" +#include "video/mc6845.h" +#include "machine/com8116.h" +#include "machine/i8251.h" + +#include "screen.h" +#include "speaker.h" + +#include "vk100.lh" + // named timer IDs #define TID_I8251_RX 1 @@ -148,15 +162,6 @@ state machine and sees if the GO bit ever finishes and goes back to 0 // debug state dump for the vector generator #undef DEBUG_VG_STATE -#include "emu.h" -#include "bus/rs232/rs232.h" -#include "cpu/i8085/i8085.h" -#include "sound/beep.h" -#include "video/mc6845.h" -#include "machine/com8116.h" -#include "machine/i8251.h" -#include "vk100.lh" - #define RS232_TAG "rs232" #define COM5016T_TAG "com5016t" diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp index 8fae31892a6..d07c5a66852 100644 --- a/src/mame/drivers/vlc.cpp +++ b/src/mame/drivers/vlc.cpp @@ -123,23 +123,25 @@ nevada TYPE2 : 64 45 51 06 32 02 31 31 */ -#define MASTER_CLOCK XTAL_16MHz -#define MASTER_CPU ((MASTER_CLOCK)/2) // 8mhz -#define SOUND_CLOCK ((MASTER_CLOCK) /8) // 2mhz - -#define VIDEO_CLOCK XTAL_33MHz -#define MC6845_CLOCK ((VIDEO_CLOCK)/4/16) // 0.515625 MHZ - - #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/mc68681.h" +#include "machine/microtch.h" +#include "machine/msm6242.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "video/mc6845.h" #include "sound/ay8910.h" -#include "machine/msm6242.h" -#include "machine/microtch.h" +#include "video/mc6845.h" +#include "screen.h" +#include "speaker.h" + + +#define MASTER_CLOCK XTAL_16MHz +#define MASTER_CPU ((MASTER_CLOCK)/2) // 8mhz +#define SOUND_CLOCK ((MASTER_CLOCK) /8) // 2mhz + +#define VIDEO_CLOCK XTAL_33MHz +#define MC6845_CLOCK ((VIDEO_CLOCK)/4/16) // 0.515625 MHZ /*************************************************************************** diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp index 7e59452db78..39fb13bfbc6 100644 --- a/src/mame/drivers/volfied.cpp +++ b/src/mame/drivers/volfied.cpp @@ -44,18 +44,21 @@ Stephh's notes (based on the game M68000 code and some tests) : ********************************************************************/ -/* Define clocks based on actual OSC on the PCB */ - -#define CPU_CLOCK (XTAL_32MHz / 4) /* 8 MHz clock for 68000 */ -#define SOUND_CPU_CLOCK (XTAL_32MHz / 8) /* 4 MHz clock for Z80 sound CPU */ - #include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" +#include "includes/volfied.h" #include "includes/taitoipt.h" #include "audio/taitosnd.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/volfied.h" +#include "speaker.h" + + +/* Define clocks based on actual OSC on the PCB */ + +#define CPU_CLOCK (XTAL_32MHz / 4) /* 8 MHz clock for 68000 */ +#define SOUND_CPU_CLOCK (XTAL_32MHz / 8) /* 4 MHz clock for Z80 sound CPU */ /*********************************************************** diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp index 680199a9142..fc70577202a 100644 --- a/src/mame/drivers/votrpss.cpp +++ b/src/mame/drivers/votrpss.cpp @@ -69,21 +69,24 @@ Things to be looked at: /* Core includes */ #include "emu.h" + #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" //#include "votrpss.lh" /* Components */ -#include "sound/ay8910.h" -#include "sound/votrax.h" #include "machine/clock.h" +#include "machine/i8251.h" #include "machine/i8255.h" #include "machine/pit8253.h" -#include "machine/i8251.h" +#include "sound/ay8910.h" +#include "sound/votrax.h" /* For testing */ #include "machine/terminal.h" +#include "speaker.h" + #define TERMINAL_TAG "terminal" class votrpss_state : public driver_device diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp index 2d85211429e..c8751fb71af 100644 --- a/src/mame/drivers/votrtnt.cpp +++ b/src/mame/drivers/votrtnt.cpp @@ -38,6 +38,8 @@ #include "machine/6850acia.h" #include "machine/clock.h" #include "sound/votrax.h" +#include "speaker.h" + #include "votrtnt.lh" diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp index 1ffb2a7f987..789465d1bc5 100644 --- a/src/mame/drivers/voyager.cpp +++ b/src/mame/drivers/voyager.cpp @@ -15,14 +15,20 @@ TODO: VIA KT133a chipset support, GeForce 2MX video support, lots of things ;-) *************************************************************************************/ #include "emu.h" + #include "cpu/i386/i386.h" +#include "machine/idectrl.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" -#include "machine/idectrl.h" +#include "machine/pcshare.h" #include "video/pc_vga.h" + #include "bus/isa/trident.h" +#include "screen.h" +#include "speaker.h" + + class voyager_state : public pcat_base_state { public: diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp index 67044a2d8f5..3f3f90e4b8a 100644 --- a/src/mame/drivers/vp101.cpp +++ b/src/mame/drivers/vp101.cpp @@ -18,6 +18,7 @@ #include "emu.h" #include "cpu/mips/mips3.h" #include "machine/ataintf.h" +#include "screen.h" class vp10x_state : public driver_device diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp index 7f217396265..5d72ebd56f9 100644 --- a/src/mame/drivers/vpoker.cpp +++ b/src/mame/drivers/vpoker.cpp @@ -101,6 +101,8 @@ #include "emu.h" #include "cpu/m6809/m6809.h" #include "machine/6840ptm.h" +#include "screen.h" +#include "speaker.h" class vpoker_state : public driver_device diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp index c6d342b9c6b..43b2449fbe2 100644 --- a/src/mame/drivers/vroulet.cpp +++ b/src/mame/drivers/vroulet.cpp @@ -39,8 +39,10 @@ Tomasz Slanina 20050225 #include "emu.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "sound/ay8910.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class vroulet_state : public driver_device diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index af7490da434..0b27c15c664 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -140,11 +140,15 @@ Changes: ***************************************************************************/ #include "emu.h" +#include "includes/vsnes.h" + #include "cpu/m6502/n2a03.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" #include "rendlay.h" -#include "includes/vsnes.h" +#include "screen.h" +#include "speaker.h" + /******************************************************************************/ diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index df93efa2564..bf2a2a09463 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -20,6 +20,7 @@ ****************************************************************************/ #include "emu.h" + #include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" #include "cpu/z80/z80.h" @@ -27,8 +28,12 @@ #include "machine/i8251.h" #include "sound/beep.h" #include "video/vtvideo.h" +#include "screen.h" +#include "speaker.h" + #include "vt100.lh" + #define RS232_TAG "rs232" #define COM5016T_TAG "com5016t" diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp index 7076980954b..266d9115166 100644 --- a/src/mame/drivers/vt220.cpp +++ b/src/mame/drivers/vt220.cpp @@ -14,6 +14,7 @@ #include "emu.h" #include "cpu/mcs51/mcs51.h" #include "machine/ram.h" +#include "screen.h" class vt220_state : public driver_device diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index 9a60e923277..32696fa611f 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -19,12 +19,14 @@ #include "machine/bankdev.h" #include "machine/x2212.h" #include "video/upd7220.h" +#include "screen.h" + #define VERBOSE_DBG 0 /* general debug messages */ #define DBG_LOG(N,M,A) \ do { \ - if(VERBOSE_DBG>=N) \ + if(VERBOSE_DBG>=N) \ { \ logerror("%11.6f at %s: ",machine().time().as_double(),machine().describe_context()); \ logerror A; \ @@ -35,20 +37,22 @@ class vt240_state : public driver_device { public: vt240_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_i8085(*this, "charcpu"), - m_i8251(*this, "i8251"), - m_duart(*this, "duart"), - m_host(*this, "host"), - m_hgdc(*this, "upd7220"), - m_bank(*this, "bank"), - m_nvram(*this, "x2212"), - m_palette(*this, "palette"), - m_rom(*this, "maincpu"), - m_video_ram(*this, "vram"), - m_monitor(*this, "monitor"), - m_lk201(*this, "lk201"){ } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_i8085(*this, "charcpu") + , m_i8251(*this, "i8251") + , m_duart(*this, "duart") + , m_host(*this, "host") + , m_hgdc(*this, "upd7220") + , m_bank(*this, "bank") + , m_nvram(*this, "x2212") + , m_palette(*this, "palette") + , m_rom(*this, "maincpu") + , m_video_ram(*this, "vram") + , m_monitor(*this, "monitor") + , m_lk201(*this, "lk201") + { + } required_device m_maincpu; required_device m_i8085; diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp index f468ac7a2c1..0bb658bcd1f 100644 --- a/src/mame/drivers/vt320.cpp +++ b/src/mame/drivers/vt320.cpp @@ -11,15 +11,18 @@ #include "emu.h" #include "cpu/mcs51/mcs51.h" #include "machine/ram.h" +#include "screen.h" class vt320_state : public driver_device { public: vt320_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , - m_maincpu(*this, "maincpu"), - m_ram(*this, RAM_TAG) { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ram(*this, RAM_TAG) + { + } virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp index a6a0af9c645..ccb9d33fe23 100644 --- a/src/mame/drivers/vt520.cpp +++ b/src/mame/drivers/vt520.cpp @@ -9,8 +9,9 @@ ****************************************************************************/ #include "emu.h" -#include "machine/ram.h" #include "cpu/mcs51/mcs51.h" +#include "machine/ram.h" +#include "screen.h" class vt520_state : public driver_device diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp index f0703c42413..acc2064ad6a 100644 --- a/src/mame/drivers/vta2000.cpp +++ b/src/mame/drivers/vta2000.cpp @@ -20,6 +20,7 @@ Note: port 0 bit 4 is NOT a speaker bit. See code at 027B. #include "emu.h" #include "cpu/i8085/i8085.h" +#include "screen.h" class vta2000_state : public driver_device diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp index 84cf16cdaf3..d24cb5ce684 100644 --- a/src/mame/drivers/vtech1.cpp +++ b/src/mame/drivers/vtech1.cpp @@ -31,17 +31,22 @@ Todo: ***************************************************************************/ #include "emu.h" -#include "formats/imageutl.h" -#include "cpu/z80/z80.h" -#include "video/mc6847.h" + #include "bus/vtech/ioexp/ioexp.h" #include "bus/vtech/memexp/memexp.h" -#include "sound/wave.h" -#include "sound/speaker.h" -#include "imagedev/snapquik.h" +#include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "formats/vt_cas.h" +#include "imagedev/snapquik.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "video/mc6847.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/imageutl.h" +#include "formats/vt_cas.h" + /*************************************************************************** CONSTANTS & MACROS diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp index 0a72bb80273..d87b59474ae 100644 --- a/src/mame/drivers/vtech2.cpp +++ b/src/mame/drivers/vtech2.cpp @@ -66,14 +66,18 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/speaker.h" -#include "sound/wave.h" #include "includes/vtech2.h" -#include "imagedev/cassette.h" + +#include "cpu/z80/z80.h" #include "imagedev/flopdrv.h" +#include "sound/wave.h" + +#include "screen.h" +#include "speaker.h" + #include "formats/vt_cas.h" + static ADDRESS_MAP_START(vtech2_mem, AS_PROGRAM, 8, vtech2_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_RAMBANK("bank1") diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp index c64408cdd06..358dff49947 100644 --- a/src/mame/drivers/vulgus.cpp +++ b/src/mame/drivers/vulgus.cpp @@ -44,10 +44,13 @@ All Clocks and Vsync verified by Corrado Tomaselli (August 2012) ***************************************************************************/ #include "emu.h" +#include "includes/vulgus.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" -#include "includes/vulgus.h" +#include "screen.h" +#include "speaker.h" INTERRUPT_GEN_MEMBER(vulgus_state::vblank_irq) diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index 4a29a46eae1..524e529d0df 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -21,8 +21,9 @@ #include "machine/i8255.h" #include "machine/pit8253.h" #include "machine/ticket.h" -#include "sound/ym2413.h" #include "sound/msm5205.h" +#include "sound/ym2413.h" +#include "speaker.h" #include "wackygtr.lh" diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index 77a25599bc3..1afee902a0e 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -51,8 +51,10 @@ Thanks to HIGHWAYMAN for providing info on how to get to these epoxies #include "emu.h" #include "cpu/z80/z80.h" -#include "video/resnet.h" #include "sound/ay8910.h" +#include "video/resnet.h" +#include "screen.h" +#include "speaker.h" class wallc_state : public driver_device diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index c8fb9684c25..b5f5c483819 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -127,12 +127,14 @@ out: #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/twincobr.h" +#include "includes/toaplipt.h" + #include "cpu/tms32010/tms32010.h" -#include "sound/3812intf.h" +#include "cpu/z80/z80.h" #include "machine/bankdev.h" -#include "includes/toaplipt.h" -#include "includes/twincobr.h" +#include "sound/3812intf.h" +#include "speaker.h" class wardner_state : public twincobr_state diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp index dd1eed7ac61..1bedf832669 100644 --- a/src/mame/drivers/warpsped.cpp +++ b/src/mame/drivers/warpsped.cpp @@ -87,6 +87,7 @@ L10, L15, L18 and G18 all read the same #include "emu.h" #include "cpu/z80/z80.h" +#include "screen.h" class warpspeed_state : public driver_device { diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp index ff642caf1f8..5d2bfdff051 100644 --- a/src/mame/drivers/warpwarp.cpp +++ b/src/mame/drivers/warpwarp.cpp @@ -127,9 +127,12 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "cpu/i8085/i8085.h" #include "includes/warpwarp.h" +#include "cpu/i8085/i8085.h" +#include "screen.h" +#include "speaker.h" + #include "geebee.lh" #include "navarone.lh" diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp index af46700c7be..6ae23e97825 100644 --- a/src/mame/drivers/warriorb.cpp +++ b/src/mame/drivers/warriorb.cpp @@ -147,12 +147,16 @@ Colscroll effects? ***************************************************************************/ #include "emu.h" +#include "includes/warriorb.h" +#include "includes/taitoipt.h" + #include "cpu/z80/z80.h" -#include "rendlay.h" #include "cpu/m68000/m68000.h" #include "sound/2610intf.h" -#include "includes/warriorb.h" -#include "includes/taitoipt.h" + +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp index e9d2e50871f..29efcaebcff 100644 --- a/src/mame/drivers/wc90.cpp +++ b/src/mame/drivers/wc90.cpp @@ -54,10 +54,13 @@ Press one of the start buttons to exit. */ #include "emu.h" +#include "includes/wc90.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/2608intf.h" -#include "includes/wc90.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(wc90_state::bankswitch_w) diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index 4d3f0a0564e..f7bec2930b5 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -85,9 +85,13 @@ Noted added by ClawGrip 28-Mar-2008: */ #include "emu.h" +#include "includes/wc90b.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/wc90b.h" +#include "screen.h" +#include "speaker.h" + #define TEST_DIPS false /* enable to test unmapped dip switches */ diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index cd63386c90b..b2fcacb7b70 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -262,12 +262,15 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/wecleman.h" + #include "cpu/m68000/m68000.h" #include "cpu/m6809/m6809.h" +#include "cpu/z80/z80.h" #include "sound/ym2151.h" +#include "speaker.h" + #include "wecleman.lh" -#include "includes/wecleman.h" /*************************************************************************** diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp index 3890b725a77..30a1fcdc197 100644 --- a/src/mame/drivers/welltris.cpp +++ b/src/mame/drivers/welltris.cpp @@ -312,15 +312,18 @@ TODO: *******************************************************************************/ -#define WELLTRIS_4P_HACK 0 - #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/welltris.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/2610intf.h" -#include "includes/welltris.h" +#include "screen.h" +#include "speaker.h" +#define WELLTRIS_4P_HACK 0 + WRITE8_MEMBER(welltris_state::sound_bankswitch_w) { diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp index 49a1175c7f3..dbaa2a12778 100644 --- a/src/mame/drivers/wgp.cpp +++ b/src/mame/drivers/wgp.cpp @@ -397,12 +397,16 @@ Stephh's notes (based on the game M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" +#include "includes/wgp.h" #include "includes/taitoipt.h" -#include "cpu/m68000/m68000.h" #include "audio/taitosnd.h" + +#include "cpu/z80/z80.h" +#include "cpu/m68000/m68000.h" #include "sound/2610intf.h" -#include "includes/wgp.h" +#include "screen.h" +#include "speaker.h" + void wgp_state::parse_control() { diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index 42822170f78..58a7f45e778 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -212,6 +212,9 @@ suspicious code: #include "machine/gen_latch.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "screen.h" +#include "speaker.h" + static const int ZOOM_TABLE_SIZE=1<<14; static const int NUM_SCANLINES=256-8; diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index cafa5dba988..087d1511fba 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -17,18 +17,21 @@ Wicat - various systems. */ #include "emu.h" + #include "bus/rs232/rs232.h" +#include "cpu/8x300/8x300.h" #include "cpu/m68000/m68000.h" #include "cpu/z8000/z8000.h" -#include "cpu/8x300/8x300.h" #include "machine/6522via.h" -#include "machine/mm58274c.h" -#include "machine/mc2661.h" -#include "machine/im6402.h" -#include "video/i8275.h" #include "machine/am9517a.h" -#include "machine/x2212.h" +#include "machine/im6402.h" +#include "machine/mc2661.h" +#include "machine/mm58274c.h" #include "machine/wd_fdc.h" +#include "machine/x2212.h" +#include "video/i8275.h" +#include "screen.h" + #include "wicat.lh" class wicat_state : public driver_device diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp index 11842256358..dfb546fe6ba 100644 --- a/src/mame/drivers/wico.cpp +++ b/src/mame/drivers/wico.cpp @@ -38,8 +38,11 @@ ToDo: #include "emu.h" #include "machine/genpin.h" + #include "cpu/m6809/m6809.h" #include "sound/sn76496.h" +#include "speaker.h" + #include "wico.lh" diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp index b7bfb266624..daee72a23c4 100644 --- a/src/mame/drivers/wildpkr.cpp +++ b/src/mame/drivers/wildpkr.cpp @@ -156,6 +156,14 @@ *******************************************************************************/ +#include "emu.h" +#include "cpu/m68000/m68000.h" +#include "sound/ay8910.h" +//#include "video/hd63484.h" +#include "video/ramdac.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_12MHz #define AY_CLOCK MAIN_CLOCK / 8 @@ -163,12 +171,6 @@ #define AUX1_CLOCK XTAL_26MHz #define AUX2_CLOCK XTAL_24MHz -#include "emu.h" -#include "cpu/m68000/m68000.h" -//#include "video/hd63484.h" -#include "video/ramdac.h" -#include "sound/ay8910.h" - class wildpkr_state : public driver_device { diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp index c08487a33b5..c1fdbbfc83b 100644 --- a/src/mame/drivers/williams.cpp +++ b/src/mame/drivers/williams.cpp @@ -502,9 +502,11 @@ Reference video: https://www.youtube.com/watch?v=R5OeC6Wc_yI #include "emu.h" #include "includes/williams.h" + #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" #define MASTER_CLOCK (XTAL_12MHz) diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index 3648378aa2a..3a9340da411 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -14,9 +14,11 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/gen_latch.h" #include "machine/nvram.h" +#include "sound/ay8910.h" +#include "screen.h" +#include "speaker.h" class wink_state : public driver_device diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp index 64d6e9d462f..3ea4b14ff93 100644 --- a/src/mame/drivers/wiping.cpp +++ b/src/mame/drivers/wiping.cpp @@ -36,10 +36,13 @@ dip: 6.7 7.7 ***************************************************************************/ #include "emu.h" +#include "includes/wiping.h" +#include "audio/wiping.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" -#include "audio/wiping.h" -#include "includes/wiping.h" +#include "screen.h" +#include "speaker.h" void wiping_state::machine_start() diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index 6248da7343e..4adc5f27bb4 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -219,6 +219,19 @@ TODO : - Hook up the OKI M5202 */ +#include "emu.h" + +#include "cpu/z80/z80.h" +#include "machine/i8255.h" +#include "machine/nvram.h" +#include "machine/ticket.h" +#include "sound/2203intf.h" +#include "sound/es8712.h" + +#include "screen.h" +#include "speaker.h" + + #define MAIN_CLOCK XTAL_12MHz #define CPU_CLOCK MAIN_CLOCK / 4 #define YM2203_CLOCK MAIN_CLOCK / 4 @@ -226,14 +239,6 @@ TODO : #define HOPPER_PULSE 50 // time between hopper pulses in milliseconds (not right for attendant pay) -#include "emu.h" -#include "cpu/z80/z80.h" -#include "sound/es8712.h" -#include "sound/2203intf.h" -#include "machine/i8255.h" -#include "machine/nvram.h" -#include "machine/ticket.h" - class witch_state : public driver_device { diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp index 08bcb0d4f60..e2892d43d29 100644 --- a/src/mame/drivers/wiz.cpp +++ b/src/mame/drivers/wiz.cpp @@ -177,11 +177,14 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" +#include "includes/wiz.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/wiz.h" +#include "screen.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp index 07f5ae8e726..cbe0f878cce 100644 --- a/src/mame/drivers/wmg.cpp +++ b/src/mame/drivers/wmg.cpp @@ -70,10 +70,13 @@ of save-state is also needed. #include "emu.h" #include "includes/williams.h" + #include "cpu/m6800/m6800.h" #include "machine/nvram.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "speaker.h" + #define MASTER_CLOCK (XTAL_12MHz) #define SOUND_CLOCK (XTAL_3_579545MHz) diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp index c196ba7559a..01d9d085ce3 100644 --- a/src/mame/drivers/wms.cpp +++ b/src/mame/drivers/wms.cpp @@ -73,6 +73,12 @@ ***************************************************************************************************/ +#include "emu.h" +#include "cpu/i86/i186.h" +#include "cpu/adsp2100/adsp2100.h" +#include "screen.h" + + #define MAIN_CLOCK XTAL_40MHz // Pletronics 40.000 MHz. Crystal. Used for CPU clock. #define VIDEO_CLOCK XTAL_14_31818MHz // Pletronics MP49 14.31818 MHz. Crystal. Used in common VGA ISA cards. @@ -80,11 +86,6 @@ // (16 * 115200 baud, 192 * 9600 baud, 1536 * 1200 baud, etc...) -#include "emu.h" -#include "cpu/i86/i186.h" -#include "cpu/adsp2100/adsp2100.h" - - class wms_state : public driver_device { public: diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index 34bc3289fce..ca8156a4e13 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -7,9 +7,11 @@ ***************************************************************************/ #include "emu.h" +#include "includes/wolfpack.h" + #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" -#include "includes/wolfpack.h" +#include "speaker.h" void wolfpack_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index f584fd6ac50..930fcf0180d 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -6,12 +6,16 @@ #include "emu.h" -#include "cpu/m6809/m6809.h" #include "audio/s11c_bg.h" #include "audio/wpcsnd.h" + +#include "cpu/m6809/m6809.h" #include "machine/wpc.h" +#include "speaker.h" + #include "wpc_an.lh" + #define LOG_WPC (1) class wpc_an_state : public driver_device diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp index 58eba16f1fd..4a72919ffcf 100644 --- a/src/mame/drivers/wpc_dot.cpp +++ b/src/mame/drivers/wpc_dot.cpp @@ -5,6 +5,8 @@ #include "emu.h" #include "includes/wpc_dot.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( wpc_dot_map, AS_PROGRAM, 8, wpc_dot_state ) diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp index 2add74c0e4b..55498d58334 100644 --- a/src/mame/drivers/wpc_flip1.cpp +++ b/src/mame/drivers/wpc_flip1.cpp @@ -5,6 +5,8 @@ #include "emu.h" #include "includes/wpc_flip1.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( wpc_flip1_map, AS_PROGRAM, 8, wpc_flip1_state ) diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp index 7501047949f..8cbdd80b8d9 100644 --- a/src/mame/drivers/wpc_flip2.cpp +++ b/src/mame/drivers/wpc_flip2.cpp @@ -5,6 +5,8 @@ #include "emu.h" #include "includes/wpc_flip2.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( wpc_flip2_map, AS_PROGRAM, 8, wpc_flip2_state ) diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp index 6281a5b1f32..ee94f3a410e 100644 --- a/src/mame/drivers/wrally.cpp +++ b/src/mame/drivers/wrally.cpp @@ -104,10 +104,13 @@ The PCB has a layout that can either use the 4 rom set of I7, I9, I11 & I 13 or ***************************************************************************/ #include "emu.h" +#include "includes/wrally.h" + #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" #include "sound/okim6295.h" -#include "includes/wrally.h" +#include "screen.h" +#include "speaker.h" static ADDRESS_MAP_START( wrally_map, AS_PROGRAM, 16, wrally_state ) diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index 0dcaa416e0b..5790c1de45d 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -35,7 +35,11 @@ #include "emu.h" #include "includes/wswan.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + #include "wswan.lh" static ADDRESS_MAP_START (wswan_mem, AS_PROGRAM, 8, wswan_state) diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index d22c6dd3255..d54104fdbf1 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -154,11 +154,14 @@ Notes: *******************************************************************************/ #include "emu.h" +#include "includes/wwfsstar.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" -#include "includes/wwfsstar.h" +#include "sound/ym2151.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_20MHz #define CPU_CLOCK MASTER_CLOCK / 2 diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index a7728f9c6a9..7ff061a75f3 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -34,6 +34,9 @@ Actual game video: http://www.nicozon.net/watch/sm10823430 #include "machine/gen_latch.h" #include "sound/ay8910.h" #include "sound/msm5232.h" +#include "screen.h" +#include "speaker.h" + class wyvernf0_state : public driver_device { diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index 084c5c49959..c4a2a292132 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -30,7 +30,11 @@ #include "emu.h" #include "includes/x07.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + /*************************************************************************** T6834 IMPLEMENTATION diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index e9f58f9ac8e..ef10422cf31 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -208,8 +208,13 @@ #include "emu.h" #include "includes/x1.h" -#include "formats/2d_dsk.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + +#include "formats/2d_dsk.h" + #define MAIN_CLOCK XTAL_16MHz #define VDP_CLOCK XTAL_42_9545MHz diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 9cb3158cb84..6d16b959d83 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -16,19 +16,21 @@ #include "emu.h" #include "includes/x1.h" - #include "includes/pce.h" -//#include "cpu/h6280/h6280.h" -//#include "sound/c6280.h" -#include "softlist.h" + #include "rendlay.h" +#include "screen.h" +#include "softlist.h" +#include "speaker.h" + class x1twin_state : public x1_state { - public: - x1twin_state(const machine_config &mconfig, device_type type, const char *tag) +public: + x1twin_state(const machine_config &mconfig, device_type type, const char *tag) : x1_state(mconfig, type, tag) { } + uint32_t screen_update_x1pce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(ipl_reset); DECLARE_INPUT_CHANGED_MEMBER(nmi_reset); diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index dcb19498ca7..2183dc4cb48 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -116,24 +116,25 @@ */ #include "emu.h" -#include "machine/mc68901.h" -#include "machine/upd765.h" -#include "sound/okim6258.h" -#include "machine/rp5c15.h" -#include "machine/mb89352.h" -#include "formats/xdf_dsk.h" -#include "formats/dim_dsk.h" +#include "includes/x68k.h" #include "machine/x68k_hdc.h" #include "machine/x68k_kbd.h" -#include "includes/x68k.h" -#include "machine/ram.h" + +#include "machine/mb89352.h" #include "machine/nvram.h" + #include "bus/x68k/x68kexp.h" #include "bus/x68k/x68k_neptunex.h" #include "bus/x68k/x68k_scsiext.h" #include "bus/scsi/scsi.h" #include "bus/scsi/scsihd.h" + #include "softlist.h" +#include "speaker.h" + +#include "formats/dim_dsk.h" +#include "formats/xdf_dsk.h" + #include "x68000.lh" diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp index 10936337727..79ef95e19b1 100644 --- a/src/mame/drivers/xain.cpp +++ b/src/mame/drivers/xain.cpp @@ -144,6 +144,8 @@ Updates by Bryan McPhail, 12/12/2004: #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" +#include "speaker.h" + #define MASTER_CLOCK XTAL_12MHz #define CPU_CLOCK MASTER_CLOCK / 8 diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index b3bf1762f8f..c08f46819a0 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -14,9 +14,12 @@ #include "emu.h" +#include "cpu/g65816/g65816.h" #include "cpu/m6502/m6502.h" //#include "sound/ay8910.h" -#include "cpu/g65816/g65816.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_21_4772MHz diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp index c187622a3a7..263c141db19 100644 --- a/src/mame/drivers/xbox.cpp +++ b/src/mame/drivers/xbox.cpp @@ -10,21 +10,21 @@ #include "emu.h" +#include "includes/xbox.h" + #include "cpu/i386/i386.h" +#include "machine/atapicdr.h" +#include "machine/idehd.h" #include "machine/lpci.h" -#include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/idectrl.h" -#include "machine/idehd.h" -#include "machine/atapicdr.h" -#include "video/poly.h" -#include "bitmap.h" -#include "debug/debugcon.h" + #include "debug/debugcmd.h" +#include "debug/debugcon.h" #include "debugger.h" -#include "includes/xbox_nv2a.h" -#include "includes/xbox.h" -#include "includes/xbox_usb.h" +#include "speaker.h" + +#include "bitmap.h" + #define CPU_DIV 64 diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index 278cb12f202..ba78325ab91 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -49,7 +49,12 @@ #include "emu.h" #include "includes/xerox820.h" + +#include "screen.h" #include "softlist.h" +#include "speaker.h" + + /* Read/Write Handlers */ void xerox820_state::bankswitch(int bank) diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp index 6882a31f5fb..25a88cdce64 100644 --- a/src/mame/drivers/xexex.cpp +++ b/src/mame/drivers/xexex.cpp @@ -132,15 +132,18 @@ Unresolved Issues: ***************************************************************************/ #include "emu.h" +#include "includes/xexex.h" +#include "includes/konamipt.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "machine/k053252.h" +#include "sound/flt_vol.h" #include "sound/k054539.h" #include "sound/ym2151.h" -#include "sound/flt_vol.h" -#include "includes/xexex.h" -#include "includes/konamipt.h" +#include "speaker.h" + #define XE_DEBUG 0 #define XE_SKIPIDLE 1 diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index 717b52153d5..9ce6c484615 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -16,15 +16,17 @@ likewise a 2 screen game ***************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" +#include "includes/xmen.h" +#include "includes/konamipt.h" +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "machine/watchdog.h" -#include "cpu/z80/z80.h" #include "sound/ym2151.h" #include "rendlay.h" -#include "includes/xmen.h" -#include "includes/konamipt.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp index ccf8ae9d980..332cf52e6d1 100644 --- a/src/mame/drivers/xorworld.cpp +++ b/src/mame/drivers/xorworld.cpp @@ -30,10 +30,14 @@ EEPROM chip: 93C46 ***************************************************************************/ #include "emu.h" -#include "machine/eepromser.h" +#include "includes/xorworld.h" + #include "cpu/m68000/m68000.h" +#include "machine/eepromser.h" #include "sound/saa1099.h" -#include "includes/xorworld.h" + +#include "screen.h" +#include "speaker.h" /**************************************************************** diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp index cff86858d25..22638d9ebed 100644 --- a/src/mame/drivers/xtheball.cpp +++ b/src/mame/drivers/xtheball.cpp @@ -16,6 +16,9 @@ #include "sound/dac.h" #include "sound/volt_reg.h" #include "video/tlc34076.h" +#include "screen.h" +#include "speaker.h" + class xtheball_state : public driver_device { diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp index b5ee061d7ad..79d22d91cbb 100644 --- a/src/mame/drivers/xxmissio.cpp +++ b/src/mame/drivers/xxmissio.cpp @@ -11,9 +11,12 @@ XX Mission (c) 1986 UPL *****************************************************************************/ #include "emu.h" +#include "includes/xxmissio.h" + #include "cpu/z80/z80.h" #include "sound/2203intf.h" -#include "includes/xxmissio.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER(xxmissio_state::bank_sel_w) diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp index eb46b3d5015..b564c0cedb8 100644 --- a/src/mame/drivers/xybots.cpp +++ b/src/mame/drivers/xybots.cpp @@ -20,10 +20,12 @@ #include "emu.h" +#include "includes/xybots.h" + #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "machine/atarigen.h" -#include "includes/xybots.h" +#include "speaker.h" diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index 1c142e979cc..bc72efd1d1c 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -23,9 +23,11 @@ TODO: ******************************************************************************/ #include "emu.h" +#include "includes/xyonix.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" -#include "includes/xyonix.h" +#include "screen.h" +#include "speaker.h" void xyonix_state::machine_start() diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp index 550e7152f14..1ef1d9a0e5b 100644 --- a/src/mame/drivers/yiear.cpp +++ b/src/mame/drivers/yiear.cpp @@ -97,12 +97,15 @@ Sound: VLM5030 at 7B ***************************************************************************/ #include "emu.h" +#include "includes/yiear.h" +#include "includes/konamipt.h" +#include "audio/trackfld.h" + #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" #include "sound/sn76496.h" -#include "includes/konamipt.h" -#include "audio/trackfld.h" -#include "includes/yiear.h" +#include "screen.h" +#include "speaker.h" diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp index ccd087375b2..da11e35f9ee 100644 --- a/src/mame/drivers/ymmu100.cpp +++ b/src/mame/drivers/ymmu100.cpp @@ -115,12 +115,17 @@ **************************************************************************************/ #include "emu.h" -#include "debugger.h" + +#include "bus/midi/midiinport.h" +#include "bus/midi/midioutport.h" #include "cpu/h8/h8s2655.h" #include "video/hd44780.h" + +#include "debugger.h" #include "rendlay.h" -#include "bus/midi/midiinport.h" -#include "bus/midi/midioutport.h" +#include "screen.h" +#include "speaker.h" + static INPUT_PORTS_START( mu100 ) PORT_START("P7") diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp index 388f058c2fd..ceb08fa8665 100644 --- a/src/mame/drivers/yunsun16.cpp +++ b/src/mame/drivers/yunsun16.cpp @@ -89,10 +89,12 @@ Stephh's notes (based on the games M68000 code and some tests) : #include "emu.h" #include "includes/yunsun16.h" -#include "cpu/z80/z80.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "sound/okim6295.h" #include "sound/3812intf.h" +#include "speaker.h" /*************************************************************************** diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp index 22ea8b11633..e198e9d649d 100644 --- a/src/mame/drivers/yunsung8.cpp +++ b/src/mame/drivers/yunsung8.cpp @@ -28,10 +28,14 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/yunsung8.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/3812intf.h" -#include "includes/yunsung8.h" +#include "screen.h" +#include "speaker.h" + /*************************************************************************** diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp index d4571f68526..70c3f9fec9f 100644 --- a/src/mame/drivers/z100.cpp +++ b/src/mame/drivers/z100.cpp @@ -145,11 +145,12 @@ ZDIPSW EQU 0FFH ; Configuration dip switches #include "emu.h" #include "cpu/i86/i86.h" -#include "video/mc6845.h" -#include "machine/pic8259.h" +#include "imagedev/flopdrv.h" #include "machine/6821pia.h" +#include "machine/pic8259.h" #include "machine/wd_fdc.h" -#include "imagedev/flopdrv.h" +#include "video/mc6845.h" +#include "screen.h" class z100_state : public driver_device { diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index 5f05d470866..ce59dec2464 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -52,9 +52,11 @@ Due to no input checking, misuse of commands can crash the system. #include "emu.h" #include "cpu/z80/z80.h" #include "machine/z80pio.h" -#include "imagedev/snapquik.h" #include "imagedev/cassette.h" +#include "imagedev/snapquik.h" #include "sound/wave.h" +#include "screen.h" +#include "speaker.h" class z1013_state : public driver_device @@ -66,7 +68,7 @@ public: , m_cass(*this, "cassette") , m_p_videoram(*this, "videoram") , m_p_chargen(*this, "chargen") - { } + { } DECLARE_WRITE8_MEMBER(z1013_keyboard_w); DECLARE_READ8_MEMBER(port_b_r); diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp index 647ac4affe9..87ec399d8a0 100644 --- a/src/mame/drivers/z88.cpp +++ b/src/mame/drivers/z88.cpp @@ -20,6 +20,8 @@ #include "emu.h" #include "includes/z88.h" +#include "screen.h" +#include "speaker.h" /* Assumption: diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index c2da9e1da96..e842e268ebc 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -29,12 +29,14 @@ ToDo: #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/z80pio.h" -#include "machine/z80ctc.h" #include "cpu/z80/z80daisy.h" -#include "sound/wave.h" #include "imagedev/cassette.h" +#include "machine/z80ctc.h" +#include "machine/z80pio.h" #include "sound/beep.h" +#include "sound/wave.h" +#include "screen.h" +#include "speaker.h" // temporary #include "machine/keyboard.h" diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp index 3fe273ddf5e..1bc2e0f61f5 100644 --- a/src/mame/drivers/zac2650.cpp +++ b/src/mame/drivers/zac2650.cpp @@ -15,10 +15,12 @@ */ #include "emu.h" +#include "includes/zac2650.h" + #include "cpu/s2650/s2650.h" +#include "speaker.h" #include "tinv2650.lh" -#include "includes/zac2650.h" /***********************************************************************************************/ diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp index dc345153403..6332f15e54c 100644 --- a/src/mame/drivers/zaccaria.cpp +++ b/src/mame/drivers/zaccaria.cpp @@ -40,10 +40,13 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/zaccaria.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/watchdog.h" -#include "includes/zaccaria.h" +#include "screen.h" +#include "speaker.h" void zaccaria_state::machine_start() diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp index 2a069ab3117..fe86bec9ec1 100644 --- a/src/mame/drivers/zaurus.cpp +++ b/src/mame/drivers/zaurus.cpp @@ -1403,11 +1403,13 @@ Note: *****************************************************************************************************************************************/ - #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "machine/pxa255.h" +#include "screen.h" +#include "speaker.h" + #define MAIN_CLOCK XTAL_8MHz @@ -1415,9 +1417,9 @@ class zaurus_state : public driver_device { public: zaurus_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ram(*this, "ram") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ram(*this, "ram") { } // devices diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index 4d20840ac07..9c3cd3f05c8 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -254,15 +254,18 @@ ***************************************************************************/ #include "emu.h" +#include "includes/zaxxon.h" +#include "audio/segasnd.h" + #include "cpu/z80/z80.h" -#include "sound/sn76496.h" -#include "sound/samples.h" #include "machine/gen_latch.h" -#include "machine/segacrpt_device.h" #include "machine/i8255.h" -#include "audio/segasnd.h" -#include "includes/zaxxon.h" +#include "machine/segacrpt_device.h" +#include "sound/samples.h" +#include "sound/sn76496.h" +#include "screen.h" +#include "speaker.h" /************************************* diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp index 640c179c3db..1c654bd43da 100644 --- a/src/mame/drivers/zerozone.cpp +++ b/src/mame/drivers/zerozone.cpp @@ -32,8 +32,11 @@ #include "emu.h" #include "includes/zerozone.h" + #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#include "screen.h" +#include "speaker.h" WRITE16_MEMBER( zerozone_state::sound_w ) diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 84a8bb6975a..9c7aecf08ea 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -11,27 +11,33 @@ ***************************************************************************/ #include "emu.h" +#include "audio/rax.h" +#include "audio/taito_zm.h" +#include "audio/taitosnd.h" + #include "cpu/m68000/m68000.h" #include "cpu/psx/psx.h" #include "cpu/z80/z80.h" -#include "video/psx.h" -#include "machine/at28c16.h" -#include "machine/nvram.h" -#include "machine/mb3773.h" #include "machine/7200fifo.h" -#include "machine/cat702.h" -#include "machine/znmcu.h" +#include "machine/at28c16.h" #include "machine/ataintf.h" -#include "machine/vt83c461.h" +#include "machine/cat702.h" #include "machine/gen_latch.h" -#include "audio/taitosnd.h" +#include "machine/mb3773.h" +#include "machine/nvram.h" +#include "machine/ram.h" +#include "machine/vt83c461.h" +#include "machine/znmcu.h" #include "sound/2610intf.h" -#include "sound/ymz280b.h" #include "sound/qsound.h" #include "sound/spu.h" #include "sound/ymf271.h" -#include "audio/rax.h" -#include "audio/taito_zm.h" +#include "sound/ymz280b.h" +#include "video/psx.h" + +#include "screen.h" +#include "speaker.h" + #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp index 67a087a0f26..63d26577a6d 100644 --- a/src/mame/drivers/zodiack.cpp +++ b/src/mame/drivers/zodiack.cpp @@ -89,10 +89,14 @@ Notes: ***************************************************************************/ #include "emu.h" +#include "includes/zodiack.h" + #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "includes/zodiack.h" +#include "screen.h" +#include "speaker.h" + #define PIXEL_CLOCK (XTAL_18_432MHz/3) diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 2eea03ad2e6..35cc3f64d21 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -66,7 +66,9 @@ ToDo: #include "machine/latch.h" #include "machine/pit8253.h" +#include "screen.h" #include "softlist.h" +#include "speaker.h" namespace { diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 311366f4bb2..2138b499618 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -181,6 +181,7 @@ Check gticlub.c for details on the bottom board. #include "video/k001006.h" #include "video/k054156_k054157_k056832.h" #include "video/konami_helper.h" +#include "speaker.h" class zr107_state : public driver_device diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index e7a1c85467f..cf1b0a0fa85 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -22,6 +22,8 @@ #include "machine/ins8250.h" #include "machine/keyboard.h" #include "sound/beep.h" +#include "screen.h" +#include "speaker.h" class zrt80_state : public driver_device { diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp index efb42e78cd7..01591f36d27 100644 --- a/src/mame/drivers/zwackery.cpp +++ b/src/mame/drivers/zwackery.cpp @@ -18,11 +18,14 @@ ***************************************************************************/ #include "emu.h" +#include "audio/csd.h" + #include "cpu/m68000/m68000.h" #include "machine/6821pia.h" #include "machine/6840ptm.h" #include "machine/watchdog.h" -#include "audio/csd.h" +#include "screen.h" +#include "speaker.h" //************************************************************************** diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp index 3ef04292ed1..aa853f8c0f8 100644 --- a/src/mame/drivers/zx.cpp +++ b/src/mame/drivers/zx.cpp @@ -45,6 +45,9 @@ #include "emu.h" #include "includes/zx.h" +#include "speaker.h" + + /* Memory Maps */ static ADDRESS_MAP_START( zx80_map, AS_PROGRAM, 8, zx_state ) diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index bf9764dd819..3f6e1a4f760 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -6,11 +6,20 @@ 8080-based black and white hardware ****************************************************************************/ +#ifndef MAME_INCLUDES_8080BW_H +#define MAME_INCLUDES_8080BW_H + +#pragma once #include "includes/mw8080bw.h" -#include "sound/sn76477.h" -#include "sound/speaker.h" + #include "machine/eepromser.h" +#include "sound/sn76477.h" +#include "sound/spkrdev.h" + +#include "screen.h" + + /* for games in 8080bw.c */ #define CABINET_PORT_TAG "CAB" @@ -176,3 +185,5 @@ DISCRETE_SOUND_EXTERN( ballbomb ); DISCRETE_SOUND_EXTERN( indianbt ); DISCRETE_SOUND_EXTERN( polaris ); DISCRETE_SOUND_EXTERN( schaser ); + +#endif // MAME_INCLUDES_8080BW_H diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index abb96a868ed..d251c0c66ba 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "video/kan_pand.h" +#include "screen.h" class airbustr_state : public driver_device { diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 67e153eeea4..30289f756d0 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -23,6 +23,7 @@ Ernesto Corvi & Mariusz Wojcieszek #include "machine/i2cmem.h" #include "machine/8364_paula.h" #include "video/amigaaga.h" +#include "screen.h" /************************************* diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 7ab95d63806..306fa2cebe1 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "sound/ym2151.h" +#include "screen.h" class amspdwy_state : public driver_device { diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 4546c2c4a92..7e7d8474c7c 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -43,6 +43,7 @@ #include "bus/centronics/digiblst.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" /**************************** diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index 2c3c64a573d..519845d20a1 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -8,21 +8,25 @@ ***************************************************************************/ -#ifndef APPLE2_H_ -#define APPLE2_H_ +#ifndef MAME_INCLUDES_APPLE2_H +#define MAME_INCLUDES_APPLE2_H #include "cpu/m6502/m6502.h" #include "cpu/m6502/m65c02.h" -#include "bus/a2bus/a2bus.h" -#include "bus/a2bus/a2eauxslot.h" -#include "machine/applefdc.h" -#include "machine/ram.h" + #include "imagedev/cassette.h" + +#include "machine/applefdc.h" #include "machine/kb3600.h" -#include "sound/speaker.h" +#include "machine/mos6551.h" #include "machine/ram.h" + +#include "sound/spkrdev.h" + +#include "bus/a2bus/a2bus.h" +#include "bus/a2bus/a2eauxslot.h" #include "bus/rs232/rs232.h" -#include "machine/mos6551.h" + #define AUXSLOT_TAG "auxbus" @@ -380,4 +384,4 @@ INPUT_PORTS_EXTERN( apple2ep ); /*----------- defined in machine/apple2.c -----------*/ extern const applefdc_interface apple2_fdc_interface; -#endif /* APPLE2_H_ */ +#endif // MAME_INCLUDES_APPLE2_H diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 89dd5e2f0c8..84f6bbf8d63 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/excellent_spr.h" +#include "screen.h" class aquarium_state : public driver_device { diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h index e4304aff451..b942ede4576 100644 --- a/src/mame/includes/aquarius.h +++ b/src/mame/includes/aquarius.h @@ -6,18 +6,24 @@ * ****************************************************************************/ -#ifndef __AQUARIUS__ -#define __AQUARIUS__ +#ifndef MAME_INCLUDES_AQUARIUS_H +#define MAME_INCLUDES_AQUARIUS_H + +#pragma once #include "cpu/z80/z80.h" -#include "video/tea1002.h" #include "imagedev/cassette.h" #include "machine/ram.h" #include "sound/ay8910.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "video/tea1002.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" + + class aquarius_state : public driver_device { public: @@ -85,4 +91,4 @@ public: uint32_t screen_update_aquarius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(aquarius_reset); }; -#endif /* AQUARIUS_H_ */ +#endif // MAME_INCLUDES_AQUARIUS_H diff --git a/src/mame/includes/arcadia.h b/src/mame/includes/arcadia.h index 4e8904748ff..21a1c5f3c50 100644 --- a/src/mame/includes/arcadia.h +++ b/src/mame/includes/arcadia.h @@ -15,6 +15,8 @@ #include "bus/arcadia/slot.h" #include "bus/arcadia/rom.h" +#include "screen.h" + // space vultures sprites above // combat below and invisible #define YPOS 0 diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h index 168d1b7330c..16c5782c78e 100644 --- a/src/mame/includes/archimds.h +++ b/src/mame/includes/archimds.h @@ -13,6 +13,7 @@ #include "sound/dac.h" #include "machine/i2cmem.h" #include "machine/wd_fdc.h" +#include "screen.h" // interrupt definitions. these are for the real Archimedes computer - arcade // and gambling knockoffs likely are a bit different. diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index c3956a5e3f0..9a81014f936 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Yochizo #include "video/jalblend.h" +#include "screen.h" class argus_state : public driver_device { diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index 5a4332b3ae8..2dc6587773c 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -5,8 +5,9 @@ Art & Magic hardware **************************************************************************/ -#include "sound/okim6295.h" #include "cpu/tms34010/tms34010.h" +#include "sound/okim6295.h" +#include "video/tlc34076.h" class artmagic_state : public driver_device { @@ -17,15 +18,16 @@ public: }; artmagic_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_oki(*this, "oki"), - m_oki_region(*this, "oki"), - m_tms(*this, "tms"), - m_tlc34076(*this, "tlc34076"), - m_control(*this, "control"), - m_vram0(*this, "vram0"), - m_vram1(*this, "vram1") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_oki(*this, "oki") + , m_oki_region(*this, "oki") + , m_tms(*this, "tms") + , m_tlc34076(*this, "tlc34076") + , m_control(*this, "control") + , m_vram0(*this, "vram0") + , m_vram1(*this, "vram1") + { } required_device m_maincpu; required_device m_oki; diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index 74cfd060422..4e5a8a48cb3 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -11,6 +11,7 @@ #include "sound/astrocde.h" #include "sound/samples.h" #include "sound/votrax.h" +#include "screen.h" #define ASTROCADE_CLOCK (XTAL_14_31818MHz/2) diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index cf2a5711bc9..a5c9a1c96a5 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -8,6 +8,7 @@ #include "sound/samples.h" #include "sound/sn76477.h" +#include "screen.h" class astrof_state : public driver_device { diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index 78a459c0847..3416739f23e 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index 5f5d32ec96c..d3ad4308695 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -6,8 +6,9 @@ *************************************************************************/ -#include "machine/atarigen.h" #include "audio/atarijsa.h" +#include "machine/atarigen.h" +#include "video/atarirle.h" #include "cpu/m68000/m68000.h" class atarig1_state : public atarigen_state diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 94b39b7b788..95fe69e81a6 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -6,8 +6,9 @@ *************************************************************************/ -#include "machine/atarigen.h" #include "audio/atarijsa.h" +#include "machine/atarigen.h" +#include "video/atarirle.h" #include "cpu/m68000/m68000.h" #include "machine/asic65.h" diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 97b587bb1e4..11618c9ea09 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -6,9 +6,10 @@ *************************************************************************/ +#include "audio/atarijsa.h" #include "machine/atarigen.h" #include "machine/atarixga.h" -#include "audio/atarijsa.h" +#include "video/atarirle.h" class atarigx2_state : public atarigen_state diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index cd2016288e1..e4bb9cc4b11 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "includes/slapstic.h" +#include "screen.h" class atetris_state : public driver_device { diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h index 450117ec53f..053b2447f3e 100644 --- a/src/mame/includes/atom.h +++ b/src/mame/includes/atom.h @@ -1,27 +1,30 @@ // license:BSD-3-Clause // copyright-holders:Nathan Woods -#pragma once +#ifndef MAME_INCLUDES_ATOM_H +#define MAME_INCLUDES_ATOM_H -#ifndef __ATOM__ -#define __ATOM__ +#pragma once #include "cpu/m6502/m6502.h" #include "imagedev/cassette.h" #include "imagedev/flopdrv.h" -#include "machine/ram.h" #include "imagedev/snapquik.h" -#include "formats/atom_tap.h" -#include "formats/atom_dsk.h" -#include "formats/uef_cas.h" -#include "bus/centronics/ctronics.h" #include "machine/6522via.h" #include "machine/i8255.h" #include "machine/i8271.h" -#include "sound/speaker.h" +#include "machine/ram.h" +#include "sound/spkrdev.h" #include "video/mc6847.h" -#include "bus/generic/slot.h" + +#include "bus/centronics/ctronics.h" #include "bus/generic/carts.h" +#include "bus/generic/slot.h" + +#include "formats/atom_dsk.h" +#include "formats/atom_tap.h" +#include "formats/uef_cas.h" + #define SY6502_TAG "ic22" #define INS8255_TAG "ic25" @@ -162,4 +165,4 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(e1_load) { return load_cart(image, m_e1); } }; -#endif +#endif // MAME_INCLUDES_ATOM_H diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h index 6634357ae36..4fe530f4ed3 100644 --- a/src/mame/includes/aussiebyte.h +++ b/src/mame/includes/aussiebyte.h @@ -1,25 +1,33 @@ // license:BSD-3-Clause // copyright-holders:Robbbert +#ifndef MAME_INCLUDES_AUSSIEBYTE_H +#define MAME_INCLUDES_AUSSIEBYTE_H + +#pragma once /*********************************************************** Includes ************************************************************/ +#include "bus/centronics/ctronics.h" +#include "bus/rs232/rs232.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" + +#include "machine/clock.h" +#include "machine/msm5832.h" +#include "machine/wd_fdc.h" #include "machine/z80ctc.h" -#include "machine/z80pio.h" #include "machine/z80dart.h" #include "machine/z80dma.h" -#include "bus/centronics/ctronics.h" -#include "sound/speaker.h" +#include "machine/z80pio.h" + +#include "sound/spkrdev.h" #include "sound/votrax.h" + #include "video/mc6845.h" -#include "bus/rs232/rs232.h" -#include "machine/wd_fdc.h" -#include "machine/msm5832.h" -#include "machine/clock.h" /*********************************************************** @@ -131,3 +139,5 @@ private: required_device m_votrax; required_device m_rtc; }; + +#endif // MAME_INCLUDES_AUSSIEBYTE_H diff --git a/src/mame/includes/avigo.h b/src/mame/includes/avigo.h index 970ba107378..d8692e09513 100644 --- a/src/mame/includes/avigo.h +++ b/src/mame/includes/avigo.h @@ -6,19 +6,21 @@ * ****************************************************************************/ -#ifndef AVIGO_H_ -#define AVIGO_H_ +#ifndef MAME_INCLUDES_AVIGO_H +#define MAME_INCLUDES_AVIGO_H + +#pragma once #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "machine/rp5c01.h" +#include "imagedev/snapquik.h" +#include "machine/bankdev.h" #include "machine/ins8250.h" #include "machine/intelfsh.h" -#include "machine/bankdev.h" #include "machine/nvram.h" -#include "sound/speaker.h" #include "machine/ram.h" -#include "imagedev/snapquik.h" +#include "machine/rp5c01.h" +#include "sound/spkrdev.h" #define AVIGO_NUM_COLOURS 2 @@ -109,4 +111,5 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER( avigo); }; -#endif /* AVIGO_H_ */ + +#endif // MAME_INCLUDES_AVIGO_H diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 6f4afecfe32..f34b5a94e60 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "video/vector.h" +#include "screen.h" class aztarac_state : public driver_device { diff --git a/src/mame/includes/b2m.h b/src/mame/includes/b2m.h index 1b1378f97f8..156e2c7df9a 100644 --- a/src/mame/includes/b2m.h +++ b/src/mame/includes/b2m.h @@ -6,16 +6,16 @@ * ****************************************************************************/ -#ifndef B2M_H_ -#define B2M_H_ +#ifndef MAME_INCLUDES_B2M_H +#define MAME_INCLUDES_B2M_H #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ram.h" #include "machine/wd_fdc.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" -#include "machine/ram.h" class b2m_state : public driver_device { @@ -78,4 +78,4 @@ public: void b2m_set_bank(int bank); }; -#endif +#endif // MAME_INCLUDES_B2M_H diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 3ddab9a1b76..3901436f71d 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -9,6 +9,7 @@ ***************************************************************************/ #include "sound/cem3394.h" +#include "screen.h" #define BALSENTE_MASTER_CLOCK (20000000) #define BALSENTE_CPU_CLOCK (BALSENTE_MASTER_CLOCK / 16) diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 59cb48a40b7..c684bf3d119 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -5,6 +5,7 @@ #include "sound/msm5205.h" #include "video/huc6260.h" #include "video/huc6270.h" +#include "screen.h" #define MAIN_CLOCK 21477270 diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 6ac2603f0c5..04b52e6158c 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -2,6 +2,7 @@ // copyright-holders:Jarek Burczynski, Tomasz Slanina #include "sound/msm5232.h" #include "machine/taito68705interface.h" +#include "screen.h" class bigevglf_state : public driver_device { diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 57c921547fa..f944b17062e 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -11,6 +11,7 @@ #include "video/k055555.h" #include "video/k054338.h" #include "video/konami_helper.h" +#include "screen.h" #define CPU_CLOCK (XTAL_24MHz / 2) /* 68000 clock */ #define SOUND_CLOCK XTAL_16_9344MHz /* YMZ280 clock */ diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 9ca32af9c71..ebc5c809c36 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -3,6 +3,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" +#include "screen.h" class bking_state : public driver_device { diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index a7aa2b9709e..92ad57b9a97 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -8,6 +8,7 @@ ***************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class blockout_state : public driver_device { diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h index 3d95c4322d0..2ea566cb5ec 100644 --- a/src/mame/includes/bosco.h +++ b/src/mame/includes/bosco.h @@ -1,14 +1,22 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_BOSCO_H +#define MAME_INCLUDES_BOSCO_H + +#pragma once + +#include "galaga.h" class bosco_state : public galaga_state { public: bosco_state(const machine_config &mconfig, device_type type, const char *tag) - : galaga_state(mconfig, type, tag), - m_bosco_radarattr(*this, "bosco_radarattr"), - m_bosco_starcontrol(*this, "starcontrol"), - m_bosco_starblink(*this, "bosco_starblink") { } + : galaga_state(mconfig, type, tag) + , m_bosco_radarattr(*this, "bosco_radarattr") + , m_bosco_starcontrol(*this, "starcontrol") + , m_bosco_starblink(*this, "bosco_starblink") + { + } required_shared_ptr m_bosco_radarattr; @@ -39,3 +47,5 @@ public: DECLARE_WRITE8_MEMBER( bosco_scrolly_w ); DECLARE_WRITE8_MEMBER( bosco_starclr_w ); }; + +#endif // MAME_INCLUDES_BOSCO_H diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 4d4cef6df61..05e3d7b8232 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class btime_state : public driver_device { diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index 1bddac79adf..7e4f2a55722 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -13,6 +13,7 @@ #include "video/tlc34076.h" #include "sound/bsmt2000.h" #include "machine/nvram.h" +#include "screen.h" class btoads_state : public driver_device { diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 29384d653e5..4316a424d2f 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -7,6 +7,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" #include "sound/msm5232.h" +#include "screen.h" class buggychl_state : public driver_device { diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 633e089c7b9..2cffa30c5c7 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -10,6 +10,7 @@ #include "machine/nvram.h" #include "machine/watchdog.h" #include "video/tms34061.h" +#include "screen.h" class capbowl_state : public driver_device { diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 55c4e0c803e..d0191eff62c 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "machine/nmk112.h" #include "sound/okim6295.h" +#include "screen.h" struct sprite_cave { diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index c1f2008935d..a5d15811c47 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -8,6 +8,7 @@ #include "cpu/m6502/m6502.h" #include "machine/x2212.h" +#include "screen.h" class ccastles_state : public driver_device { diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index cbbc8ecd310..a34601cbd05 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -11,6 +11,7 @@ #include "machine/z80ctc.h" #include "sound/dac.h" #include "video/vector.h" +#include "screen.h" class cchasm_state : public driver_device { diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 066f66c8159..552e0354600 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -8,6 +8,7 @@ #include "machine/eepromser.h" #include "sound/ay8910.h" +#include "screen.h" class centiped_state : public driver_device { diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index 025a661153c..74928fe0e5a 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -2,6 +2,7 @@ // copyright-holders:Jarek Burczynski, Phil Stroffolino, Tomasz Slanina #include "cpu/m6805/m68705.h" +#include "screen.h" class changela_state : public driver_device diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 260b3548562..02ddeeac82e 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/dac.h" +#include "screen.h" class cheekyms_state : public driver_device { diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index fa1e2680c72..b7d615a0c5a 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -6,23 +6,26 @@ *************************************************************************/ +#include "cpu/ccpu/ccpu.h" #include "sound/ay8910.h" #include "sound/samples.h" #include "video/vector.h" +#include "screen.h" class cinemat_state : public driver_device { public: cinemat_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ay1(*this, "ay1"), - m_samples(*this, "samples"), - m_vector(*this, "vector"), - m_screen(*this, "screen"), - m_rambase(*this, "rambase"), - m_analog_x(*this, "ANALOGX"), - m_analog_y(*this, "ANALOGY") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ay1(*this, "ay1") + , m_samples(*this, "samples") + , m_vector(*this, "vector") + , m_screen(*this, "screen") + , m_rambase(*this, "rambase") + , m_analog_x(*this, "ANALOGX") + , m_analog_y(*this, "ANALOGY") + { } required_device m_maincpu; optional_device m_ay1; diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index 9473b8ed5de..a44eb5edaaf 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Coates #include "sound/discrete.h" +#include "sound/samples.h" class circus_state : public driver_device { diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index c30abf3864b..d000b648521 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -8,6 +8,7 @@ #include "machine/ticket.h" #include "machine/watchdog.h" #include "video/ms1_tmap.h" +#include "screen.h" class cischeat_state : public driver_device { diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 24c68e91257..f890300d75f 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -5,6 +5,7 @@ Atari Cloak & Dagger hardware *************************************************************************/ +#include "screen.h" class cloak_state : public driver_device { diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 2c9da3929ff..a1a4c6f60c4 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -8,6 +8,7 @@ #include "cpu/m6502/m6502.h" #include "machine/x2212.h" +#include "screen.h" class cloud9_state : public driver_device { diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 0f460d290ac..affa7c3b395 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -14,6 +14,7 @@ #include "machine/deco146.h" #include "machine/deco104.h" #include "machine/gen_latch.h" +#include "screen.h" class cninja_state : public driver_device { diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index d762be420e2..225de7d2416 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -10,6 +10,7 @@ #include "sound/upd7759.h" #include "sound/msm5205.h" #include "video/k007121.h" +#include "screen.h" class combatsc_state : public driver_device { diff --git a/src/mame/includes/concept.h b/src/mame/includes/concept.h index 28fe888b02f..8a2ce42fc41 100644 --- a/src/mame/includes/concept.h +++ b/src/mame/includes/concept.h @@ -10,14 +10,14 @@ * ****************************************************************************/ -#ifndef CONCEPT_H_ -#define CONCEPT_H_ +#ifndef MAME_INCLUDES_CONCEPT_H +#define MAME_INCLUDES_CONCEPT_H #include "cpu/m68000/m68000.h" #include "machine/6522via.h" #include "machine/mos6551.h" #include "machine/mm58274c.h" /* mm58274 seems to be compatible with mm58174 */ -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "bus/a2bus/a2bus.h" #define ACIA_0_TAG "acia0" @@ -68,4 +68,4 @@ public: void concept_set_interrupt(int level, int state); }; -#endif /* CONCEPT_H_ */ +#endif // MAME_INCLUDES_CONCEPT_H diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 569d8ac48a5..aa44759ebce 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "video/k007121.h" +#include "screen.h" class contra_state : public driver_device { diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 3808233cbe4..97e09fbd391 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" class copsnrob_state : public driver_device diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 81b5bd93339..a8f91277fd2 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -8,6 +8,7 @@ #include "sound/samples.h" #include "sound/dac.h" +#include "screen.h" #define COSMICG_MASTER_CLOCK XTAL_9_828MHz #define Z80_MASTER_CLOCK XTAL_10_816MHz diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h index ad558efc0f3..c6042ae8356 100644 --- a/src/mame/includes/cosmicos.h +++ b/src/mame/includes/cosmicos.h @@ -1,17 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_COSMICOS_H +#define MAME_INCLUDES_COSMICOS_H -#ifndef __COSMICOS__ -#define __COSMICOS__ +#pragma once #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" -#include "machine/ram.h" #include "imagedev/snapquik.h" +#include "machine/ram.h" #include "machine/rescap.h" #include "sound/cdp1864.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/dm9368.h" #define CDP1802_TAG "ic19" @@ -136,4 +136,4 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(int_tick); }; -#endif +#endif // MAME_INCLUDES_COSMICOS_H diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 2c6b443f99b..7191b8815ee 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -15,6 +15,7 @@ #include "machine/gen_latch.h" #include "machine/timekpr.h" #include "cpu/m68000/m68000.h" +#include "screen.h" // Video raw params // measured clocks: diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 556687d746a..26910602969 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -10,6 +10,7 @@ #include "sound/tms5110.h" #include "machine/gen_latch.h" #include "machine/s2636.h" +#include "screen.h" #define CVS_S2636_Y_OFFSET (-5) #define CVS_S2636_X_OFFSET (-26) diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 397b31f0e35..d02c60ae628 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -12,6 +12,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "sound/dac.h" +#include "screen.h" class cyberbal_state : public atarigen_state { diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h index d1386f79233..0a92fadb658 100644 --- a/src/mame/includes/cybiko.h +++ b/src/mame/includes/cybiko.h @@ -14,22 +14,24 @@ * ****************************************************************************/ -#ifndef CYBIKO_H_ -#define CYBIKO_H_ +#ifndef MAME_INCLUDES_CYBIKO_H +#define MAME_INCLUDES_CYBIKO_H -/* Core includes */ -#include "sound/speaker.h" - -/* Components */ -#include "cpu/h8/h8s2320.h" #include "cpu/h8/h8s2245.h" -#include "video/hd66421.h" -#include "machine/pcf8593.h" +#include "cpu/h8/h8s2320.h" + +#include "imagedev/snapquik.h" + #include "machine/at45dbxx.h" #include "machine/intelfsh.h" -#include "machine/ram.h" -#include "imagedev/snapquik.h" #include "machine/nvram.h" +#include "machine/pcf8593.h" +#include "machine/ram.h" + +#include "sound/spkrdev.h" + +#include "video/hd66421.h" + class cybiko_state : public driver_device { @@ -80,4 +82,4 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER( cybikoxt ); }; -#endif /* CYBIKO_H_ */ +#endif // MAME_INCLUDES_CYBIKO_H diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 33eff4e49a9..2cfb54918e5 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Nicola Salmoria, Tomasz Slanina #include "audio/t5182.h" +#include "screen.h" class darkmist_state : public driver_device { diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 37d9f304f50..b03738bebd7 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -5,9 +5,10 @@ dc.h - Sega Dreamcast includes */ +#ifndef MAME_INCLUDES_DC_H +#define MAME_INCLUDES_DC_H -#ifndef __DC_H__ -#define __DC_H__ +#pragma once #include "video/powervr2.h" #include "machine/naomig1.h" @@ -286,4 +287,4 @@ class dc_state : public driver_device void dc_maple_irq(running_machine &machine); -#endif +#endif // MAME_INCLUDES_DC_H diff --git a/src/mame/includes/dccons.h b/src/mame/includes/dccons.h index 90767a3219b..e8fd00ac0ea 100644 --- a/src/mame/includes/dccons.h +++ b/src/mame/includes/dccons.h @@ -1,5 +1,12 @@ // license:LGPL-2.1+ // copyright-holders:Angelo Salese, R. Belmont +#ifndef MAME_INCLUDES_DCCONS_H +#define MAME_INCLUDES_DCCONS_H + +#pragma once + +#include "dc.h" + #include "imagedev/chd_cd.h" #include "machine/gdrom.h" #include "machine/ataintf.h" @@ -9,10 +16,10 @@ class dc_cons_state : public dc_state { public: dc_cons_state(const machine_config &mconfig, device_type type, const char *tag) - : dc_state(mconfig, type, tag), - m_ata(*this, "ata") -// m_dcflash(*this, "dcflash") - { } + : dc_state(mconfig, type, tag) + , m_ata(*this, "ata") +// , m_dcflash(*this, "dcflash") + { } required_device m_ata; // required_device m_dcflash; @@ -45,3 +52,5 @@ private: emu_timer *atapi_timer; int atapi_xferlen, atapi_xferbase; }; + +#endif // MAME_INCLUDES_DCCONS_H diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index 853a3b46a83..56815c02fc1 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "sound/bsmt2000.h" +#include "screen.h" class dcheese_state : public driver_device { diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 78bc9c5e769..405a9db04a9 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -5,6 +5,7 @@ D-Day *************************************************************************/ +#include "screen.h" class dday_state : public driver_device diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index caf4cce2bd4..a0b1195b606 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -9,6 +9,7 @@ #include "cpu/m6805/m68705.h" #include "machine/gen_latch.h" #include "sound/msm5205.h" +#include "screen.h" class ddragon_state : public driver_device diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index a3015588a8e..994b2194d78 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -10,6 +10,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/bufsprite.h" +#include "screen.h" class ddragon3_state : public driver_device diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 07938191fdb..70e7a9d0efb 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -11,6 +11,7 @@ #include "machine/deco146.h" #include "machine/deco104.h" #include "video/deco_zoomspr.h" +#include "screen.h" class deco32_state : public driver_device { diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 2299e477953..39147574b49 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -3,6 +3,7 @@ #include "machine/eepromser.h" #include "machine/deco146.h" #include "sound/ymz280b.h" +#include "screen.h" class deco_mlc_state : public driver_device diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index a4f15a59a7e..89f7e80b338 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "cpu/mcs48/mcs48.h" +#include "screen.h" #define T1PROM 1 #define T1DIRECT 2 diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 0bb1b607c84..476ea44d13b 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -13,6 +13,7 @@ #include "machine/latch8.h" #include "machine/z80dma.h" #include "machine/i8257.h" +#include "screen.h" /* diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 91f9213b953..5556dfa1115 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#include "screen.h" #define PIXMAP_COLOR_BASE (16 + 32) #define BITMAPRAM_SIZE 0x6000 diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index b1b30922fba..44da12b5215 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria,Vas Crabb #include "video/bufsprite.h" +#include "screen.h" #define MCFG_DOOYONG_ROM_TILEMAP_ADD(tag, gfx, num, rom, offset) \ MCFG_DEVICE_ADD(tag, DOOYONG_ROM_TILEMAP, 0) \ diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 3ac2799f2f1..9e6bdd89434 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define DRAGRACE_SCREECH1_EN NODE_01 diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index a7f51f4c157..b3c2e13b5a4 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -9,6 +9,7 @@ #include "sound/ym2413.h" #include "sound/msm5205.h" #include "sound/okim6295.h" +#include "screen.h" class dynax_state : public driver_device { diff --git a/src/mame/includes/einstein.h b/src/mame/includes/einstein.h index 43b646f7eac..92f4d88220d 100644 --- a/src/mame/includes/einstein.h +++ b/src/mame/includes/einstein.h @@ -17,6 +17,7 @@ #include "machine/ram.h" #include "machine/i8251.h" #include "bus/centronics/ctronics.h" +#include "screen.h" /*************************************************************************** CONSTANTS diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 5d2e859d8e6..d3c6e370ee6 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -3,6 +3,7 @@ #include "cpu/mcs51/mcs51.h" #include "sound/qs1000.h" +#include "screen.h" class eolith_state : public driver_device { diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 5de0b388de1..28e088e00fc 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -11,6 +11,7 @@ #include "sound/samples.h" #include "sound/msm5232.h" #include "sound/dac.h" +#include "screen.h" class equites_state : public driver_device diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index f9cae07081e..7730ea20306 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -14,6 +14,7 @@ #include "cpu/esrip/esrip.h" #include "sound/dac.h" #include "sound/tms5220.h" +#include "screen.h" /* TODO */ #define ESRIPSYS_PIXEL_CLOCK (XTAL_25MHz / 2) diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index aab5368576f..0973895ad93 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -5,6 +5,7 @@ Jaleco Exerion *************************************************************************/ +#include "screen.h" #define EXERION_MASTER_CLOCK (XTAL_19_968MHz) /* verified on pcb */ diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index fbc7037fb7b..a3a872b862f 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -8,6 +8,7 @@ #include "sound/dac.h" #include "sound/samples.h" +#include "screen.h" #define EXIDY_MASTER_CLOCK (XTAL_11_289MHz) #define EXIDY_CPU_CLOCK (EXIDY_MASTER_CLOCK / 16) diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 2bc62bdfbc0..832c56512ac 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "audio/exidy440.h" +#include "screen.h" #define EXIDY440_MASTER_CLOCK (XTAL_12_9792MHz) diff --git a/src/mame/includes/exp85.h b/src/mame/includes/exp85.h index 3e53385eb25..f725df7f942 100644 --- a/src/mame/includes/exp85.h +++ b/src/mame/includes/exp85.h @@ -1,11 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __EXP85__ -#define __EXP85__ +#ifndef MAME_INCLUDES_EXP85_H +#define MAME_INCLUDES_EXP85_H #include "bus/rs232/rs232.h" #include "imagedev/cassette.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define SCREEN_TAG "screen" #define I8085A_TAG "u100" @@ -44,4 +44,4 @@ public: int m_tape_control; }; -#endif +#endif // MAME_INCLUDES_EXP85_H diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index bab9f3dc0d0..64c308e94e8 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" +#include "screen.h" class fantland_state : public driver_device { diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index ee381a61431..412e0480447 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -8,6 +8,7 @@ #include "sound/k007232.h" #include "video/k007121.h" #include "video/k051733.h" +#include "screen.h" class fastlane_state : public driver_device { diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 427e281b05c..9001237de66 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch #include "machine/mb14241.h" +#include "screen.h" class fgoal_state : public driver_device { diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 27f6c20aaac..f41e376d16c 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -8,6 +8,7 @@ Atari Fire Truck + Super Bug + Monte Carlo driver #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" #define FIRETRUCK_MOTOR_DATA NODE_01 #define FIRETRUCK_HORN_EN NODE_02 diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h index cb85294f8a7..c7342c0bc86 100644 --- a/src/mame/includes/fmtowns.h +++ b/src/mame/includes/fmtowns.h @@ -1,27 +1,31 @@ // license:BSD-3-Clause // copyright-holders:Barry Rodewald -#ifndef FMTOWNS_H_ -#define FMTOWNS_H_ +#ifndef MAME_INCLUDES_FMTOWNS_H +#define MAME_INCLUDES_FMTOWNS_H +#pragma once #include "cpu/i386/i386.h" -#include "sound/2612intf.h" -#include "sound/rf5c68.h" -#include "sound/cdda.h" -#include "sound/speaker.h" #include "imagedev/chd_cd.h" -#include "machine/pit8253.h" -#include "machine/pic8259.h" -#include "machine/wd_fdc.h" #include "imagedev/floppy.h" -#include "formats/fmtowns_dsk.h" -#include "machine/upd71071.h" -#include "machine/ram.h" -#include "machine/nvram.h" #include "machine/fm_scsi.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" #include "machine/fmt_icmem.h" +#include "machine/nvram.h" +#include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ram.h" +#include "machine/upd71071.h" +#include "machine/wd_fdc.h" +#include "sound/2612intf.h" +#include "sound/cdda.h" +#include "sound/rf5c68.h" +#include "sound/spkrdev.h" + +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" + +#include "formats/fmtowns_dsk.h" + #define IRQ_LOG 0 // set to 1 to log IRQ line activity @@ -376,4 +380,4 @@ class marty_state : public towns_state virtual void driver_start() override; }; -#endif /*FMTOWNS_H_*/ +#endif // MAME_INCLUDES_FMTOWNS_H diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 4f1256bbce3..3c129b8ac8b 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -10,6 +10,7 @@ ***************************************************************************/ #include "sound/msm5205.h" #include "video/vsystem_spr2.h" +#include "screen.h" class fromance_state : public driver_device { diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 58bdc8469d5..0b26bd13862 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/fuukifg.h" +#include "screen.h" class fuuki16_state : public driver_device { diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 206c61596b8..e9f890b6689 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Paul Priest, David Haywood, Luca Elia #include "video/fuukifg.h" +#include "screen.h" /* Define clocks based on actual OSC on the PCB */ diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index a0ef4eb7a38..48ed08c6025 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -13,6 +13,7 @@ #include "machine/eepromser.h" #include "machine/gaelco3d.h" #include "cpu/adsp2100/adsp2100.h" +#include "screen.h" #define SOUND_CHANNELS 4 diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 42f21e31e3a..cac1ce9c0ca 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -10,6 +10,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" +#include "screen.h" class gaiden_state : public driver_device { diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index c09789d229e..93abfddf3d5 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -1,8 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_GALAGA_H +#define MAME_INCLUDES_GALAGA_H + +#pragma once + #include "sound/discrete.h" #include "sound/namco.h" #include "sound/samples.h" +#include "screen.h" class galaga_state : public driver_device { @@ -92,3 +98,5 @@ public: DISCRETE_SOUND_EXTERN( galaga ); DISCRETE_SOUND_EXTERN( bosco ); + +#endif // MAME_INCLUDES_GALAGA_H diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 2a19deee35b..28e39178006 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -7,6 +7,8 @@ #include "video/tc0100scn.h" #include "video/tc0480scp.h" +#include "screen.h" + class galastrm_state; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index 2111dd44330..0fd658ed4a1 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -11,6 +11,7 @@ #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/digitalk.h" +#include "screen.h" /* we scale horizontally by 3 to render stars correctly */ #define GALAXIAN_XSCALE 3 diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 2443de6202b..ecc85ead4f9 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -16,6 +16,7 @@ #define __GALAXOLD_H__ #include "machine/7474.h" +#include "screen.h" /* star circuit */ #define STAR_COUNT 252 diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index a89502da913..f14c0288f0f 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "includes/kaneko16.h" +#include "screen.h" class galpanic_state : public driver_device { diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 8ff4e9f9aad..37cb1e77b91 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -10,6 +10,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" +#include "screen.h" class galspnbl_state : public driver_device { diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index daa9386df31..18e1a353e36 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -11,6 +11,7 @@ driver by Chris Moore #include "machine/6522via.h" #include "machine/6532riot.h" #include "machine/gen_latch.h" +#include "screen.h" #define GAMEPLAN_MAIN_MASTER_CLOCK (XTAL_3_579545MHz) #define GAMEPLAN_AUDIO_MASTER_CLOCK (XTAL_3_579545MHz) diff --git a/src/mame/includes/gamepock.h b/src/mame/includes/gamepock.h index 77fe43e7924..067116f4f7d 100644 --- a/src/mame/includes/gamepock.h +++ b/src/mame/includes/gamepock.h @@ -1,9 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol -#ifndef _GAMEPOCK_H_ -#define _GAMEPOCK_H_ -#include "sound/speaker.h" +#ifndef MAME_INCLUDES_GAMEPOCK_H +#define MAME_INCLUDES_GAMEPOCK_H + +#pragma once + #include "bus/generic/slot.h" +#include "sound/spkrdev.h" struct HD44102CH { uint8_t enabled; @@ -21,7 +24,7 @@ public: m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), m_cart(*this, "cartslot") - { } + { } virtual void machine_reset() override; @@ -44,4 +47,4 @@ public: DECLARE_WRITE_LINE_MEMBER(gamepock_to_w); }; -#endif +#endif // MAME_INCLUDES_GAMEPOCK_H diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index ba2924775a9..46e510ad8e9 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -3,6 +3,7 @@ #include "sound/namco.h" #include "sound/samples.h" #include "machine/namcoio.h" +#include "screen.h" #define MAX_STARS 250 diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 0bbf5020616..45d0f80040a 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi, David Haywood +#include "screen.h" class gomoku_state : public driver_device { diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index efb49c910f6..a122feb3f84 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -11,6 +11,7 @@ #include "cpu/m6502/m6502.h" #include "sound/samples.h" #include "machine/ldpr8210.h" +#include "screen.h" #define GOTTLIEB_VIDEO_HCOUNT 318 diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 129a12abfe3..32790312286 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" class grchamp_state : public driver_device { diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index cfe35ad79f2..81c3dc3c1a5 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -9,17 +9,18 @@ ***************************************************************************/ #include "sound/samples.h" +#include "screen.h" #define GRIDLEE_MASTER_CLOCK (20000000) #define GRIDLEE_CPU_CLOCK (GRIDLEE_MASTER_CLOCK / 16) -#define GRIDLEE_PIXEL_CLOCK (GRIDLEE_MASTER_CLOCK / 4) +#define GRIDLEE_PIXEL_CLOCK (GRIDLEE_MASTER_CLOCK / 4) #define GRIDLEE_HTOTAL (0x140) #define GRIDLEE_HBEND (0x000) -#define GRIDLEE_HBSTART (0x100) +#define GRIDLEE_HBSTART (0x100) #define GRIDLEE_VTOTAL (0x108) #define GRIDLEE_VBEND (0x010) -#define GRIDLEE_VBSTART (0x100) +#define GRIDLEE_VBSTART (0x100) class gridlee_state : public driver_device diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index cbc07047908..83251a3d6c4 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -8,6 +8,7 @@ #include "video/vsystem_spr.h" #include "video/mb60553.h" #include "video/vs920a.h" +#include "screen.h" diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index d4b9e9dfc8f..acea4589292 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" class gyruss_state : public driver_device { diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 1ed1894258a..0fc04b04faa 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -17,6 +17,7 @@ #include "machine/asic65.h" #include "machine/timekpr.h" #include "bus/rs232/rs232.h" +#include "screen.h" #define HARDDRIV_MASTER_CLOCK XTAL_32MHz #define HARDDRIV_GSP_CLOCK XTAL_48MHz diff --git a/src/mame/includes/hh_tms1k.h b/src/mame/includes/hh_tms1k.h index a6b3093f169..8b680278876 100644 --- a/src/mame/includes/hh_tms1k.h +++ b/src/mame/includes/hh_tms1k.h @@ -6,8 +6,10 @@ */ -#ifndef _HH_TMS1K_H_ -#define _HH_TMS1K_H_ +#ifndef MAME_INCLUDES_HH_TMS1K_H +#define MAME_INCLUDES_HH_TMS1K_H + +#pragma once #include "cpu/tms1000/tms1000.h" #include "cpu/tms1000/tms1100.h" @@ -16,7 +18,7 @@ #include "cpu/tms1000/tms0980.h" #include "cpu/tms1000/tms0270.h" #include "cpu/tms1000/tp0320.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" class hh_tms1k_state : public driver_device @@ -87,5 +89,4 @@ enum lDP = 0x80 }; - -#endif /* _HH_TMS1K_H_ */ +#endif // MAME_INCLUDES_HH_TMS1K_H diff --git a/src/mame/includes/hh_ucom4.h b/src/mame/includes/hh_ucom4.h index 9fe5346c1b3..3fbbdc3d63d 100644 --- a/src/mame/includes/hh_ucom4.h +++ b/src/mame/includes/hh_ucom4.h @@ -6,12 +6,13 @@ */ -#ifndef _HH_UCOM4_H_ -#define _HH_UCOM4_H_ +#ifndef MAME_INCLUDES_HH_UCOM4_H +#define MAME_INCLUDES_HH_UCOM4_H -#include "rendlay.h" #include "cpu/ucom4/ucom4.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + +#include "rendlay.h" class hh_ucom4_state : public driver_device @@ -66,4 +67,4 @@ protected: }; -#endif /* _HH_UCOM4_H_ */ +#endif // MAME_INCLUDES_HH_UCOM4_H diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index f0da17cd826..b8dbe02a33b 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define HITME_DOWNCOUNT_VAL NODE_01 diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 212445d9035..84fb806ade4 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -6,6 +6,7 @@ #include "sound/l7a1045_l6028_dsp_a.h" #include "video/poly.h" #include "cpu/tlcs870/tlcs870.h" +#include "screen.h" enum { diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 17c5f193ed8..6d5492b7089 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -8,6 +8,7 @@ #include "sound/upd7759.h" #include "sound/samples.h" +#include "screen.h" class homerun_state : public driver_device { diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h index 8dc44ca5f0c..43679131240 100644 --- a/src/mame/includes/hp9845.h +++ b/src/mame/includes/hp9845.h @@ -10,6 +10,7 @@ #include "machine/hp_taco.h" #include "sound/beep.h" #include "bus/hp9845_io/hp9845_io.h" +#include "screen.h" class hp9845b_state : public driver_device { diff --git a/src/mame/includes/hx20.h b/src/mame/includes/hx20.h index ed2c9908a15..5660bb4edf2 100644 --- a/src/mame/includes/hx20.h +++ b/src/mame/includes/hx20.h @@ -1,18 +1,20 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_HX20_H +#define MAME_INCLUDES_HX20_H -#ifndef __HX20__ -#define __HX20__ +#pragma once -#include "bus/rs232/rs232.h" #include "cpu/m6800/m6800.h" #include "imagedev/cassette.h" -#include "bus/epson_sio/epson_sio.h" #include "machine/mc146818.h" #include "machine/ram.h" +#include "sound/spkrdev.h" #include "video/upd7227.h" -#include "sound/speaker.h" + +#include "bus/epson_sio/epson_sio.h" +#include "bus/rs232/rs232.h" + #include "rendlay.h" #define HD6301V1_MAIN_TAG "8g" @@ -136,4 +138,4 @@ public: int m_sio_pin; }; -#endif +#endif // MAME_INCLUDES_HX20_H diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index db90ecb3da5..062d4302843 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class hyhoo_state : public driver_device { diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index cf12605adba..125d322f799 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, Hau +#include "screen.h" + #define RASTER_LINES 262 #define FIRST_VISIBLE_LINE 0 #define LAST_VISIBLE_LINE 223 diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 20736d3b901..334191bd1fd 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -5,6 +5,7 @@ Ikki *************************************************************************/ +#include "screen.h" class ikki_state : public driver_device { diff --git a/src/mame/includes/intv.h b/src/mame/includes/intv.h index 76331eb9929..f2fbc853b9f 100644 --- a/src/mame/includes/intv.h +++ b/src/mame/includes/intv.h @@ -6,14 +6,16 @@ * ****************************************************************************/ -#ifndef INTV_H_ -#define INTV_H_ +#ifndef MAME_INCLUDES_INTV_H +#define MAME_INCLUDES_INTV_H #include "sound/ay8910.h" #include "video/stic.h" +#include "video/tms9927.h" + +#include "bus/intv/ecs.h" #include "bus/intv/slot.h" #include "bus/intv/voice.h" -#include "bus/intv/ecs.h" //#include "bus/intv/keycomp.h" #include "bus/intv_ctrl/ctrl.h" @@ -133,4 +135,4 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; -#endif /* INTV_H_ */ +#endif // MAME_INCLUDES_INTV_H diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 7be6de066a5..f648a5e3e78 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -1,6 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi +#ifndef MAME_INCLUDES_INUFUKU_H +#define MAME_INCLUDES_INUFUKU_H +#include "video/vsystem_spr.h" #include "machine/gen_latch.h" class inufuku_state : public driver_device @@ -69,3 +72,5 @@ public: uint32_t screen_update_inufuku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_inufuku(screen_device &screen, bool state); }; + +#endif // MAME_INCLUDES_INUFUKU_H diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 2c599547cea..24c53f820cd 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -5,6 +5,7 @@ Atari I, Robot hardware *************************************************************************/ +#include "screen.h" #define IR_TIMING 1 /* try to emulate MB and VG running time */ diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 9fc8ceca0a3..7256954e37f 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -8,6 +8,7 @@ **************************************************************************/ #include "machine/nvram.h" +#include "screen.h" #define VIDEO_CLOCK XTAL_8MHz /* video (pixel) clock */ #define CPU_CLOCK XTAL_12MHz /* clock for 68000-based systems */ diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index c0e687ae953..af41e454fbe 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -10,6 +10,7 @@ #include "machine/ticket.h" #include "video/tlc34076.h" #include "video/tms34061.h" +#include "screen.h" #define YBUFFER_COUNT 15 diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index d4f0df5b025..e6e3de94b0e 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -14,6 +14,7 @@ #include "imagedev/snapquik.h" #include "cdrom.h" #include "imagedev/chd_cd.h" +#include "screen.h" #ifndef ENABLE_SPEEDUP_HACKS #define ENABLE_SPEEDUP_HACKS 1 diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 05f17acad2c..d4619c83778 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -6,6 +6,8 @@ *************************************************************************/ +#include "screen.h" + /* oscillators and clocks */ #define JEDI_MAIN_CPU_OSC (XTAL_10MHz) @@ -21,7 +23,7 @@ class jedi_state : public driver_device public: jedi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_nvram(*this, "nvram") , + m_nvram(*this, "nvram") , m_foreground_bank(*this, "foreground_bank"), m_video_off(*this, "video_off"), m_backgroundram(*this, "backgroundram"), @@ -33,7 +35,8 @@ public: m_speech_data(*this, "speech_data"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } required_shared_ptr m_nvram; diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h index e994744ec89..25101aebbc6 100644 --- a/src/mame/includes/kc.h +++ b/src/mame/includes/kc.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef KC_H_ -#define KC_H_ +#ifndef MAME_INCLUDES_KC_H +#define MAME_INCLUDES_KC_H /* Devices */ #include "imagedev/cassette.h" @@ -22,16 +22,13 @@ #include "machine/kc_keyb.h" #include "machine/rescap.h" #include "cpu/z80/z80daisy.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" // Devices #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -// Formats -#include "formats/kc_cas.h" - // Expansions #include "bus/kc/kc.h" #include "bus/kc/ram.h" @@ -39,6 +36,9 @@ #include "bus/kc/d002.h" #include "bus/kc/d004.h" +// Formats +#include "formats/kc_cas.h" + // from service manual #define KC85_3_CLOCK 1751938 #define KC85_4_CLOCK 1773447 @@ -185,4 +185,4 @@ public: uint8_t * m_display_video_ram; }; -#endif /* KC_H_ */ +#endif // MAME_INCLUDES_KC_H diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index 0e92c624323..c626d23fdbe 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" class kncljoe_state : public driver_device { diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 466c0a2e79a..5ba3bf1a2ee 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -1,5 +1,8 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Acho A. Tang, Phil Stroffolino, Olivier Galibert +#ifndef MAME_INCLUDES_KONAMIGX_H +#define MAME_INCLUDES_KONAMIGX_H + #include "sound/k056800.h" #include "sound/k054539.h" #include "cpu/tms57002/tms57002.h" @@ -10,6 +13,7 @@ #include "video/k055555.h" #include "video/k054338.h" #include "video/k053936.h" +#include "screen.h" class konamigx_state : public driver_device { @@ -300,3 +304,5 @@ public: #define GXSUB_4BPP 0x04 // 16 colors #define GXSUB_5BPP 0x05 // 32 colors #define GXSUB_8BPP 0x08 // 256 colors + +#endif // MAME_INCLUDES_KONAMIGX_H diff --git a/src/mame/includes/kyocera.h b/src/mame/includes/kyocera.h index 60c9180dbb3..bfbecb7ebfa 100644 --- a/src/mame/includes/kyocera.h +++ b/src/mame/includes/kyocera.h @@ -1,29 +1,31 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_KYOCERA_H +#define MAME_INCLUDES_KYOCERA_H -#ifndef __KYOCERA__ -#define __KYOCERA__ +#pragma once -#include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" #include "imagedev/cassette.h" #include "machine/buffer.h" -#include "bus/centronics/ctronics.h" #include "machine/i8155.h" #include "machine/i8251.h" #include "machine/im6402.h" #include "machine/ram.h" #include "machine/rp5c01.h" #include "machine/upd1990a.h" +#include "sound/spkrdev.h" #include "video/hd44102.h" #include "video/hd61830.h" -#include "sound/speaker.h" -#include "rendlay.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/centronics/ctronics.h" +#include "bus/rs232/rs232.h" + +#include "rendlay.h" + #define SCREEN_TAG "screen" #define I8085_TAG "m19" @@ -256,4 +258,4 @@ public: MACHINE_CONFIG_EXTERN( kc85_video ); MACHINE_CONFIG_EXTERN( tandy200_video ); -#endif +#endif // MAME_INCLUDES_KYOCERA_H diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index ffeae360ac5..4ec9047a93c 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -8,6 +8,7 @@ #include "video/k007121.h" #include "video/k051733.h" +#include "screen.h" class labyrunr_state : public driver_device { diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 25e72f080c3..84e1774c3f2 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -16,6 +16,8 @@ #include "sound/sn76477.h" #include "sound/tms3615.h" +#include "screen.h" + class laserbat_state_base : public driver_device { diff --git a/src/mame/includes/lc80.h b/src/mame/includes/lc80.h index 730ce855aca..33f03bed358 100644 --- a/src/mame/includes/lc80.h +++ b/src/mame/includes/lc80.h @@ -1,8 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __LC80__ -#define __LC80__ +#ifndef MAME_INCLUDES_LC80_H +#define MAME_INCLUDES_LC80_H +#pragma once #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" @@ -10,7 +11,7 @@ #include "machine/ram.h" #include "machine/z80pio.h" #include "machine/z80ctc.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define SCREEN_TAG "screen" #define Z80_TAG "d201" @@ -64,4 +65,4 @@ public: uint8_t m_segment; }; -#endif +#endif // MAME_INCLUDES_LC80_H diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index d7dc2107d3c..4662cda5e51 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -12,6 +12,7 @@ #include "sound/ay8910.h" #include "machine/pit8253.h" #include "cpu/i86/i186.h" +#include "screen.h" #define LELAND_BATTERY_RAM_SIZE 0x4000 #define ATAXX_EXTRA_TRAM_SIZE 0x800 diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index 38a1229ae1b..6cb1ae765a9 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -5,8 +5,14 @@ The Game Room Lethal Justice hardware **************************************************************************/ +#ifndef MAME_INCLUDES_LETHALJ_H +#define MAME_INCLUDES_LETHALJ_H +#pragma once + +#include "cpu/tms34010/tms34010.h" #include "machine/ticket.h" +#include "screen.h" class lethalj_state : public driver_device @@ -66,3 +72,5 @@ protected: /*----------- defined in video/lethalj.c -----------*/ void lethalj_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); + +#endif // MAME_INCLUDES_LETHALJ_H diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h index 54b8d91f59b..f207b7ed8f8 100644 --- a/src/mame/includes/liberatr.h +++ b/src/mame/includes/liberatr.h @@ -10,6 +10,7 @@ #include "machine/er2055.h" #include "machine/watchdog.h" #include "sound/pokey.h" +#include "screen.h" class liberatr_state : public driver_device { diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h index 2cdff88dc05..176164f4e38 100644 --- a/src/mame/includes/lisa.h +++ b/src/mame/includes/lisa.h @@ -8,17 +8,17 @@ * ****************************************************************************/ -#ifndef LISA_H_ -#define LISA_H_ +#ifndef MAME_INCLUDES_LISA_H +#define MAME_INCLUDES_LISA_H #include "cpu/m68000/m68000.h" #include "machine/6522via.h" -#include "machine/8530scc.h" #include "machine/6522via.h" -#include "machine/nvram.h" +#include "machine/8530scc.h" #include "machine/applefdc.h" +#include "machine/nvram.h" #include "machine/sonydriv.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define COP421_TAG "u9f" #define KB_COP421_TAG "kbcop" @@ -228,4 +228,4 @@ public: void plug_keyboard(); }; -#endif /* LISA_H_ */ +#endif // MAME_INCLUDES_LISA_H diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h index 0fe339bc2e3..38317d538e4 100644 --- a/src/mame/includes/llc.h +++ b/src/mame/includes/llc.h @@ -6,16 +6,16 @@ * ****************************************************************************/ -#ifndef LLC_H_ -#define LLC_H_ +#ifndef MAME_INCLUDES_LLC_H +#define MAME_INCLUDES_LLC_H #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "machine/z80pio.h" -#include "machine/z80ctc.h" -#include "machine/ram.h" #include "machine/k7659kb.h" -#include "sound/speaker.h" +#include "machine/ram.h" +#include "machine/z80ctc.h" +#include "machine/z80pio.h" +#include "sound/spkrdev.h" class llc_state : public driver_device { @@ -27,7 +27,7 @@ public: , m_maincpu(*this, "maincpu") , m_ram(*this, RAM_TAG) , m_p_chargen(*this, "chargen") - { } + { } DECLARE_WRITE8_MEMBER(llc2_rom_disable_w); DECLARE_WRITE8_MEMBER(llc2_basic_enable_w); @@ -61,4 +61,4 @@ private: required_region_ptr m_p_chargen; }; -#endif +#endif // MAME_INCLUDES_LLC_H diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 8bf5b5c3c6c..72ff10a5e9b 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/flt_vol.h" +#include "screen.h" /* Calculated from CRT controller writes */ #define PIXEL_CLOCK (XTAL_21MHz / 3) diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index f6223bfb467..10c4f748b3a 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -8,6 +8,7 @@ #include "sound/okim6295.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" +#include "screen.h" struct lordgun_gun_data { diff --git a/src/mame/includes/lviv.h b/src/mame/includes/lviv.h index d0df88e47e5..5f0a314d9d7 100644 --- a/src/mame/includes/lviv.h +++ b/src/mame/includes/lviv.h @@ -6,14 +6,14 @@ * ****************************************************************************/ -#ifndef LVIV_H_ -#define LVIV_H_ +#ifndef MAME_INCLUDES_LVIV_H +#define MAME_INCLUDES_LVIV_H +#include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/i8255.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" #include "machine/ram.h" +#include "sound/spkrdev.h" class lviv_state : public driver_device { @@ -67,4 +67,4 @@ public: extern const unsigned char lviv_palette[8*3]; -#endif /* LVIV_H_ */ +#endif /* MAME_INCLUDES_LVIV_H */ diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 68947e65a22..adfad1d2840 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -8,6 +8,7 @@ #include "sound/samples.h" #include "machine/74123.h" +#include "screen.h" #define IREMM10_MASTER_CLOCK (12500000) diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 300122bc7c1..55f2ef9b971 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "machine/pic8259.h" +#include "screen.h" struct pf_layer_info { diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h index d4671e14211..758020efa9d 100644 --- a/src/mame/includes/m5.h +++ b/src/mame/includes/m5.h @@ -1,11 +1,19 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Ales Dlabac -#ifndef __M5__ -#define __M5__ +#ifndef MAME_INCLUDES_M5_H +#define MAME_INCLUDES_M5_H +#include "imagedev/cassette.h" +#include "imagedev/snapquik.h" +#include "machine/i8255.h" +#include "machine/ram.h" +#include "machine/upd765.h" +#include "machine/wd_fdc.h" //brno mod #include "machine/z80ctc.h" -#include "imagedev/snapquik.h" + +#include "bus/centronics/ctronics.h" +#include "bus/m5/slot.h" #define Z80_TAG "ic17" @@ -27,20 +35,20 @@ class m5_state : public driver_device { public: m5_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, Z80_TAG), - m_ctc(*this, Z80CTC_TAG), - m_fd5cpu(*this, Z80_FD5_TAG), - m_ppi(*this, I8255A_TAG), - m_fdc(*this, UPD765_TAG), - m_floppy0(*this, UPD765_TAG ":0:525dd"), - m_cassette(*this, "cassette"), - m_cart1(*this, "cartslot1"), - m_cart2(*this, "cartslot2"), - m_centronics(*this, CENTRONICS_TAG), - m_ram(*this, RAM_TAG), - m_reset(*this, "RESET"), - m_DIPS(*this, "DIPS") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, Z80_TAG) + , m_ctc(*this, Z80CTC_TAG) + , m_fd5cpu(*this, Z80_FD5_TAG) + , m_ppi(*this, I8255A_TAG) + , m_fdc(*this, UPD765_TAG) + , m_floppy0(*this, UPD765_TAG ":0:525dd") + , m_cassette(*this, "cassette") + , m_cart1(*this, "cartslot1") + , m_cart2(*this, "cartslot2") + , m_centronics(*this, CENTRONICS_TAG) + , m_ram(*this, RAM_TAG) + , m_reset(*this, "RESET") + , m_DIPS(*this, "DIPS") { } required_device m_maincpu; @@ -162,4 +170,4 @@ public: uint8_t m_rammap[16]; // memory map }; -#endif +#endif // MAME_INCLUDES_M5_H diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 40fdc64441e..2e3dea662a7 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#include "screen.h" + class m52_state : public driver_device { public: diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 9ee93e40a6d..0c33a1bdaf4 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -6,6 +6,7 @@ Irem M58 hardware ****************************************************************************/ +#include "screen.h" class m58_state : public driver_device { diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 7743a15c0ab..fcff4577bc6 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -8,6 +8,7 @@ #include "audio/m72.h" #include "sound/dac.h" #include "machine/pic8259.h" +#include "screen.h" #define M81_B_B_JUMPER_J3_S \ PORT_START("JumperJ3") \ diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index e2a07831ccd..1d83a93617b 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -10,6 +10,7 @@ #include "sound/okim6295.h" #include "machine/gen_latch.h" #include "machine/pic8259.h" +#include "screen.h" struct M92_pf_layer_info { diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h index f376e297e43..20ad7bf9a29 100644 --- a/src/mame/includes/mac.h +++ b/src/mame/includes/mac.h @@ -26,6 +26,7 @@ #include "sound/awacs.h" #include "sound/dac.h" #include "cpu/m68000/m68000.h" +#include "screen.h" #define MAC_SCREEN_NAME "screen" #define MAC_539X_1_TAG "539x_1" diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index e2979d5210e..5d5ccd5d2ba 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -8,6 +8,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class macrossp_state : public driver_device { diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index fbc69168ace..d73e7398371 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi +#include "screen.h" + class magmax_state : public driver_device { public: diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 2b3f2574865..a5493ef4472 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -8,6 +8,7 @@ #include "machine/s2636.h" #include "video/saa5050.h" +#include "screen.h" class malzak_state : public driver_device { diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index ea1b92f7f1d..e74bd66579a 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -3,6 +3,7 @@ #include "machine/namcoio.h" #include "sound/dac.h" #include "sound/namco.h" +#include "screen.h" class mappy_state : public driver_device { diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index fe2da57d832..20d51f0a958 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -4,6 +4,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" +#include "screen.h" class matmania_state : public driver_device { diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h index 9bd469f27fb..34a8dda827f 100644 --- a/src/mame/includes/mbc55x.h +++ b/src/mame/includes/mbc55x.h @@ -7,21 +7,28 @@ Phill Harvey-Smith 2011-01-29. */ +#ifndef MAME_INCLUDES_MBC55X_H +#define MAME_INCLUDES_MBC55X_H + +#pragma once -#include "cpu/i86/i86.h" -#include "machine/ram.h" #include "bus/centronics/ctronics.h" +#include "cpu/i86/i86.h" +#include "imagedev/flopdrv.h" +#include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ram.h" #include "machine/wd_fdc.h" -#include "machine/i8251.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/mc6845.h" -#include "imagedev/flopdrv.h" -#include "formats/pc_dsk.h" -#include "debugger.h" + #include "debug/debugcon.h" +#include "debugger.h" + +#include "formats/pc_dsk.h" + #define MAINCPU_TAG "maincpu" @@ -220,3 +227,5 @@ extern const unsigned char mbc55x_palette[SCREEN_NO_COLOURS][3]; #define LINEAR_ADDR(seg,ofs) ((seg<<4)+ofs) #define OUTPUT_SEGOFS(mess,seg,ofs) logerror("%s=%04X:%04X [%08X]\n",mess,seg,ofs,((seg<<4)+ofs)) + +#endif // MAME_INCLUDES_MBC55X_H diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index a509cb2bdec..fe91bd4cbf8 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -6,22 +6,29 @@ * ****************************************************************************/ -#ifndef MBEE_H_ -#define MBEE_H_ +#ifndef MAME_INCLUDES_MBEE_H +#define MAME_INCLUDES_MBEE_H +#include "bus/centronics/ctronics.h" + +#include "cpu/z80/z80.h" +#include "cpu/z80/z80daisy.h" + +#include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "machine/z80pio.h" + #include "machine/8530scc.h" -#include "imagedev/cassette.h" #include "machine/buffer.h" -#include "bus/centronics/ctronics.h" #include "machine/mc146818.h" -#include "video/mc6845.h" -#include "sound/speaker.h" -#include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" -#include "sound/wave.h" #include "machine/wd_fdc.h" +#include "machine/z80pio.h" + +#include "sound/spkrdev.h" +#include "sound/wave.h" + +#include "video/mc6845.h" + +#include "screen.h" class mbee_state : public driver_device @@ -167,4 +174,4 @@ private: required_device m_screen; }; -#endif /* MBEE_H_ */ +#endif /* MAME_INCLUDES_MBEE_H */ diff --git a/src/mame/includes/mc1502.h b/src/mame/includes/mc1502.h index a177cd0f0e9..98dfc576d78 100644 --- a/src/mame/includes/mc1502.h +++ b/src/mame/includes/mc1502.h @@ -6,19 +6,23 @@ * ****************************************************************************/ -#ifndef MC1502_H_ -#define MC1502_H_ +#ifndef MAME_INCLUDES_MC1502_H +#define MAME_INCLUDES_MC1502_H + +#pragma once #include "imagedev/cassette.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "bus/isa/isa.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" -#include "bus/isa/xsu_cards.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + #include "bus/centronics/ctronics.h" +#include "bus/isa/isa.h" +#include "bus/isa/xsu_cards.h" + class mc1502_state : public driver_device { @@ -81,4 +85,4 @@ private: int m_pit_out2; }; -#endif /* MC1502_H_ */ +#endif // MAME_INCLUDES_MC1502_H diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index c9b52a81b8f..70b349a53f5 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -5,6 +5,7 @@ Midway MCR-3 system **************************************************************************/ +#include "screen.h" class mcr3_state : public mcr_state { diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 87e5b1eb6e2..370708b2c5b 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -10,6 +10,7 @@ #include "audio/midway.h" #include "audio/williams.h" #include "machine/6840ptm.h" +#include "screen.h" class mcr68_state : public driver_device { diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index f5a583bc1c5..4d4347de7c1 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -8,6 +8,7 @@ #include "cpu/s2650/s2650.h" #include "sound/dac.h" #include "sound/samples.h" +#include "screen.h" class meadows_state : public driver_device { diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index b679d236c96..289f26ebd5f 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/ms1_tmap.h" +#include "screen.h" class megasys1_state : public driver_device diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index d0e56eb51e5..68d370c3f22 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/msm5205.h" #include "sound/ay8910.h" +#include "screen.h" class mermaid_state : public driver_device { diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index ecb536bd5fa..10588d7f703 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Philip Bennett +#include "audio/cage.h" + #include "cpu/adsp2100/adsp2100.h" #include "cpu/m68000/m68000.h" #include "cpu/tms34010/tms34010.h" diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 7df002cad28..1b66b4e6b2a 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -12,6 +12,7 @@ #include "video/k053936.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" +#include "screen.h" class metro_state : public driver_device { diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 904a3ae887d..8da238e8b9f 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -7,8 +7,11 @@ **************************************************************************/ -#include "audio/williams.h" #include "audio/dcs.h" +#include "audio/williams.h" + +#include "cpu/tms34010/tms34010.h" + class midtunit_state : public driver_device { diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index 5a8432c1bc1..181dab4f0ca 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -10,6 +10,7 @@ #include "audio/dcs.h" #include "machine/midwayic.h" #include "machine/watchdog.h" +#include "screen.h" #define MIDVUNIT_VIDEO_CLOCK 33000000 diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index f4a92955fcf..7ff403062ae 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -7,9 +7,10 @@ **************************************************************************/ -#include "machine/gen_latch.h" -#include "cpu/tms34010/tms34010.h" #include "audio/williams.h" + +#include "cpu/tms34010/tms34010.h" +#include "machine/gen_latch.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "sound/okim6295.h" diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index 50583defd08..4a66ad27f18 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -9,6 +9,7 @@ #define MIDZEUS_VIDEO_CLOCK XTAL_66_6667MHz #include "machine/timekpr.h" +#include "screen.h" class midzeus_state : public driver_device { diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index ce82135e169..6df79c3974a 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -1,15 +1,25 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#include +#ifndef MAME_INCLUDES_MODEL1_H +#define MAME_INCLUDES_MODEL1_H -#include +#pragma once #include "audio/dsbz80.h" #include "audio/segam1audio.h" + +#include "cpu/mb86233/mb86233.h" #include "cpu/v60/v60.h" #include "machine/m1comm.h" #include "video/segaic24.h" +#include "screen.h" + +#include + +#include + + #define DECLARE_TGP_FUNCTION(name) void name() enum {FIFO_SIZE = 256}; @@ -476,3 +486,5 @@ private: /*----------- defined in machine/model1.c -----------*/ ADDRESS_MAP_EXTERN( model1_vr_tgp_map, 32 ); + +#endif // MAME_INCLUDES_MODEL1_H diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 8fc3829aa4d..f19d204a793 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -10,6 +10,7 @@ #include "machine/315-5881_crypt.h" #include "machine/315-5838_317-0229_comp.h" #include "machine/m2comm.h" +#include "screen.h" class model2_renderer; struct raster_state; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 61bcceaefc1..8f27cdbf903 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -9,6 +9,7 @@ #include "sound/scsp.h" #include "machine/315-5881_crypt.h" #include "machine/msm6242.h" +#include "screen.h" typedef float MATRIX[4][4]; typedef float VECTOR[4]; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index 9e18e5abcc1..3a856f77205 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -15,6 +15,7 @@ #include "video/k054000.h" #include "video/k054338.h" #include "video/konami_helper.h" +#include "screen.h" class moo_state : public driver_device { diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h index 71de176aab5..e0277ff4d8f 100644 --- a/src/mame/includes/mpf1.h +++ b/src/mame/includes/mpf1.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol, Curt Coder -#pragma once +#ifndef MAME_INCLUDES_MPF1_H +#define MAME_INCLUDES_MPF1_H -#ifndef __MPF1__ -#define __MPF1__ +#pragma once #include "machine/spchrom.h" @@ -13,7 +13,7 @@ #include "machine/i8255.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/tms5220.h" #define Z80_TAG "u1" @@ -74,4 +74,4 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(check_halt_callback); }; -#endif +#endif // MAME_INCLUDES_MPF1_H diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 99868cfa785..ddc4732f5fa 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -5,6 +5,7 @@ Mr. Flea *************************************************************************/ +#include "screen.h" class mrflea_state : public driver_device { diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 3a83a9f1a6c..a4bdc9bea7f 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -2,6 +2,7 @@ // copyright-holders:David Haywood,Paul Priest #include "machine/gen_latch.h" +#include "screen.h" class ms32_state : public driver_device { diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h index c6be80c49d7..a3225084856 100644 --- a/src/mame/includes/multfish.h +++ b/src/mame/includes/multfish.h @@ -7,6 +7,7 @@ #include "cpu/z80/z80.h" #include "machine/timekpr.h" #include "machine/watchdog.h" +#include "screen.h" #define igrosoft_gamble_ROM_SIZE 0x80000 #define igrosoft_gamble_VIDRAM_SIZE (0x2000*0x04) diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index f0f13bd64c1..340d8fbe026 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina #include "audio/seibu.h" // for seibu_sound_decrypt on the MAIN cpu (not sound) +#include "screen.h" class mustache_state : public driver_device { diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 53fbdbc5190..aa27e8f8634 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -12,6 +12,7 @@ #include "sound/discrete.h" #include "sound/sn76477.h" #include "sound/samples.h" +#include "screen.h" #define MW8080BW_MASTER_CLOCK (19968000.0) diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 53b38aca1bb..50fc4be234c 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -8,6 +8,8 @@ ***************************************************************************/ +#include "screen.h" + #define MYSTSTON_MASTER_CLOCK (XTAL_12MHz) diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 8a8b2b83d60..3a59e3850f3 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -1,12 +1,14 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Phil Stroffolino, Acho A. Tang, Nicola Salmoria +#include "includes/konamigx.h" +#include "video/k053246_k053247_k055673.h" + #include "machine/gen_latch.h" #include "sound/k054539.h" #include "machine/k053252.h" #include "video/k055555.h" #include "video/k054000.h" -#include "video/k053246_k053247_k055673.h" class mystwarr_state : public konamigx_state { diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index e4bfa2425fc..e338524083c 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -7,17 +7,17 @@ * ******************************************************************************/ -#ifndef MZ700_H_ -#define MZ700_H_ +#ifndef MAME_INCLUDES_MZ700_H +#define MAME_INCLUDES_MZ700_H -#include "machine/i8255.h" -#include "machine/pit8253.h" -#include "machine/z80pio.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" #include "bus/centronics/ctronics.h" +#include "imagedev/cassette.h" #include "machine/bankdev.h" +#include "machine/i8255.h" +#include "machine/pit8253.h" #include "machine/ram.h" +#include "machine/z80pio.h" +#include "sound/spkrdev.h" class mz_state : public driver_device { @@ -34,7 +34,7 @@ public: , m_palette(*this, "palette") , m_banke(*this, "banke") , m_bankf(*this, "bankf") - { } + { } DECLARE_READ8_MEMBER(mz700_e008_r); DECLARE_WRITE8_MEMBER(mz700_e008_w); @@ -124,4 +124,4 @@ private: optional_device m_bankf; }; -#endif /* MZ700_H_ */ +#endif // MAME_INCLUDES_MZ700_H diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h index ba0540580d8..beca6caaecd 100644 --- a/src/mame/includes/mz80.h +++ b/src/mame/includes/mz80.h @@ -6,14 +6,14 @@ * ****************************************************************************/ -#ifndef MZ80_H_ -#define MZ80_H_ +#ifndef MAME_INCLUDES_MZ80_H +#define MAME_INCLUDES_MZ80_H #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/pit8253.h" #include "imagedev/cassette.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" class mz80_state : public driver_device @@ -69,4 +69,4 @@ private: extern const gfx_layout mz80k_charlayout; extern const gfx_layout mz80kj_charlayout; -#endif /* MZ80_H_ */ +#endif // MAME_INCLUDES_MZ80_H diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index c2c9c4469a2..25e6749426d 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -3,6 +3,7 @@ #include "cpu/mcs48/mcs48.h" #include "sound/dac.h" #include "sound/sn76477.h" +#include "screen.h" class n8080_state : public driver_device { diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 3b7ab520d3f..ea2881d36d3 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -8,6 +8,7 @@ #include "machine/eeprompar.h" #include "sound/c140.h" +#include "screen.h" enum { diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 459bd749e29..13393afe5f7 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -13,6 +13,7 @@ #include "video/c45.h" #include "machine/namco_c148.h" #include "machine/namco_c139.h" +#include "screen.h" /* CPU reference numbers */ diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 3e9c8fc7ea6..26f694d8273 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -9,6 +9,7 @@ #include "machine/eeprompar.h" #include "video/rgbutil.h" #include "video/poly.h" +#include "screen.h" enum { diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 8f5cee055d3..93fa39a63a5 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver,Sal and John Bugliarisi,Paul Priest #include "audio/pleiads.h" +#include "screen.h" class naughtyb_state : public driver_device { diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index ea5c5fd1f6d..3ad15b28478 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -2,6 +2,7 @@ // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class nbmj8891_state : public driver_device { diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index d907a078475..1a8861524d5 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class nbmj8900_state : public driver_device { diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index aa173f13e78..3a610d0776c 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -3,6 +3,7 @@ #include "includes/nb1413m3.h" #include "machine/gen_latch.h" +#include "screen.h" class nbmj8991_state : public driver_device { diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index c1c1b925714..cdbbe0f07a2 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -8,6 +8,7 @@ #include "cpu/z80/tmpz84c011.h" #include "machine/gen_latch.h" +#include "screen.h" #define VRAM_MAX 2 diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 9a9b2f51aa5..5da3b2c15f7 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -5,6 +5,9 @@ #include "sound/k005289.h" #include "sound/vlm5030.h" +#include "screen.h" + + class nemesis_state : public driver_device { public: diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index cc64d8105d1..7243bcd8e13 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -19,6 +19,8 @@ #include "bus/neogeo/carts.h" #include "bus/neogeo_ctrl/ctrl.h" +#include "screen.h" + // On scanline 224, /VBLANK goes low 56 mclks (14 pixels) from the rising edge of /HSYNC. // Two mclks after /VBLANK goes low, the hardware sets a pending IRQ1 flip-flop. diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 0bea69afaf3..c0ad204704a 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -7,6 +7,7 @@ ******************************************************************************/ #include "sound/samples.h" +#include "screen.h" class ninjakd2_state : public driver_device { diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 8284f247264..827d21fcab4 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "machine/tmp68301.h" +#include "screen.h" #define VRAM_MAX 3 diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index b9b516b0982..080eb369707 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -6,6 +6,7 @@ *************************************************************************/ #include "sound/msm5205.h" +#include "screen.h" class ojankohs_state : public driver_device { diff --git a/src/mame/includes/orao.h b/src/mame/includes/orao.h index 32162df0a4f..64dc53d2b47 100644 --- a/src/mame/includes/orao.h +++ b/src/mame/includes/orao.h @@ -6,9 +6,10 @@ * ****************************************************************************/ -#ifndef ORAO_H_ -#define ORAO_H_ -#include "sound/speaker.h" +#ifndef MAME_INCLUDES_ORAO_H +#define MAME_INCLUDES_ORAO_H + +#include "sound/spkrdev.h" #include "imagedev/cassette.h" class orao_state : public driver_device @@ -43,4 +44,4 @@ private: uint8_t m_beep; }; -#endif /* ORAO_H_ */ +#endif // MAME_INCLUDES_ORAO_H diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 603f7cfdee9..5e4b9457637 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define ORBIT_NOTE_FREQ NODE_01 diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h index 6dbd390b2b1..b025736dadb 100644 --- a/src/mame/includes/orion.h +++ b/src/mame/includes/orion.h @@ -6,18 +6,23 @@ * ****************************************************************************/ -#ifndef ORION_H_ -#define ORION_H_ +#ifndef MAME_INCLUDES_ORION_H +#define MAME_INCLUDES_ORION_H + +#pragma once -#include "machine/wd_fdc.h" #include "includes/radio86.h" -#include "cpu/z80/z80.h" + #include "cpu/i8085/i8085.h" +#include "cpu/z80/z80.h" + #include "machine/i8255.h" -#include "machine/ram.h" #include "machine/mc146818.h" -#include "sound/speaker.h" +#include "machine/ram.h" +#include "machine/wd_fdc.h" + #include "sound/ay8910.h" +#include "sound/spkrdev.h" #include "sound/wave.h" @@ -122,4 +127,4 @@ protected: void orionpro_bank_switch(); }; -#endif /* ORION_H_ */ +#endif // MAME_INCLUDES_ORION_H diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h index ae6cb2e010d..33da903005a 100644 --- a/src/mame/includes/osborne1.h +++ b/src/mame/includes/osborne1.h @@ -6,20 +6,22 @@ * ****************************************************************************/ -#ifndef OSBORNE1_H_ -#define OSBORNE1_H_ +#ifndef MAME_INCLUDES_OSBORNE1_H +#define MAME_INCLUDES_OSBORNE1_H -#include "cpu/z80/z80.h" - -#include "sound/speaker.h" +#pragma once #include "bus/ieee488/ieee488.h" +#include "cpu/z80/z80.h" + #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/ram.h" #include "machine/wd_fdc.h" +#include "sound/spkrdev.h" + #include "video/mc6845.h" @@ -187,4 +189,4 @@ protected: required_region_ptr m_p_nuevo; }; -#endif /* OSBORNE1_H_ */ +#endif // MAME_INCLUDES_OSBORNE1_H diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index df834582529..64bc0010b16 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -10,6 +10,7 @@ #include "video/k053246_k053247_k055673.h" #include "video/k053251.h" #include "video/konami_helper.h" +#include "screen.h" class overdriv_state : public driver_device { diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h index 7264b1087ee..5b23fc4bf99 100644 --- a/src/mame/includes/p2000t.h +++ b/src/mame/includes/p2000t.h @@ -6,11 +6,13 @@ * ****************************************************************************/ -#ifndef P2000T_H_ -#define P2000T_H_ +#ifndef MAME_INCLUDES_P2000T_H +#define MAME_INCLUDES_P2000T_H + +#pragma once #include "cpu/z80/z80.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/saa5050.h" @@ -55,4 +57,4 @@ public: INTERRUPT_GEN_MEMBER(p2000_interrupt); }; -#endif /* P2000T_H_ */ +#endif // MAME_INCLUDES_P2000T_H diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 5748c13a002..d71cd094226 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "sound/namco.h" +#include "screen.h" class pacland_state : public driver_device { diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 8558f817ebd..1d57d6e73c1 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia #include "sound/okim6295.h" +#include "screen.h" class paradise_state : public driver_device { diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h index fbe703bac26..ba204d4646b 100644 --- a/src/mame/includes/partner.h +++ b/src/mame/includes/partner.h @@ -6,8 +6,12 @@ * ****************************************************************************/ -#ifndef partner_H_ -#define partner_H_ +#ifndef MAME_INCLUDES_PARTNER_H +#define MAME_INCLUDES_PARTNER_H + +#pragma once + +#include "includes/radio86.h" #include "machine/i8255.h" #include "machine/wd_fdc.h" @@ -17,9 +21,11 @@ class partner_state : public radio86_state { public: partner_state(const machine_config &mconfig, device_type type, const char *tag) - : radio86_state(mconfig, type, tag), - m_ram(*this, RAM_TAG), - m_fdc(*this, "wd1793") { } + : radio86_state(mconfig, type, tag) + , m_ram(*this, RAM_TAG) + , m_fdc(*this, "wd1793") + { + } uint8_t m_mem_page; uint8_t m_win_mem_page; @@ -42,4 +48,4 @@ public: }; -#endif /* partner_H_ */ +#endif // MAME_INCLUDES_PARTNER_H diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 149ec503d99..12afb5d1944 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class pastelg_state : public driver_device { diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h index 9105325a790..0c36f09a66a 100644 --- a/src/mame/includes/pc1512.h +++ b/src/mame/includes/pc1512.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_PC1512_H +#define MAME_INCLUDES_PC1512_H -#ifndef __PC1512__ -#define __PC1512__ +#pragma once #include "bus/centronics/ctronics.h" #include "bus/isa/isa.h" @@ -12,7 +12,6 @@ #include "bus/pc1512/mouse.h" #include "cpu/i86/i86.h" #include "cpu/mcs48/mcs48.h" -#include "formats/pc_dsk.h" #include "machine/am9517a.h" #include "machine/buffer.h" #include "machine/ins8250.h" @@ -22,9 +21,11 @@ #include "machine/pc1512kb.h" #include "machine/pc_fdc.h" #include "machine/ram.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/mc6845.h" +#include "formats/pc_dsk.h" + #define I8086_TAG "ic120" #define I8087_TAG "ic119" #define I8048_TAG "i8048" @@ -251,4 +252,4 @@ public: MACHINE_CONFIG_EXTERN( pc1512_video ); -#endif +#endif // MAME_INCLUDES_PC1512_H diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h index a1058e4d641..d0053891473 100644 --- a/src/mame/includes/pc8401a.h +++ b/src/mame/includes/pc8401a.h @@ -17,6 +17,8 @@ #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" + #define SCREEN_TAG "screen" #define CRT_SCREEN_TAG "screen2" diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h index 96b235c4260..084d4d38cb8 100644 --- a/src/mame/includes/pcw.h +++ b/src/mame/includes/pcw.h @@ -12,6 +12,7 @@ #include "machine/upd765.h" #include "machine/ram.h" #include "sound/beep.h" +#include "screen.h" #define PCW_BORDER_HEIGHT 8 #define PCW_BORDER_WIDTH 8 diff --git a/src/mame/includes/pecom.h b/src/mame/includes/pecom.h index 8320079d2e1..c97216ac77c 100644 --- a/src/mame/includes/pecom.h +++ b/src/mame/includes/pecom.h @@ -1,11 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic -#ifndef __PECOM__ -#define __PECOM__ +#ifndef MAME_INCLUDES_PECOM_H +#define MAME_INCLUDES_PECOM_H #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" #include "machine/ram.h" +#include "sound/cdp1869.h" #define SCREEN_TAG "screen" #define CDP1802_TAG "cdp1802" @@ -73,4 +74,4 @@ protected: MACHINE_CONFIG_EXTERN( pecom_video ); -#endif +#endif // MAME_INCLUDES_PECOM_H diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 9ae5e0ba24c..d26e1693c09 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -1,18 +1,21 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi +#ifndef MAME_INCLUDES_PGM_H +#define MAME_INCLUDES_PGM_H -#include "machine/v3021.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" -#include "cpu/arm7/arm7.h" -#include "sound/ics2115.h" -#include "cpu/arm7/arm7core.h" -#include "machine/nvram.h" -#include "machine/pgmcrypt.h" -#include "machine/gen_latch.h" #include "machine/igs025.h" #include "machine/igs022.h" #include "machine/igs028.h" +#include "machine/pgmcrypt.h" + +#include "cpu/arm7/arm7.h" +#include "cpu/arm7/arm7core.h" +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/gen_latch.h" +#include "machine/nvram.h" +#include "machine/v3021.h" +#include "sound/ics2115.h" #define PGMARM7LOGERROR 0 @@ -130,3 +133,5 @@ ADDRESS_MAP_EXTERN( pgm_z80_io, 8 ); ADDRESS_MAP_EXTERN( pgm_mem, 16 ); ADDRESS_MAP_EXTERN( pgm_basic_mem, 16 ); ADDRESS_MAP_EXTERN( pgm_base_mem, 16 ); + +#endif // MAME_INCLUDES_PGM_H diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h index c9f296e0dca..ffa47827dc8 100644 --- a/src/mame/includes/pk8020.h +++ b/src/mame/includes/pk8020.h @@ -6,18 +6,18 @@ * ****************************************************************************/ -#ifndef PK8020_H_ -#define PK8020_H_ +#ifndef MAME_INCLUDES_PK8020_H +#define MAME_INCLUDES_PK8020_H +#include "imagedev/cassette.h" +#include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" -#include "machine/i8251.h" +#include "machine/pit8253.h" +#include "machine/ram.h" #include "machine/wd_fdc.h" -#include "imagedev/cassette.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" -#include "machine/ram.h" class pk8020_state : public driver_device @@ -103,4 +103,4 @@ protected: void pk8020_set_bank(uint8_t data); }; -#endif /* pk8020_H_ */ +#endif // MAME_INCLUDES_PK8020_H diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index c6c4f0dc5e3..a2900e4ffbd 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "sound/namco.h" #include "sound/discrete.h" +#include "screen.h" struct filter2_context { diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 986ebfba0f5..3d578794db5 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -6,6 +6,8 @@ **************************************************************************/ #include "machine/eepromser.h" +#include "screen.h" + class policetr_state : public driver_device { public: diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 4f66519b51d..55e54a7ce08 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -1,11 +1,13 @@ // license:BSD-3-Clause // copyright-holders:Martin Buchholz // thanks-to:James Wallace, Martin Buchholz, Juergen Oppermann, Volker Hann, Jan-Ole Christian +#ifndef MAME_INCLUDES_POLYPLAY_H +#define MAME_INCLUDES_POLYPLAY_H #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define POLYPLAY_MAIN_CLOCK XTAL_9_8304MHz @@ -68,3 +70,5 @@ public: DECLARE_PALETTE_INIT(polyplay); uint32_t screen_update_polyplay(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; + +#endif // MAME_INCLUDES_POLYPLAY_H diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 37e36c29099..55e93b62866 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia #include "machine/nmk112.h" +#include "screen.h" class powerins_state : public driver_device { diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h index c7d0e44466d..6b3dd876d36 100644 --- a/src/mame/includes/pp01.h +++ b/src/mame/includes/pp01.h @@ -6,15 +6,17 @@ * ****************************************************************************/ -#ifndef PP01_H_ -#define PP01_H_ +#ifndef MAME_INCLUDES_PP01_H +#define MAME_INCLUDES_PP01_H + +#pragma once #include "cpu/i8085/i8085.h" #include "machine/ram.h" #include "machine/i8251.h" #include "machine/pit8253.h" #include "machine/i8255.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" //#include "sound/wave.h" //#include "imagedev/cassette.h" @@ -62,4 +64,4 @@ public: void pp01_set_memory(uint8_t block, uint8_t data); }; -#endif +#endif // MAME_INCLUDES_PP01_H diff --git a/src/mame/includes/primo.h b/src/mame/includes/primo.h index 6714cb77130..86faa87ad60 100644 --- a/src/mame/includes/primo.h +++ b/src/mame/includes/primo.h @@ -6,14 +6,16 @@ * ****************************************************************************/ -#ifndef PRIMO_H_ -#define PRIMO_H_ +#ifndef MAME_INCLUDES_PRIMO_H +#define MAME_INCLUDES_PRIMO_H + +#pragma once #include "imagedev/snapquik.h" #include "imagedev/cassette.h" -#include "bus/cbmiec/cbmiec.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "bus/cbmiec/cbmiec.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" @@ -67,4 +69,4 @@ public: }; -#endif /* PRIMO_H_ */ +#endif // MAME_INCLUDES_PRIMO_H diff --git a/src/mame/includes/prof180x.h b/src/mame/includes/prof180x.h index 5b60c13e536..e8af51790e9 100644 --- a/src/mame/includes/prof180x.h +++ b/src/mame/includes/prof180x.h @@ -1,9 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder +#ifndef MAME_INCLUDES_PROF180X_H +#define MAME_INCLUDES_PROF180X_H + #pragma once -#ifndef __PROF180X__ -#define __PROF180X__ +#include "bus/centronics/ctronics.h" #define HD64180_TAG "hd64180" #define FDC9268_TAG "fdc9268" @@ -16,8 +18,8 @@ class prof180x_state : public driver_device { public: prof180x_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_centronics(*this, CENTRONICS_TAG) + : driver_device(mconfig, type, tag) + , m_centronics(*this, CENTRONICS_TAG) { } @@ -45,4 +47,4 @@ public: int m_mm1; }; -#endif +#endif // MAME_INCLUDES_PROF180X_H diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 7e7ff2a47f8..76b993c8ec9 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -6,6 +6,7 @@ *************************************************************************/ #include "sound/okim6295.h" +#include "screen.h" class psikyo_state : public driver_device { diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 2913b9560da..3801d81225f 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -6,11 +6,12 @@ *************************************************************************/ -#define MASTER_CLOCK 57272700 // main oscillator frequency - #include "cpu/sh2/sh2.h" #include "sound/ymf278b.h" #include "machine/eepromser.h" +#include "screen.h" + +#define MASTER_CLOCK 57272700 // main oscillator frequency class psikyo4_state : public driver_device { diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index c40b37ec0ad..1daaa618d96 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -3,6 +3,7 @@ #include "video/bufsprite.h" #include "machine/eepromser.h" #include "cpu/sh2/sh2.h" +#include "screen.h" #define MASTER_CLOCK 57272700 // main oscillator frequency @@ -27,7 +28,7 @@ class psikyosh_state : public driver_device public: psikyosh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram") , + m_spriteram(*this, "spriteram") , m_bgram(*this, "bgram"), m_zoomram(*this, "zoomram"), m_vidregs(*this, "vidregs"), diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index 33e3492c06d..92af91ed04b 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -17,6 +17,8 @@ #include "video/mc6845.h" +#include "screen.h" + #define MAIN_CLOCK_OSC 20000000 /* 20 MHz */ #define SLITHER_CLOCK_OSC 21300000 /* 21.3 MHz */ diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 941649e7f4d..5349a00dc2f 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia #include "machine/tmp68301.h" +#include "screen.h" class realbrk_state : public driver_device { diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 51cf5974ac4..2e9c8779b93 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "sound/hc55516.h" +#include "screen.h" class redalert_state : public driver_device { diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h index e5b4e479a49..c6d3595a81f 100644 --- a/src/mame/includes/rmnimbus.h +++ b/src/mame/includes/rmnimbus.h @@ -17,6 +17,7 @@ #include "sound/ay8910.h" #include "sound/msm5205.h" #include "bus/centronics/ctronics.h" +#include "screen.h" #define MAINCPU_TAG "maincpu" #define IOCPU_TAG "iocpu" diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 80f90f2a6c4..c51ba148294 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles #include "sound/upd7759.h" +#include "screen.h" class rpunch_state : public driver_device { diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 57184c63074..adcbdebab3a 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour +#include "screen.h" + class runaway_state : public driver_device { public: diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 36f25737279..99d92b7e77c 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -12,6 +12,7 @@ #include "video/k053246_k053247_k055673.h" #include "video/k053936.h" #include "video/konami_helper.h" +#include "screen.h" class rungun_state : public driver_device { diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h index 7f038413e61..76e873f194e 100644 --- a/src/mame/includes/samcoupe.h +++ b/src/mame/includes/samcoupe.h @@ -10,15 +10,15 @@ * ****************************************************************************/ -#ifndef SAMCOUPE_H_ -#define SAMCOUPE_H_ +#ifndef MAME_INCLUDES_SAMCOUPE_H +#define MAME_INCLUDES_SAMCOUPE_H -#include "machine/wd_fdc.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" #include "bus/centronics/ctronics.h" -#include "machine/ram.h" +#include "imagedev/cassette.h" #include "machine/msm6242.h" +#include "machine/ram.h" +#include "machine/wd_fdc.h" +#include "sound/spkrdev.h" /* screen dimensions */ #define SAM_BLOCK 8 @@ -200,4 +200,4 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; -#endif /* SAMCOUPE_H_ */ +#endif // MAME_INCLUDES_SAMCOUPE_H diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 0fbf3732e09..55943ead060 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -10,6 +10,7 @@ #include "sound/sn76496.h" #include "audio/segasnd.h" #include "machine/gen_latch.h" +#include "screen.h" class sega005_sound_device; diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index b9836a02489..9ac55eaf465 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -9,6 +9,7 @@ #include "machine/segag80.h" #include "audio/segasnd.h" #include "video/vector.h" +#include "screen.h" class segag80v_state : public driver_device { diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 4857cfa7504..7ef6df2dfe3 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -7,6 +7,7 @@ #include "video/segaic24.h" #include "sound/dac.h" +#include "screen.h" class segas24_state : public driver_device { diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index afbda1fb0ad..432659c50d6 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -9,6 +9,7 @@ #include "machine/eepromser.h" #include "sound/multipcm.h" #include "machine/s32comm.h" +#include "screen.h" diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h index 915143c0f35..73139e38954 100644 --- a/src/mame/includes/segaxbd.h +++ b/src/mame/includes/segaxbd.h @@ -16,6 +16,7 @@ #include "video/segaic16_road.h" #include "video/sega16sp.h" #include "video/resnet.h" +#include "screen.h" // ======================> segaxbd_state diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 43c3fc4f4b1..a734c279e8b 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -7,6 +7,7 @@ #include "machine/upd4992.h" #include "sound/okim9810.h" #include "sound/x1_010.h" +#include "screen.h" class seta2_state : public driver_device { diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index f13e135b948..e8e20ef46e3 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" +#include "screen.h" class shadfrce_state : public driver_device { diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 98239f9d2ab..fe446603c24 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" +#include "screen.h" class shangha3_state : public driver_device { diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h index 51675377f55..098a17d52b5 100644 --- a/src/mame/includes/simple_st0016.h +++ b/src/mame/includes/simple_st0016.h @@ -2,6 +2,7 @@ // copyright-holders:Tomasz Slanina #include "machine/st0016.h" +#include "screen.h" class st0016_state : public driver_device { diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 807f353f71b..9bd248d368f 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class skyfox_state : public driver_device { diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index a370a5e6186..3f21f29491e 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -9,6 +9,7 @@ #include "cpu/z80/z80.h" #include "video/bufsprite.h" #include "machine/taito68705interface.h" +#include "screen.h" class slapfght_state : public driver_device { diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h index e0ba503ebaa..99c82563f7e 100644 --- a/src/mame/includes/sms.h +++ b/src/mame/includes/sms.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef SMS_H_ -#define SMS_H_ +#ifndef MAME_INCLUDES_SMS_H +#define MAME_INCLUDES_SMS_H #define LOG_REG #define LOG_PAGING @@ -21,11 +21,16 @@ #define CONTROL1_TAG "ctrl1" #define CONTROL2_TAG "ctrl2" +#include "bus/gamegear/ggext.h" #include "bus/sega8/sega8_slot.h" #include "bus/sg1000_exp/sg1000exp.h" -#include "bus/sms_exp/smsexp.h" #include "bus/sms_ctrl/smsctrl.h" -#include "bus/gamegear/ggext.h" +#include "bus/sms_exp/smsexp.h" +#include "sound/sn76496.h" +#include "sound/ym2413.h" +#include "video/315_5124.h" + +#include "screen.h" class sms_state : public driver_device @@ -260,4 +265,4 @@ public: #define IO_BIOS_ROM (0x08) /* BIOS ROM disabled (1= disabled, 0= enabled) */ #define IO_CHIP (0x04) /* I/O chip disabled (1= disabled, 0= enabled) */ -#endif /* SMS_H_ */ +#endif // MAME_INCLUDES_SMS_H diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 6bd8c95872a..476ed479ea7 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -7,6 +7,7 @@ #include "cpu/g65816/g65816.h" #include "audio/snes_snd.h" #include "video/snes_ppu.h" +#include "screen.h" /* SNES timing theory: diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 4d358f2e52e..71a21294138 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -9,6 +9,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class snk_state : public driver_device { diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 4d87fd0e0ef..cd68fe12fe6 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/upd7759.h" #include "video/snk68_spr.h" +#include "screen.h" class snk68_state : public driver_device { diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 68bc3255dce..ccf5a7d29b9 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -6,6 +6,7 @@ ****************************************************************************/ #include "sound/samples.h" +#include "screen.h" /* * SPACEFB_PIXEL_CLOCK clocks the star generator circuit. The rest of * the graphics use a clock half of SPACEFB_PIXEL_CLOCK, thus creating diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 8f259e48279..e594665dca5 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" +#include "screen.h" class spbactn_state : public driver_device { diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 5fcc53a4d33..3139e0f428e 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" +#include "screen.h" class spdodgeb_state : public driver_device { diff --git a/src/mame/includes/spec128.h b/src/mame/includes/spec128.h index 75747182f79..29ad2639a7e 100644 --- a/src/mame/includes/spec128.h +++ b/src/mame/includes/spec128.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef __SPEC128H__ -#define __SPEC128H__ +#ifndef MAME_INCLUDES_SPEC128_H +#define MAME_INCLUDES_SPEC128_H /* 128K machines take an extra 4 cycles per scan line - add this to retrace */ #define SPEC128_UNSEEN_LINES 15 @@ -16,4 +16,4 @@ MACHINE_CONFIG_EXTERN( spectrum_128 ); -#endif /* __SPEC128H__ */ +#endif // MAME_INCLUDES_SPEC128_H diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 892a6800e37..11672822f03 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -6,18 +6,21 @@ * ****************************************************************************/ -#ifndef __SPECTRUM_H__ -#define __SPECTRUM_H__ +#ifndef MAME_INCLUDES_SPECTRUM_H +#define MAME_INCLUDES_SPECTRUM_H + +#pragma once -#include "machine/upd765.h" -#include "sound/speaker.h" -#include "machine/ram.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" #include "machine/spec_snqk.h" +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "imagedev/cassette.h" +#include "imagedev/snapquik.h" +#include "machine/ram.h" +#include "machine/upd765.h" +#include "sound/spkrdev.h" + /* Spectrum crystals */ #define X1 XTAL_14MHz // Main clock (48k Spectrum) @@ -254,4 +257,4 @@ INPUT_PORTS_EXTERN( spec_plus ); MACHINE_CONFIG_EXTERN( spectrum ); -#endif /* __SPECTRUM_H__ */ +#endif // MAME_INCLUDES_SPECTRUM_H diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 83e4634643b..28a46765168 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define SPRINT2_SKIDSND1_EN NODE_01 diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index a7e725e474c..41080c35236 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -2,6 +2,8 @@ // copyright-holders:Stefan Jokisch #include "machine/watchdog.h" +#include "sound/discrete.h" +#include "screen.h" class sprint4_state : public driver_device { diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index d70052f6200..437e39a9743 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch #include "sound/discrete.h" +#include "screen.h" class sprint8_state : public driver_device { diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 12aea45bff8..19f7d75b68a 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -4,6 +4,7 @@ #include "video/st0020.h" #include "machine/eepromser.h" #include "sound/es5506.h" +#include "screen.h" class ssv_state : public driver_device { diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index 6208c768720..bff3ca3b531 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "sound/samples.h" +#include "screen.h" #define STARFIRE_MASTER_CLOCK (XTAL_20MHz) diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index 812f86ba242..d3ec471c6e8 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -19,6 +19,7 @@ */ #include "sound/discrete.h" +#include "screen.h" #define STARSHP1_MASTER_CLOCK (12096000) diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index e3fb7be1561..ebab20075d6 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -2,6 +2,7 @@ // copyright-holders:Luca Elia #include "machine/gen_latch.h" +#include "screen.h" class suna16_state : public driver_device { diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index ab6954c4602..f618254f899 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/samples.h" +#include "screen.h" #define TILEMAPS 0 diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index 541b4c2f5bb..6e29dc76e80 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -1,18 +1,23 @@ // license:BSD-3-Clause // copyright-holders:Robbbert +#ifndef MAME_INCLUDES_SUPER80_H +#define MAME_INCLUDES_SUPER80_H + +#pragma once + +#include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "sound/wave.h" -#include "imagedev/snapquik.h" #include "imagedev/cassette.h" -#include "sound/speaker.h" -#include "sound/samples.h" +#include "imagedev/snapquik.h" #include "machine/buffer.h" -#include "bus/centronics/ctronics.h" -#include "video/mc6845.h" -#include "machine/z80pio.h" -#include "machine/z80dma.h" #include "machine/wd_fdc.h" +#include "machine/z80dma.h" +#include "machine/z80pio.h" +#include "sound/samples.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "video/mc6845.h" /* Bits in m_portf0 variable: @@ -125,3 +130,5 @@ private: optional_device m_floppy0; optional_device m_floppy1; }; + +#endif // MAME_INCLUDES_SUPER80_H diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 625f1888ea8..73733f83bd4 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -1,6 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Sylvain Glaize, Paul Priest, Olivier Galibert +#include "video/sknsspr.h" + #include "cpu/sh2/sh2.h" diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 8f9a664ffcc..7089fbecf59 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -5,7 +5,10 @@ Super Slams *************************************************************************/ +#ifndef MAME_INCLUDES_SUPRSLAM_H +#define MAME_INCLUDES_SUPRSLAM_H +#include "video/vsystem_spr.h" #include "machine/gen_latch.h" #include "video/k053936.h" @@ -68,3 +71,5 @@ public: virtual void video_start() override; uint32_t screen_update_suprslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; + +#endif // MAME_INCLUDES_SUPRSLAM_H diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 14326294c91..f9975dbe464 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -5,6 +5,7 @@ #include "machine/gen_latch.h" #include "machine/i8255.h" #include "machine/segacrp2_device.h" +#include "screen.h" class system1_state : public driver_device { diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 84c424886fc..e8ac3c333a7 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -4,6 +4,7 @@ #include "machine/taitoio.h" #include "video/hd63484.h" #include "video/tc0180vcu.h" +#include "screen.h" class taitob_state : public driver_device { diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 77150f6aaeb..ee8faf04cf3 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail #include "machine/watchdog.h" #include "sound/okim6295.h" +#include "screen.h" /* This it the best way to allow game specific kludges until the system is fully understood */ enum { diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 13277cf57cf..792ff814ee6 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -8,6 +8,7 @@ #include "machine/taitoio.h" #include "video/tc0080vco.h" +#include "screen.h" enum { TAITOAIR_FRAC_SHIFT = 16, TAITOAIR_POLY_MAX_PT = 16 }; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 5c43f2174e3..5f1adadc30f 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -8,6 +8,7 @@ #include "video/tc0780fpa.h" #include "machine/taitoio.h" +#include "screen.h" class taitojc_state : public driver_device { diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 7d366e8b55a..57a85fd2163 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -9,6 +9,8 @@ #include "sound/discrete.h" #include "sound/ay8910.h" +#include "screen.h" + class taitosj_state : public driver_device { diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h index 25f480eaa20..a5affb130a2 100644 --- a/src/mame/includes/tandy2k.h +++ b/src/mame/includes/tandy2k.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __TANDY2K__ -#define __TANDY2K__ +#ifndef MAME_INCLUDES_TANDY2K_H +#define MAME_INCLUDES_TANDY2K_H #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" @@ -16,7 +16,7 @@ #include "machine/ram.h" #include "machine/tandy2kb.h" #include "machine/upd765.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/crt9007.h" #include "video/crt9021.h" #include "video/crt9212.h" @@ -225,4 +225,4 @@ public: int m_centronics_busy; }; -#endif +#endif // MAME_INCLUDES_TANDY2K_H diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 1598b308e8e..16deea7df78 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define TANK8_CRASH_EN NODE_01 diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index 7a8bc27df55..b254f757bab 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -1,6 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#ifndef MAME_INCLUDES_TAOTAIDO_H +#define MAME_INCLUDES_TAOTAIDO_H +#include "video/vsystem_spr.h" #include "machine/gen_latch.h" class taotaido_state : public driver_device @@ -56,3 +59,5 @@ public: void screen_eof(screen_device &screen, bool state); uint32_t tile_callback( uint32_t code ); }; + +#endif // MAME_INCLUDES_TAOTAIDO_H diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index d88ffc34e6c..c2b5b92deea 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -2,6 +2,7 @@ // copyright-holders:BUT #include "sound/namco.h" #include "video/c45.h" +#include "screen.h" class tceptor_state : public driver_device { diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 7ba16367294..34be89d0eb2 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" #include "video/tecmo_spr.h" +#include "screen.h" class tecmo_state : public driver_device { diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index f15916ebd38..a24108d4cf5 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" +#include "screen.h" class tecmo16_state : public driver_device { diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 96548cc076f..1343b48a63d 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -9,6 +9,7 @@ #include "machine/eepromser.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" +#include "screen.h" class tecmosys_state : public driver_device { diff --git a/src/mame/includes/tek405x.h b/src/mame/includes/tek405x.h index 175d2f090c5..cf4c3341c08 100644 --- a/src/mame/includes/tek405x.h +++ b/src/mame/includes/tek405x.h @@ -1,21 +1,26 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder +#ifndef MAME_INCLUDES_TEK405X_H +#define MAME_INCLUDES_TEK405X_H + #pragma once -#ifndef __TEK405X__ -#define __TEK405X__ +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "bus/ieee488/ieee488.h" #include "cpu/m6800/m6800.h" -#include "machine/ram.h" + #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/clock.h" -#include "bus/ieee488/ieee488.h" #include "machine/ram.h" -#include "sound/speaker.h" +#include "machine/ram.h" + +#include "sound/spkrdev.h" + #include "video/vector.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" + #define MC6800_TAG "u61" #define MC6820_Y_TAG "u561" @@ -158,4 +163,4 @@ public: virtual void video_start() override; }; -#endif +#endif // MAME_INCLUDES_TEK405X_H diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index 72c95620e48..5587c47835d 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -11,27 +11,29 @@ #ifndef _THOMSON_H_ #define _THOMSON_H_ -#include "bus/rs232/rs232.h" #include "cpu/m6809/m6809.h" +#include "formats/thom_cas.h" +#include "formats/thom_dsk.h" +#include "imagedev/cassette.h" +#include "imagedev/floppy.h" #include "machine/6821pia.h" -#include "machine/mc6846.h" #include "machine/6850acia.h" -#include "machine/mos6551.h" -#include "sound/dac.h" -#include "sound/mea8000.h" -#include "bus/centronics/ctronics.h" -#include "imagedev/cassette.h" #include "machine/mc6843.h" #include "machine/mc6846.h" +#include "machine/mc6846.h" #include "machine/mc6854.h" -#include "formats/thom_cas.h" -#include "formats/thom_dsk.h" -#include "machine/thomflop.h" -#include "imagedev/floppy.h" +#include "machine/mos6551.h" #include "machine/ram.h" +#include "machine/thomflop.h" +#include "sound/dac.h" +#include "sound/mea8000.h" +#include "bus/centronics/ctronics.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/rs232/rs232.h" + +#include "screen.h" /* 6821 PIAs */ diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index f7347f98610..0e8a62e9b80 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -6,15 +6,17 @@ * ****************************************************************************/ -#ifndef TI85_H_ -#define TI85_H_ +#ifndef MAME_INCLUDES_TI85_H +#define MAME_INCLUDES_TI85_H + +#pragma once #include "imagedev/snapquik.h" -#include "video/t6a04.h" #include "machine/bankdev.h" -#include "sound/speaker.h" -#include "machine/nvram.h" #include "machine/intelfsh.h" +#include "machine/nvram.h" +#include "sound/spkrdev.h" +#include "video/t6a04.h" /* model */ @@ -227,4 +229,4 @@ public: //address_space &asic; }; -#endif /* TI85_H_ */ +#endif // MAME_INCLUDES_TI85_H diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 6252caced5b..44ae26dafea 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -1,19 +1,23 @@ // license:BSD-3-Clause // copyright-holders:Eugene Sandulenko +#ifndef MAME_INCLUDES_TIAMC1_H +#define MAME_INCLUDES_TIAMC1_H + +#pragma once #include "machine/pit8253.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" class tiamc1_state : public driver_device { public: tiamc1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , - m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_speaker(*this, "speaker") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + , m_speaker(*this, "speaker") + { } std::unique_ptr m_videoram; uint8_t *m_tileram; @@ -137,3 +141,5 @@ private: }; extern const device_type TIAMC1; + +#endif // MAME_INCLUDES_TIAMC1_H diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 5574f4b23ce..b15ea3610ce 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "sound/tc8830f.h" +#include "screen.h" class timeplt_state : public driver_device { diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 26020a949d1..dca3fa03cdc 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -7,6 +7,7 @@ #include "cpu/m68000/m68000.h" #include "video/toaplan_scu.h" +#include "screen.h" class toaplan1_state : public driver_device { diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index a01691ca013..1cc9ec190fa 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -5,9 +5,6 @@ //#define USE_HD64x180 /* Define if CPU support is available */ //#define TRUXTON2_STEREO /* Uncomment to hear truxton2 music in stereo */ -// We encode priority with colour in the tilemaps, so need a larger palette -#define T2PALETTE_LENGTH 0x10000 - #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" @@ -16,6 +13,10 @@ #include "machine/upd4992.h" #include "video/gp9001.h" #include "sound/okim6295.h" +#include "screen.h" + +// We encode priority with colour in the tilemaps, so need a larger palette +#define T2PALETTE_LENGTH 0x10000 class toaplan2_state : public driver_device { diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 7e47ed632f8..6994ecb0602 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -5,6 +5,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" #include "video/bufsprite.h" +#include "screen.h" class toki_state : public driver_device { diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 625aac625d8..4ccd006730b 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles +#include "screen.h" + class tp84_state : public driver_device { public: diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h index 8555b5a2237..fa60cd09b85 100644 --- a/src/mame/includes/tranz330.h +++ b/src/mame/includes/tranz330.h @@ -1,11 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#pragma once - #ifndef VERIFONE_TRANZ330_H #define VERIFONE_TRANZ330_H -// single-driver build must have emu.h here +#pragma once #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" @@ -15,7 +13,7 @@ #include "machine/msm6242.h" #include "machine/roc10937.h" #include "bus/rs232/rs232.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "machine/clock.h" #define CPU_TAG "cpu" diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index c8d99f3962d..4057ab3452f 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -9,6 +9,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" #include "sound/samples.h" +#include "screen.h" /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 580f1dd7719..02f3408d0f9 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -6,19 +6,22 @@ * ****************************************************************************/ -#ifndef TRS80_H_ -#define TRS80_H_ +#ifndef MAME_INCLUDES_TRS80_H +#define MAME_INCLUDES_TRS80_H + +#pragma once -#include "cpu/z80/z80.h" -#include "sound/speaker.h" -#include "sound/wave.h" -#include "machine/ay31015.h" -#include "machine/buffer.h" #include "bus/centronics/ctronics.h" -#include "machine/wd_fdc.h" +#include "cpu/z80/z80.h" #include "imagedev/cassette.h" #include "imagedev/flopdrv.h" #include "imagedev/snapquik.h" +#include "machine/ay31015.h" +#include "machine/buffer.h" +#include "machine/wd_fdc.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" + #include "formats/trs_cas.h" @@ -188,4 +191,4 @@ private: memory_bank *m_bank19; }; -#endif /* TRS80_H_ */ +#endif // MAME_INCLUDES_TRS80_H diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index ddf2c2c4c7e..43138505bd3 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -1,6 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski #include "sound/msm5205.h" +#include "screen.h" class tubep_state : public driver_device { diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index 3fb59553d6e..53d73cb4c28 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, David Haywood +#include "screen.h" + class tunhunt_state : public driver_device { public: diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index c22ae420c36..e82084a1e30 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -10,6 +10,8 @@ #include "machine/i8255.h" #include "sound/discrete.h" #include "sound/samples.h" +#include "screen.h" + /* sprites are scaled in the analog domain; to give a better */ /* rendition of this, we scale in the X direction by this factor */ #define TURBO_X_SCALE 2 diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index 9ad1c3596af..cf540a6e8ef 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -7,6 +7,7 @@ ****************************************************************************/ #include "machine/ataintf.h" +#include "screen.h" class turrett_state : public driver_device @@ -127,4 +128,4 @@ private: }; // device type definition -const device_type TURRETT = &device_creator; +extern const device_type TURRETT; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index c150f291711..299187d1851 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -3,6 +3,7 @@ #include "video/bufsprite.h" #include "sound/upd7759.h" #include "sound/k007232.h" +#include "screen.h" class twin16_state : public driver_device { diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 4d3a5024cc2..d8c15b8dac6 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -8,6 +8,7 @@ #include "video/mc6845.h" #include "video/bufsprite.h" #include "video/toaplan_scu.h" +#include "screen.h" class twincobr_state : public driver_device { diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index 4f73d04e434..75858e9c2ec 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -6,6 +6,8 @@ *************************************************************************/ +#include "screen.h" + #define TX1_PIXEL_CLOCK (XTAL_18MHz / 3) #define TX1_HBSTART 256 diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index f93ecbfc5f0..b1c924e6861 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" class ultratnk_state : public driver_device { diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index c050abd3706..fd7be8ffa66 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -2,6 +2,7 @@ // copyright-holders:Luca Elia #include "sound/okim6295.h" #include "machine/eepromser.h" +#include "screen.h" class unico_state : public driver_device { diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index b9a1faaa6b4..f75a2179a00 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -2,6 +2,7 @@ // copyright-holders:Paul Hampson #include "machine/gen_latch.h" +#include "screen.h" class vball_state : public driver_device { diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index 1c8605db3e0..fd972d9da6f 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -19,6 +19,8 @@ #include "bus/vc4000/slot.h" #include "bus/vc4000/rom.h" +#include "screen.h" + // define this to use digital inputs instead of the slow // autocentering analog mame joys #define ANALOG_HACK diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h index dc0b320ac92..88df82c5a55 100644 --- a/src/mame/includes/vector06.h +++ b/src/mame/includes/vector06.h @@ -6,22 +6,26 @@ * ****************************************************************************/ -#ifndef VECTOR06_H_ -#define VECTOR06_H_ +#ifndef MAME_INCLUDES_VECTOR06_H +#define MAME_INCLUDES_VECTOR06_H + +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" -#include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" -#include "sound/speaker.h" -#include "sound/wave.h" -#include "sound/ay8910.h" +#include "cpu/z80/z80.h" + +#include "imagedev/cassette.h" +#include "imagedev/flopdrv.h" + #include "machine/i8255.h" #include "machine/pit8253.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "imagedev/cassette.h" -#include "imagedev/flopdrv.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" + +#include "sound/ay8910.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" class vector06_state : public driver_device @@ -116,4 +120,4 @@ private: void update_mem(); }; -#endif /* VECTOR06_H_ */ +#endif // MAME_INCLUDES_VECTOR06_H diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index 61ceaa45c51..024c8d74226 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -17,6 +17,8 @@ #include "bus/vectrex/slot.h" #include "bus/vectrex/rom.h" +#include "screen.h" + #define NVECT 10000 struct vectrex_point diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 75062f2886b..d13b3befec8 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -10,6 +10,7 @@ #include "sound/ay8910.h" #include "sound/discrete.h" #include "sound/samples.h" +#include "screen.h" class vicdual_state : public driver_device { diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 2255c7b38a6..31c775819b5 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -6,6 +6,8 @@ ****************************************************************************/ +#include "screen.h" + #define VICTORY_MAIN_CPU_CLOCK (XTAL_8MHz / 2) diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 083d094e227..2feb75a9c90 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define VIDEOPIN_OCTAVE_DATA NODE_01 diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 711f643ef34..fcd3f4ef6e0 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "video/pc090oj.h" +#include "screen.h" class volfied_state : public driver_device { diff --git a/src/mame/includes/vtech2.h b/src/mame/includes/vtech2.h index 498d0560bf1..4353118021c 100644 --- a/src/mame/includes/vtech2.h +++ b/src/mame/includes/vtech2.h @@ -6,12 +6,13 @@ * ****************************************************************************/ -#ifndef VTECH2_H_ -#define VTECH2_H_ -#include "sound/speaker.h" -#include "imagedev/cassette.h" -#include "bus/generic/slot.h" +#ifndef MAME_INCLUDES_VTECH2_H +#define MAME_INCLUDES_VTECH2_H + #include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "imagedev/cassette.h" +#include "sound/spkrdev.h" #define TRKSIZE_FM 3172 /* size of a standard FM mode track */ @@ -93,4 +94,4 @@ public: }; -#endif /* VTECH2_H_ */ +#endif // MAME_INCLUDES_VTECH2_H diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 45535f70885..901bf63b791 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/k007232.h" #include "video/k051316.h" +#include "screen.h" class wecleman_state : public driver_device { diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 60526017e3c..e881db20a91 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -15,6 +15,7 @@ #include "machine/6821pia.h" #include "machine/bankdev.h" #include "audio/williams.h" +#include "screen.h" class williams_state : public driver_device { diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 1f7e8ac7baa..24264f09a17 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "sound/s14001a.h" +#include "screen.h" class wolfpack_state : public driver_device { diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 5337dac34d4..78c1c5a3161 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -2,6 +2,7 @@ // copyright-holders:David Haywood #include "machine/gen_latch.h" +#include "screen.h" class wwfsstar_state : public driver_device { diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index 1450d3694f5..852ffcb26d7 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -8,18 +8,21 @@ * ****************************************************************************/ -#ifndef X68K_H_ -#define X68K_H_ +#ifndef MAME_INCLUDES_X68K_H +#define MAME_INCLUDES_X68K_H #include "cpu/m68000/m68000.h" +#include "machine/8530scc.h" #include "machine/hd63450.h" +#include "machine/i8255.h" +#include "machine/mc68901.h" +#include "machine/ram.h" #include "machine/rp5c15.h" #include "machine/upd765.h" #include "sound/okim6258.h" -#include "machine/ram.h" -#include "machine/8530scc.h" #include "sound/ym2151.h" -#include "machine/i8255.h" + +#include "screen.h" #define MC68901_TAG "mc68901" #define RP5C15_TAG "rp5c15" @@ -354,4 +357,4 @@ protected: -#endif /* X68K_H_ */ +#endif // MAME_INCLUDES_X68K_H diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index bb9c980ed14..5c7f6db2fa2 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -4,6 +4,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" +#include "screen.h" class xain_state : public driver_device { diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h index 38748c224bd..b28504d7306 100644 --- a/src/mame/includes/xbox.h +++ b/src/mame/includes/xbox.h @@ -1,10 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Samuele Zannoli +#ifndef MAME_INCLUDES_XBOX_H +#define MAME_INCLUDES_XBOX_H #pragma once +#include "xbox_nv2a.h" #include "xbox_usb.h" +#include "machine/idectrl.h" +#include "machine/pic8259.h" + + class xbox_base_state : public driver_device { public: @@ -147,3 +154,5 @@ private: ADDRESS_MAP_EXTERN(xbox_base_map, 32); ADDRESS_MAP_EXTERN(xbox_base_map_io, 32); MACHINE_CONFIG_EXTERN(xbox_base); + +#endif // MAME_INCLUDES_XBOX_H diff --git a/src/mame/includes/xbox_nv2a.h b/src/mame/includes/xbox_nv2a.h index e56e586f495..f090f0b373f 100644 --- a/src/mame/includes/xbox_nv2a.h +++ b/src/mame/includes/xbox_nv2a.h @@ -3,6 +3,14 @@ /* * geforce 3d (NV2A) vertex program disassembler */ +#ifndef MAME_INCLUDES_XBOX_NV2A_H +#define MAME_INCLUDES_XBOX_NV2A_H + +#pragma once + +#include "machine/pic8259.h" +#include "video/poly.h" + #include class vertex_program_disassembler { @@ -757,3 +765,5 @@ public: bool enable_waitvblank; bool enable_clipping_w; }; + +#endif // MAME_INCLUDES_XBOX_NV2A_H diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index a34116816de..2969f58712c 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __XEROX820__ -#define __XEROX820__ +#ifndef MAME_INCLUDES_XEROX820_H +#define MAME_INCLUDES_XEROX820_H + +#pragma once #include "bus/scsi/sa1403d.h" #include "bus/rs232/rs232.h" @@ -17,7 +19,7 @@ #include "machine/z80pio.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/beep.h" #define SCREEN_TAG "screen" @@ -160,4 +162,4 @@ public: void bankswitch(int bank) override; }; -#endif +#endif // MAME_INCLUDES_XEROX820_H diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index 31a97364a31..a77801fe8e8 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -16,6 +16,7 @@ #include "video/k054338.h" #include "video/k053251.h" #include "video/konami_helper.h" +#include "screen.h" class xexex_state : public driver_device { diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index ddce4d15aa2..2e88cba6b2f 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -7,6 +7,7 @@ #include "video/k053251.h" #include "video/k052109.h" #include "video/konami_helper.h" +#include "screen.h" class xmen_state : public driver_device { diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index a1208108cf1..6086df5705e 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -8,6 +8,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class yunsun16_state : public driver_device { diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h index 33333086f06..beae4c38fa2 100644 --- a/src/mame/includes/z88.h +++ b/src/mame/includes/z88.h @@ -6,19 +6,22 @@ * ****************************************************************************/ -#ifndef Z88_H_ -#define Z88_H_ +#ifndef MAME_INCLUDES_Z88_H +#define MAME_INCLUDES_Z88_H #include "cpu/z80/z80.h" -#include "machine/upd65031.h" #include "machine/ram.h" -#include "bus/z88/z88.h" +#include "machine/upd65031.h" +#include "sound/spkrdev.h" + #include "bus/z88/flash.h" #include "bus/z88/ram.h" #include "bus/z88/rom.h" -#include "sound/speaker.h" +#include "bus/z88/z88.h" + #include "rendlay.h" + #define Z88_NUM_COLOURS 3 #define Z88_SCREEN_WIDTH 640 @@ -91,4 +94,4 @@ public: DECLARE_PALETTE_INIT(z88); }; -#endif /* Z88_H_ */ +#endif /* MAME_INCLUDES_Z88_H */ diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 8f3338ff4ee..4d1cef16719 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Coates #include "machine/s2636.h" +#include "screen.h" class zac2650_state : public driver_device { diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index 4f88bf23f25..46a18196e4b 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -6,16 +6,21 @@ * ****************************************************************************/ -#ifndef ZX_H_ -#define ZX_H_ +#ifndef MAME_INCLUDES_ZX_H +#define MAME_INCLUDES_ZX_H + +#pragma once #include "cpu/z80/z80.h" -#include "sound/speaker.h" -#include "sound/wave.h" #include "imagedev/cassette.h" -#include "formats/zx81_p.h" -#include "formats/tzx_cas.h" #include "machine/ram.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" + +#include "screen.h" + +#include "formats/tzx_cas.h" +#include "formats/zx81_p.h" class zx_state : public driver_device @@ -105,4 +110,4 @@ protected: void recalc_hsync(); }; -#endif /* ZX_H_ */ +#endif // MAME_INCLUDES_ZX_H diff --git a/src/mame/machine/315-5838_317-0229_comp.cpp b/src/mame/machine/315-5838_317-0229_comp.cpp index a203d873499..dd03de19e1d 100644 --- a/src/mame/machine/315-5838_317-0229_comp.cpp +++ b/src/mame/machine/315-5838_317-0229_comp.cpp @@ -48,7 +48,7 @@ #include "emu.h" #include "machine/315-5838_317-0229_comp.h" -extern const device_type SEGA315_5838_COMP = &device_creator; +const device_type SEGA315_5838_COMP = device_creator; //#define DEBUG_DATA_DUMP diff --git a/src/mame/machine/315-5881_crypt.cpp b/src/mame/machine/315-5881_crypt.cpp index a3da4752d76..124f430c4e1 100644 --- a/src/mame/machine/315-5881_crypt.cpp +++ b/src/mame/machine/315-5881_crypt.cpp @@ -17,7 +17,7 @@ #include "emu.h" #include "machine/315-5881_crypt.h" -extern const device_type SEGA315_5881_CRYPT = &device_creator; +const device_type SEGA315_5881_CRYPT = device_creator; sega_315_5881_crypt_device::sega_315_5881_crypt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/machine/315_5296.cpp b/src/mame/machine/315_5296.cpp index 46464969d50..15621dc3cda 100644 --- a/src/mame/machine/315_5296.cpp +++ b/src/mame/machine/315_5296.cpp @@ -26,7 +26,7 @@ #include "machine/315_5296.h" -const device_type SEGA_315_5296 = &device_creator; +const device_type SEGA_315_5296 = device_creator; //------------------------------------------------- // sega_315_5296_device - constructor diff --git a/src/mame/machine/3do.cpp b/src/mame/machine/3do.cpp index 9f1ef4208da..e66ed76f6ee 100644 --- a/src/mame/machine/3do.cpp +++ b/src/mame/machine/3do.cpp @@ -61,8 +61,12 @@ Expansion bus stuff: #include "emu.h" #include "includes/3do.h" + #include "cpu/arm7/arm7core.h" + #include "debugger.h" +#include "screen.h" + #define VERBOSE 1 #define LOG(x) do { if (VERBOSE) printf x; } while (0) diff --git a/src/mame/machine/6883sam.cpp b/src/mame/machine/6883sam.cpp index 36de03974ec..ecca3bd78bc 100644 --- a/src/mame/machine/6883sam.cpp +++ b/src/mame/machine/6883sam.cpp @@ -59,7 +59,7 @@ #define LOG_SAM 0 -const device_type SAM6883 = &device_creator; +const device_type SAM6883 = device_creator; diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index a7c220d01d9..16e2338a9b2 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -54,7 +54,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC1600_MAC = &device_creator; +const device_type ABC1600_MAC = device_creator; DEVICE_ADDRESS_MAP_START( map, 8, abc1600_mac_device ) diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp index f57bfb8a31e..afefb8cf5d8 100644 --- a/src/mame/machine/abc80kb.cpp +++ b/src/mame/machine/abc80kb.cpp @@ -88,7 +88,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC80_KEYBOARD = &device_creator; +const device_type ABC80_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp index 99d130e63c6..9aa3522329c 100644 --- a/src/mame/machine/alpha8201.cpp +++ b/src/mame/machine/alpha8201.cpp @@ -277,7 +277,7 @@ Notes: /**************************************************************************/ -const device_type ALPHA_8201 = &device_creator; +const device_type ALPHA_8201 = device_creator; //------------------------------------------------- // alpha_8201_device - constructor diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp index 6f38cf230e9..8e7d114e1ae 100644 --- a/src/mame/machine/amstrad.cpp +++ b/src/mame/machine/amstrad.cpp @@ -38,6 +38,8 @@ This gives a total of 19968 NOPs per frame. #include "emu.h" +#include "includes/amstrad.h" + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/mc146818.h" @@ -47,7 +49,6 @@ This gives a total of 19968 NOPs per frame. #include "bus/cpc/mface2.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "includes/amstrad.h" #include "sound/ay8910.h" #include "machine/ram.h" diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index d7323da90c2..9bb870aab5a 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -137,9 +137,7 @@ private: // internal state }; -extern const device_type APOLLO_CONF; - -const device_type APOLLO_CONF = &device_creator; +const device_type APOLLO_CONF = device_creator; apollo_config_device::apollo_config_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APOLLO_CONF, "Apollo Configuration", tag, owner, clock, "apollo_config", __FILE__) @@ -811,7 +809,7 @@ WRITE8_MEMBER( apollo_sio::write ) } // device type definition -const device_type APOLLO_SIO = &device_creator; +const device_type APOLLO_SIO = device_creator; WRITE_LINE_MEMBER(apollo_state::sio_irq_handler) { @@ -864,7 +862,7 @@ WRITE_LINE_MEMBER(apollo_state::sio2_irq_handler) /*** Apollo Node ID device ***/ // device type definition -const device_type APOLLO_NI = &device_creator ; +const device_type APOLLO_NI = device_creator ; //------------------------------------------------- // apollo_ni - constructor @@ -1270,7 +1268,7 @@ MACHINE_RESET_MEMBER(apollo_state,apollo) ***************************************************************************/ // device type definition -const device_type APOLLO_STDIO = &device_creator ; +const device_type APOLLO_STDIO = device_creator ; //------------------------------------------------- // apollo_stdio_device - constructor diff --git a/src/mame/machine/apollo_kbd.cpp b/src/mame/machine/apollo_kbd.cpp index cc1220d0667..67244a77f24 100644 --- a/src/mame/machine/apollo_kbd.cpp +++ b/src/mame/machine/apollo_kbd.cpp @@ -56,7 +56,7 @@ ***************************************************************************/ // device type definition -const device_type APOLLO_KBD = &device_creator; +const device_type APOLLO_KBD = device_creator; //------------------------------------------------- // apollo_kbd_device - constructor diff --git a/src/mame/machine/apple2.cpp b/src/mame/machine/apple2.cpp index 733ccf619e1..6ef1c5b5825 100644 --- a/src/mame/machine/apple2.cpp +++ b/src/mame/machine/apple2.cpp @@ -9,15 +9,16 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/m6502/m6502.h" #include "includes/apple2.h" + +#include "imagedev/flopdrv.h" +#include "machine/appldriv.h" #include "machine/applefdc.h" #include "machine/sonydriv.h" -#include "machine/appldriv.h" -#include "imagedev/flopdrv.h" -#include "imagedev/cassette.h" -#include "sound/speaker.h" + #include "debugger.h" +#include "screen.h" + #ifdef MAME_DEBUG #define VERBOSE 1 diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index f7b382432d5..20b10825854 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -120,6 +120,7 @@ #include "includes/apple2gs.h" #include "includes/apple2.h" + #include "machine/applefdc.h" #include "machine/sonydriv.h" #include "machine/8530scc.h" @@ -127,7 +128,9 @@ #include "cpu/g65816/g65816.h" #include "sound/es5503.h" #include "machine/ram.h" + #include "debugger.h" +#include "screen.h" #define LOG_C0XX 0 #define LOG_ADB 0 diff --git a/src/mame/machine/apple3.cpp b/src/mame/machine/apple3.cpp index 238e0f46f27..8a7dc30e397 100644 --- a/src/mame/machine/apple3.cpp +++ b/src/mame/machine/apple3.cpp @@ -47,6 +47,7 @@ #include "emu.h" #include "includes/apple3.h" #include "includes/apple2.h" +#include "screen.h" #define LOG_MEMORY 1 #define LOG_INDXADDR 1 diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp index 21af9342dce..558145031c7 100644 --- a/src/mame/machine/apricotkb.cpp +++ b/src/mame/machine/apricotkb.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type APRICOT_KEYBOARD = &device_creator; +const device_type APRICOT_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/archimds.cpp b/src/mame/machine/archimds.cpp index 38778054513..a2f610b4af5 100644 --- a/src/mame/machine/archimds.cpp +++ b/src/mame/machine/archimds.cpp @@ -29,8 +29,8 @@ *****************************************************************************/ #include "emu.h" -#include "cpu/arm/arm.h" #include "includes/archimds.h" +#include "cpu/arm/arm.h" #include "debugger.h" static const int page_sizes[4] = { 4096, 8192, 16384, 32768 }; diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp index d4bc451c0ce..2336825677b 100644 --- a/src/mame/machine/asic65.cpp +++ b/src/mame/machine/asic65.cpp @@ -82,7 +82,7 @@ static const uint8_t command_map[3][MAX_COMMANDS] = } }; -const device_type ASIC65 = &device_creator; +const device_type ASIC65 = device_creator; asic65_device::asic65_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ASIC65, "Atari ASIC65", tag, owner, clock, "asic65", __FILE__), diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp index d79a9da0318..5dcca6b3177 100644 --- a/src/mame/machine/at.cpp +++ b/src/mame/machine/at.cpp @@ -13,10 +13,11 @@ #include "machine/at_keybc.h" #include "bus/pc_kbd/pc_kbdc.h" #include "softlist_dev.h" +#include "speaker.h" #define LOG_PORT80 0 -const device_type AT_MB = &device_creator; +const device_type AT_MB = device_creator; at_mb_device::at_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, AT_MB, "PC/AT Motherboard", tag, owner, clock, "at_mb", __FILE__), diff --git a/src/mame/machine/at.h b/src/mame/machine/at.h index 75f3f7cb703..3eac37f4355 100644 --- a/src/mame/machine/at.h +++ b/src/mame/machine/at.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol, Miodrag Milanovic, Carl -#ifndef _AT_H_ -#define _AT_H_ +#ifndef MAME_MACHINE_AT_H +#define MAME_MACHINE_AT_H #include "machine/mc146818.h" #include "machine/pic8259.h" @@ -9,7 +9,7 @@ #include "machine/am9517a.h" #include "bus/pc_kbd/pc_kbdc.h" #include "bus/isa/isa.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "softlist.h" class at_mb_device : public device_t @@ -91,4 +91,4 @@ extern const device_type AT_MB; MACHINE_CONFIG_EXTERN(at_softlists); -#endif +#endif // MAME_MACHINE_AT_H diff --git a/src/mame/machine/atari_vg.cpp b/src/mame/machine/atari_vg.cpp index 0ae26eef201..f9d0a999074 100644 --- a/src/mame/machine/atari_vg.cpp +++ b/src/mame/machine/atari_vg.cpp @@ -35,7 +35,7 @@ // device type definition -const device_type ATARIVGEAROM = &device_creator; +const device_type ATARIVGEAROM = device_creator; //------------------------------------------------- // atari_vg_earom_device - constructor diff --git a/src/mame/machine/atarifdc.cpp b/src/mame/machine/atarifdc.cpp index 4435d478534..ef399bb11c8 100644 --- a/src/mame/machine/atarifdc.cpp +++ b/src/mame/machine/atarifdc.cpp @@ -749,7 +749,7 @@ legacy_floppy_image_device *atari_fdc_device::atari_floppy_get_device_child(int return nullptr; } -const device_type ATARI_FDC = &device_creator; +const device_type ATARI_FDC = device_creator; atari_fdc_device::atari_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ATARI_FDC, "Atari FDC", tag, owner, clock, "atari_fdc", __FILE__), diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp index baa7f4b465e..57f851b131a 100644 --- a/src/mame/machine/atarigen.cpp +++ b/src/mame/machine/atarigen.cpp @@ -49,7 +49,7 @@ inline const atarigen_screen_timer *get_screen_timer(screen_device &screen) //************************************************************************** // device type definition -const device_type ATARI_SOUND_COMM = &device_creator; +const device_type ATARI_SOUND_COMM = device_creator; //------------------------------------------------- // atari_sound_comm_device - constructor @@ -342,7 +342,7 @@ void atari_sound_comm_device::delayed_6502_write(int data) //************************************************************************** // device type definition -const device_type ATARI_VAD = &device_creator; +const device_type ATARI_VAD = device_creator; //------------------------------------------------- // atari_vad_device - constructor @@ -819,8 +819,8 @@ void atari_vad_device::eof_update(emu_timer &timer) //************************************************************************** // device type definition -const device_type ATARI_EEPROM_2804 = &device_creator; -const device_type ATARI_EEPROM_2816 = &device_creator; +const device_type ATARI_EEPROM_2804 = device_creator; +const device_type ATARI_EEPROM_2816 = device_creator; //------------------------------------------------- // atari_eeprom_device - constructor diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 9927be55daa..bcede09ed34 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -8,13 +8,14 @@ ***************************************************************************/ -#ifndef __MACHINE_ATARIGEN__ -#define __MACHINE_ATARIGEN__ +#ifndef MAME_MACHINE_ATARIGEN_H +#define MAME_MACHINE_ATARIGEN_H +#include "includes/slapstic.h" +#include "cpu/m6502/m6502.h" #include "machine/eeprompar.h" #include "video/atarimo.h" -#include "cpu/m6502/m6502.h" -#include "includes/slapstic.h" +#include "screen.h" /*************************************************************************** @@ -458,4 +459,4 @@ public: ***************************************************************************/ -#endif +#endif // MAME_MACHINE_ATARIGEN_H diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp index cd574d48db9..37636902aea 100644 --- a/src/mame/machine/atarixga.cpp +++ b/src/mame/machine/atarixga.cpp @@ -63,7 +63,7 @@ static uint16_t parity(uint16_t x) * *************************************/ -extern const device_type ATARI_136094_0072 = &device_creator; +const device_type ATARI_136094_0072 = device_creator; atari_136094_0072_device::atari_136094_0072_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : atari_xga_device(mconfig, ATARI_136094_0072, tag, owner, clock, "Atari 136094-0072 XGA", "136094-0072") @@ -283,7 +283,7 @@ READ32_MEMBER(atari_136094_0072_device::read) * *************************************/ -extern const device_type ATARI_136095_0072 = &device_creator; +const device_type ATARI_136095_0072 = device_creator; atari_136095_0072_device::atari_136095_0072_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : atari_xga_device(mconfig, ATARI_136095_0072, tag, owner, clock, "Atari 136095-0072 XGA", "136095-0072") diff --git a/src/mame/machine/awboard.cpp b/src/mame/machine/awboard.cpp index 59dd8179828..dcccc77efc1 100644 --- a/src/mame/machine/awboard.cpp +++ b/src/mame/machine/awboard.cpp @@ -153,7 +153,7 @@ ROM board internal layouts: */ -const device_type AW_ROM_BOARD = &device_creator; +const device_type AW_ROM_BOARD = device_creator; DEVICE_ADDRESS_MAP_START(submap, 16, aw_rom_board) AM_RANGE(0x00, 0x01) AM_WRITE(epr_offsetl_w) diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp index 9185aa933f3..83d01f23f19 100644 --- a/src/mame/machine/beta.cpp +++ b/src/mame/machine/beta.cpp @@ -24,7 +24,7 @@ BUGS: ***************************************************************************/ -const device_type BETA_DISK = &device_creator; +const device_type BETA_DISK = device_creator; beta_disk_device::beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, BETA_DISK, "Beta Disk Interface", tag, owner, clock, "betadisk", __FILE__) diff --git a/src/mame/machine/bfm_bd1.cpp b/src/mame/machine/bfm_bd1.cpp index 3c1b6ea32f4..e16118c9424 100644 --- a/src/mame/machine/bfm_bd1.cpp +++ b/src/mame/machine/bfm_bd1.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "bfm_bd1.h" -const device_type BFM_BD1 = &device_creator; +const device_type BFM_BD1 = device_creator; /* diff --git a/src/mame/machine/bfm_bda.cpp b/src/mame/machine/bfm_bda.cpp index 2efd4a9f630..9d32eb883cd 100644 --- a/src/mame/machine/bfm_bda.cpp +++ b/src/mame/machine/bfm_bda.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "bfm_bda.h" -const device_type BFM_BDA = &device_creator; +const device_type BFM_BDA = device_creator; //I currently use the BDA character set, until a suitable image can be programmed diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp index b1d86b3ee03..36e8b5e3305 100644 --- a/src/mame/machine/c117.cpp +++ b/src/mame/machine/c117.cpp @@ -31,7 +31,7 @@ static MACHINE_CONFIG_FRAGMENT( namco_c117 ) MACHINE_CONFIG_END -const device_type NAMCO_C117 = &device_creator; +const device_type NAMCO_C117 = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp index 9c31e925611..c58298453d4 100644 --- a/src/mame/machine/cammu.cpp +++ b/src/mame/machine/cammu.cpp @@ -39,9 +39,9 @@ DEVICE_ADDRESS_MAP_START(map, 32, cammu_c3_device) AM_RANGE(0x000, 0xfff) AM_READWRITE(cammu_r, cammu_w) ADDRESS_MAP_END -const device_type CAMMU_C4T = &device_creator; -const device_type CAMMU_C4I = &device_creator; -const device_type CAMMU_C3 = &device_creator; +const device_type CAMMU_C4T = device_creator; +const device_type CAMMU_C4I = device_creator; +const device_type CAMMU_C3 = device_creator; cammu_c4t_device::cammu_c4t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cammu_device(mconfig, CAMMU_C4T, "C4E/C4T CAMMU", tag, owner, clock, "C4T", __FILE__) { } diff --git a/src/mame/machine/cat702.cpp b/src/mame/machine/cat702.cpp index a474c18be4b..7a3dc1f0e52 100644 --- a/src/mame/machine/cat702.cpp +++ b/src/mame/machine/cat702.cpp @@ -87,7 +87,7 @@ #include "emu.h" #include "cat702.h" -const device_type CAT702 = &device_creator; +const device_type CAT702 = device_creator; cat702_device::cat702_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CAT702, "CAT702", tag, owner, clock, "cat702", __FILE__), diff --git a/src/mame/machine/cdi070.cpp b/src/mame/machine/cdi070.cpp index 6f4bfbbd3b5..c3ba4d00891 100644 --- a/src/mame/machine/cdi070.cpp +++ b/src/mame/machine/cdi070.cpp @@ -27,7 +27,7 @@ TODO: #include "includes/cdi.h" // device type definition -const device_type MACHINE_CDI68070 = &device_creator; +const device_type MACHINE_CDI68070 = device_creator; #if ENABLE_VERBOSE_LOG static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...) diff --git a/src/mame/machine/cdicdic.cpp b/src/mame/machine/cdicdic.cpp index a5c5628c6cf..022fd1313c3 100644 --- a/src/mame/machine/cdicdic.cpp +++ b/src/mame/machine/cdicdic.cpp @@ -30,7 +30,7 @@ TODO: #include "imagedev/chd_cd.h" // device type definition -const device_type MACHINE_CDICDIC = &device_creator; +const device_type MACHINE_CDICDIC = device_creator; #if ENABLE_VERBOSE_LOG static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...) diff --git a/src/mame/machine/cdislave.cpp b/src/mame/machine/cdislave.cpp index 23141055e59..bbf21038307 100644 --- a/src/mame/machine/cdislave.cpp +++ b/src/mame/machine/cdislave.cpp @@ -28,7 +28,7 @@ TODO: #include "includes/cdi.h" // device type definition -const device_type MACHINE_CDISLAVE = &device_creator; +const device_type MACHINE_CDISLAVE = device_creator; #if ENABLE_VERBOSE_LOG diff --git a/src/mame/machine/cedar_magnet_flop.cpp b/src/mame/machine/cedar_magnet_flop.cpp index f496ac42f7f..c0abb54b341 100644 --- a/src/mame/machine/cedar_magnet_flop.cpp +++ b/src/mame/machine/cedar_magnet_flop.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cedar_magnet_flop.h" -extern const device_type CEDAR_MAGNET_FLOP = &device_creator; +const device_type CEDAR_MAGNET_FLOP = device_creator; cedar_magnet_flop_device::cedar_magnet_flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, CEDAR_MAGNET_FLOP, "Cedar Floppy Simulation", tag, owner, clock, "cedmag_flop", __FILE__) diff --git a/src/mame/machine/cedar_magnet_plane.cpp b/src/mame/machine/cedar_magnet_plane.cpp index 261e3d17ecb..9646d49dbed 100644 --- a/src/mame/machine/cedar_magnet_plane.cpp +++ b/src/mame/machine/cedar_magnet_plane.cpp @@ -6,7 +6,7 @@ #include "cedar_magnet_plane.h" -extern const device_type CEDAR_MAGNET_PLANE = &device_creator; +const device_type CEDAR_MAGNET_PLANE = device_creator; cedar_magnet_plane_device::cedar_magnet_plane_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/machine/cedar_magnet_sprite.cpp b/src/mame/machine/cedar_magnet_sprite.cpp index 74b8cedc5c5..5b27751dedd 100644 --- a/src/mame/machine/cedar_magnet_sprite.cpp +++ b/src/mame/machine/cedar_magnet_sprite.cpp @@ -10,7 +10,7 @@ #include "cedar_magnet_sprite.h" -extern const device_type CEDAR_MAGNET_SPRITE = &device_creator; +const device_type CEDAR_MAGNET_SPRITE = device_creator; cedar_magnet_sprite_device::cedar_magnet_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp index ddf0efaca74..5dfc15c28ed 100644 --- a/src/mame/machine/coco.cpp +++ b/src/mame/machine/coco.cpp @@ -59,7 +59,9 @@ DAC and bitbanger values written should be reflected in the read. #include "emu.h" #include "includes/coco.h" + #include "cpu/m6809/m6809.h" +#include "screen.h" diff --git a/src/mame/machine/coco_vhd.cpp b/src/mame/machine/coco_vhd.cpp index 1fd772418d9..e9141a63927 100644 --- a/src/mame/machine/coco_vhd.cpp +++ b/src/mame/machine/coco_vhd.cpp @@ -65,7 +65,7 @@ CORE IMPLEMENTATION ***************************************************************************/ -const device_type COCO_VHD = &device_creator; +const device_type COCO_VHD = device_creator; //------------------------------------------------- // coco_vhd_image_device - constructor diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp index 0343351ce51..8680a94798b 100644 --- a/src/mame/machine/compiskb.cpp +++ b/src/mame/machine/compiskb.cpp @@ -9,6 +9,10 @@ #include "emu.h" #include "compiskb.h" +#include "cpu/mcs48/mcs48.h" + +#include "speaker.h" + //************************************************************************** @@ -24,7 +28,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type COMPIS_KEYBOARD = &device_creator; +const device_type COMPIS_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/compiskb.h b/src/mame/machine/compiskb.h index 1d6c2f18d31..dfaf863bee4 100644 --- a/src/mame/machine/compiskb.h +++ b/src/mame/machine/compiskb.h @@ -6,13 +6,12 @@ *********************************************************************/ -#pragma once +#ifndef MAME_INCLUDES_COMPISKB_H +#define MAME_INCLUDES_COMPISKB_H -#ifndef __COMPIS_KEYBOARD__ -#define __COMPIS_KEYBOARD__ +#pragma once -#include "cpu/mcs48/mcs48.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" @@ -78,4 +77,4 @@ extern const device_type COMPIS_KEYBOARD; -#endif +#endif // MAME_INCLUDES_COMPISKB_H diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp index c578e6a3181..5ce2edfbd9a 100644 --- a/src/mame/machine/cuda.cpp +++ b/src/mame/machine/cuda.cpp @@ -40,9 +40,9 @@ #include "emu.h" #include "cuda.h" +#include "includes/mac.h" #include "cpu/m6805/m6805.h" #include "sound/asc.h" -#include "includes/mac.h" //************************************************************************** // MACROS / CONSTANTS @@ -54,7 +54,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type CUDA = &device_creator; +const device_type CUDA = device_creator; ROM_START( cuda ) ROM_REGION(0x4400, CUDA_CPU_TAG, 0) diff --git a/src/mame/machine/dc-ctrl.cpp b/src/mame/machine/dc-ctrl.cpp index 36bada88469..48db78e1af6 100644 --- a/src/mame/machine/dc-ctrl.cpp +++ b/src/mame/machine/dc-ctrl.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "dc-ctrl.h" -const device_type DC_CONTROLLER = &device_creator; +const device_type DC_CONTROLLER = device_creator; void dc_controller_device::static_set_port_tag(device_t &device, int port, const char *tag) { diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index 3e611d1f4e0..30d9203d2f3 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -107,6 +107,7 @@ ________|D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0 #include "emu.h" #include "dec_lk201.h" #include "cpu/m6805/m6805.h" +#include "speaker.h" //************************************************************************** // MACROS / CONSTANTS @@ -176,7 +177,7 @@ ________|D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0 // DEVICE DEFINITIONS //************************************************************************** -const device_type LK201 = &device_creator; +const device_type LK201 = device_creator; ROM_START( lk201 ) ROM_REGION(0x2000, LK201_CPU_TAG, 0) diff --git a/src/mame/machine/deco104.cpp b/src/mame/machine/deco104.cpp index d37726b63b8..42ce906f9a6 100644 --- a/src/mame/machine/deco104.cpp +++ b/src/mame/machine/deco104.cpp @@ -1051,7 +1051,7 @@ deco146port_xx port104_table[] = { -const device_type DECO104PROT = &device_creator; +const device_type DECO104PROT = device_creator; diff --git a/src/mame/machine/deco146.cpp b/src/mame/machine/deco146.cpp index ea805f73407..e5c9f35cd59 100644 --- a/src/mame/machine/deco146.cpp +++ b/src/mame/machine/deco146.cpp @@ -1315,7 +1315,7 @@ uint16_t deco_146_base_device::read_data(uint16_t address, uint16_t mem_mask, ui } -//const device_type DECO146BASE = &device_creator; +//const device_type DECO146BASE = device_creator; @@ -1464,7 +1464,7 @@ void deco_146_base_device::device_reset() -const device_type DECO146PROT = &device_creator; +const device_type DECO146PROT = device_creator; uint16_t deco_146_base_device::read_data_getloc(uint16_t address, int& location) diff --git a/src/mame/machine/deco222.cpp b/src/mame/machine/deco222.cpp index 9207c164f07..d19aefade66 100644 --- a/src/mame/machine/deco222.cpp +++ b/src/mame/machine/deco222.cpp @@ -8,6 +8,9 @@ #include "emu.h" #include "deco222.h" +const device_type DECO_222 = device_creator; +const device_type DECO_C10707 = device_creator; + deco_222_device::deco_222_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, DECO_222, "DECO 222", tag, owner, clock, "deco222", __FILE__) diff --git a/src/mame/machine/deco222.h b/src/mame/machine/deco222.h index 6281ba7a88c..56df49a0bad 100644 --- a/src/mame/machine/deco222.h +++ b/src/mame/machine/deco222.h @@ -21,8 +21,6 @@ protected: }; -static const device_type DECO_222 = &device_creator; - class deco_c10707_device : public m6502_device { @@ -43,4 +41,6 @@ protected: }; -static const device_type DECO_C10707 = &device_creator; + +extern const device_type DECO_222; +extern const device_type DECO_C10707; diff --git a/src/mame/machine/decocass_tape.cpp b/src/mame/machine/decocass_tape.cpp index a133a7c6339..a3be6307cfc 100644 --- a/src/mame/machine/decocass_tape.cpp +++ b/src/mame/machine/decocass_tape.cpp @@ -56,7 +56,7 @@ static uint16_t tape_crc16_byte(uint16_t crc, uint8_t data); -const device_type DECOCASS_TAPE = &device_creator; +const device_type DECOCASS_TAPE = device_creator; decocass_tape_device::decocass_tape_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECOCASS_TAPE, "DECO Cassette Tape", tag, owner, clock, "decocass_tape", __FILE__), diff --git a/src/mame/machine/decocpu6.cpp b/src/mame/machine/decocpu6.cpp index 5f5ab6e97b3..2162812d3dd 100644 --- a/src/mame/machine/decocpu6.cpp +++ b/src/mame/machine/decocpu6.cpp @@ -9,6 +9,9 @@ #include "emu.h" #include "decocpu6.h" +const device_type DECO_CPU6 = device_creator; + + deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, DECO_CPU6, "DECO CPU-6", tag, owner, clock, "decocpu6", __FILE__) { diff --git a/src/mame/machine/decocpu6.h b/src/mame/machine/decocpu6.h index fc176bbcfcd..5db333114fc 100644 --- a/src/mame/machine/decocpu6.h +++ b/src/mame/machine/decocpu6.h @@ -20,4 +20,4 @@ protected: }; -static const device_type DECO_CPU6 = &device_creator; +extern const device_type DECO_CPU6; diff --git a/src/mame/machine/decocpu7.cpp b/src/mame/machine/decocpu7.cpp index 7900cd3e866..6c7fe9c8179 100644 --- a/src/mame/machine/decocpu7.cpp +++ b/src/mame/machine/decocpu7.cpp @@ -4,6 +4,9 @@ #include "emu.h" #include "decocpu7.h" +const device_type DECO_CPU7 = device_creator; + + deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, DECO_CPU7, "DECO CPU-7", tag, owner, clock, "decocpu7", __FILE__) { diff --git a/src/mame/machine/decocpu7.h b/src/mame/machine/decocpu7.h index 229d97d6e30..18d1510bcb9 100644 --- a/src/mame/machine/decocpu7.h +++ b/src/mame/machine/decocpu7.h @@ -22,4 +22,4 @@ protected: }; -static const device_type DECO_CPU7 = &device_creator; +extern const device_type DECO_CPU7; diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp index 5166940d2ee..71ee0359f65 100644 --- a/src/mame/machine/decopincpu.cpp +++ b/src/mame/machine/decopincpu.cpp @@ -16,10 +16,10 @@ #include "emu.h" #include "decopincpu.h" -const device_type DECOCPU1 = &device_creator; -const device_type DECOCPU2 = &device_creator; -const device_type DECOCPU3 = &device_creator; -const device_type DECOCPU3B = &device_creator; +const device_type DECOCPU1 = device_creator; +const device_type DECOCPU2 = device_creator; +const device_type DECOCPU3 = device_creator; +const device_type DECOCPU3B = device_creator; static ADDRESS_MAP_START( decocpu1_map, AS_PROGRAM, 8, decocpu_type1_device ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp index a34993d1861..6d5d830c9d9 100644 --- a/src/mame/machine/dmv_keyb.cpp +++ b/src/mame/machine/dmv_keyb.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type DMV_KEYBOARD = &device_creator; +const device_type DMV_KEYBOARD = device_creator; //*************************************************************************** diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp index 4ab93b55ea0..d6ef4bdca30 100644 --- a/src/mame/machine/docg3.cpp +++ b/src/mame/machine/docg3.cpp @@ -32,7 +32,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c ***************************************************************************/ // device type definition -const device_type DISKONCHIP_G3 = &device_creator; +const device_type DISKONCHIP_G3 = device_creator; //------------------------------------------------- // diskonchip_g3_device - constructor diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index ee3352fb0ea..4ca3dd6fb3e 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -39,9 +39,9 @@ #include "emu.h" #include "egret.h" +#include "includes/mac.h" #include "cpu/m6805/m6805.h" #include "sound/asc.h" -#include "includes/mac.h" //************************************************************************** // MACROS / CONSTANTS @@ -53,7 +53,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type EGRET = &device_creator; +const device_type EGRET = device_creator; ROM_START( egret ) ROM_REGION(0x4400, EGRET_CPU_TAG, 0) diff --git a/src/mame/machine/einstein.cpp b/src/mame/machine/einstein.cpp index 0a9035df945..d9145ab2509 100644 --- a/src/mame/machine/einstein.cpp +++ b/src/mame/machine/einstein.cpp @@ -15,7 +15,7 @@ ****************************************************************/ -const device_type EINSTEIN_KEYBOARD_DAISY = &device_creator; +const device_type EINSTEIN_KEYBOARD_DAISY = device_creator; //************************************************************************** @@ -79,7 +79,7 @@ void einstein_keyboard_daisy_device::z80daisy_irq_reti() { } -const device_type EINSTEIN_ADC_DAISY = &device_creator; +const device_type EINSTEIN_ADC_DAISY = device_creator; //************************************************************************** // LIVE DEVICE @@ -143,7 +143,7 @@ void einstein_adc_daisy_device::z80daisy_irq_reti() } -const device_type EINSTEIN_FIRE_DAISY = &device_creator; +const device_type EINSTEIN_FIRE_DAISY = device_creator; //************************************************************************** diff --git a/src/mame/machine/electron.cpp b/src/mame/machine/electron.cpp index 5c72a5cc1ea..1bdfdebb88e 100644 --- a/src/mame/machine/electron.cpp +++ b/src/mame/machine/electron.cpp @@ -11,8 +11,7 @@ #include "emu.h" #include "includes/electron.h" -#include "sound/beep.h" -#include "imagedev/cassette.h" +#include "screen.h" void electron_state::waitforramsync() diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp index 273e52b1953..9e71f99c2f0 100644 --- a/src/mame/machine/esqlcd.cpp +++ b/src/mame/machine/esqlcd.cpp @@ -10,7 +10,7 @@ //#define VERBOSE -const device_type ESQ2x16_SQ1 = &device_creator; +const device_type ESQ2x16_SQ1 = device_creator; // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- static MACHINE_CONFIG_FRAGMENT(esq2x16) diff --git a/src/mame/machine/esqpanel.cpp b/src/mame/machine/esqpanel.cpp index 741e8e71003..e0bdfc823b5 100644 --- a/src/mame/machine/esqpanel.cpp +++ b/src/mame/machine/esqpanel.cpp @@ -14,9 +14,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ESQPANEL1x22 = &device_creator; -const device_type ESQPANEL2x40 = &device_creator; -const device_type ESQPANEL2x16_SQ1 = &device_creator; +const device_type ESQPANEL1x22 = device_creator; +const device_type ESQPANEL2x40 = device_creator; +const device_type ESQPANEL2x16_SQ1 = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index aa557cbed92..81a7400b223 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -10,9 +10,9 @@ #include "esq1by22.lh" #include "esq2by40.lh" -const device_type ESQ1x22 = &device_creator; -const device_type ESQ2x40 = &device_creator; -const device_type ESQ2x40_SQ1 = &device_creator; +const device_type ESQ1x22 = device_creator; +const device_type ESQ2x40 = device_creator; +const device_type ESQ2x40_SQ1 = device_creator; // adapted from bfm_bd1, rearranged to work with ASCII data used by the Ensoniq h/w static const uint16_t font[]= diff --git a/src/mame/machine/fd1089.cpp b/src/mame/machine/fd1089.cpp index bf12b35cbae..1d6a13c1940 100644 --- a/src/mame/machine/fd1089.cpp +++ b/src/mame/machine/fd1089.cpp @@ -142,8 +142,8 @@ //************************************************************************** // device type definition -const device_type FD1089A = &device_creator; -const device_type FD1089B = &device_creator; +const device_type FD1089A = device_creator; +const device_type FD1089B = device_creator; // common base lookup table, shared between A and B variants const uint8_t fd1089_base_device::s_basetable_fd1089[0x100] = diff --git a/src/mame/machine/fd1094.cpp b/src/mame/machine/fd1094.cpp index 8452bf20e77..2c81115e82f 100644 --- a/src/mame/machine/fd1094.cpp +++ b/src/mame/machine/fd1094.cpp @@ -379,7 +379,7 @@ //************************************************************************** // device type definition -const device_type FD1094 = &device_creator; +const device_type FD1094 = device_creator; /* 317-0162 CPU also needs to mask: diff --git a/src/mame/machine/fm_scsi.cpp b/src/mame/machine/fm_scsi.cpp index 6187c91aab7..164f26e7610 100644 --- a/src/mame/machine/fm_scsi.cpp +++ b/src/mame/machine/fm_scsi.cpp @@ -32,7 +32,7 @@ * Device config */ -const device_type FMSCSI = &device_creator; +const device_type FMSCSI = device_creator; /* * Device diff --git a/src/mame/machine/fmt_icmem.cpp b/src/mame/machine/fmt_icmem.cpp index 8a22f583d30..bdb058b11dd 100644 --- a/src/mame/machine/fmt_icmem.cpp +++ b/src/mame/machine/fmt_icmem.cpp @@ -14,7 +14,7 @@ #include "fmt_icmem.h" // device type definition -const device_type FMT_ICMEM = &device_creator; +const device_type FMT_ICMEM = device_creator; //------------------------------------------------- // fmt_icmem_device - constructor diff --git a/src/mame/machine/gaelco3d.cpp b/src/mame/machine/gaelco3d.cpp index 567b0e5a5f6..f1a7c4851b7 100644 --- a/src/mame/machine/gaelco3d.cpp +++ b/src/mame/machine/gaelco3d.cpp @@ -168,7 +168,7 @@ static void buf_reset(buf_t *buf) buf->cnt = 0; } -const device_type GAELCO_SERIAL = &device_creator; +const device_type GAELCO_SERIAL = device_creator; gaelco_serial_device::gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, GAELCO_SERIAL, "Gaelco 3D Serial Hardware", tag, owner, clock, "gaelco_serial", __FILE__), diff --git a/src/mame/machine/gamecom.cpp b/src/mame/machine/gamecom.cpp index 2756dee4960..62f4da29c56 100644 --- a/src/mame/machine/gamecom.cpp +++ b/src/mame/machine/gamecom.cpp @@ -4,6 +4,7 @@ #include "emu.h" #include "includes/gamecom.h" +#include "screen.h" static const int gamecom_timer_limit[8] = { 2, 1024, 2048, 4096, 8192, 16384, 32768, 65536 }; diff --git a/src/mame/machine/gamepock.cpp b/src/mame/machine/gamepock.cpp index 2d5d543ab6a..9d705519d0f 100644 --- a/src/mame/machine/gamepock.cpp +++ b/src/mame/machine/gamepock.cpp @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol #include "emu.h" -#include "sound/speaker.h" -#include "cpu/upd7810/upd7810.h" #include "includes/gamepock.h" +#include "cpu/upd7810/upd7810.h" + void gamepock_state::hd44102ch_w( int which, int c_d, uint8_t data ) { diff --git a/src/mame/machine/gdrom.cpp b/src/mame/machine/gdrom.cpp index fd081b3f060..e7420ec9383 100644 --- a/src/mame/machine/gdrom.cpp +++ b/src/mame/machine/gdrom.cpp @@ -434,7 +434,7 @@ void gdrom_device::WriteData( uint8_t *data, int dataLength ) } // device type definition -const device_type GDROM = &device_creator; +const device_type GDROM = device_creator; gdrom_device::gdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : atapi_cdrom_device(mconfig, GDROM, "GDROM", tag, owner, clock, "gdrom", __FILE__) diff --git a/src/mame/machine/genpin.cpp b/src/mame/machine/genpin.cpp index 5875bc787c8..0322e35f971 100644 --- a/src/mame/machine/genpin.cpp +++ b/src/mame/machine/genpin.cpp @@ -6,10 +6,10 @@ This is for common pinball machine coding. **********************************************************************************/ - - #include "emu.h" #include "genpin.h" +#include "speaker.h" + MACHINE_CONFIG_FRAGMENT( genpin_audio ) MCFG_SPEAKER_STANDARD_MONO("mechvol") diff --git a/src/mame/machine/hec2hrp.cpp b/src/mame/machine/hec2hrp.cpp index affbcd2fd07..14b0affeaa1 100644 --- a/src/mame/machine/hec2hrp.cpp +++ b/src/mame/machine/hec2hrp.cpp @@ -40,16 +40,20 @@ */ #include "emu.h" +#include "includes/hec2hrp.h" + +#include "cpu/z80/z80.h" #include "imagedev/cassette.h" #include "imagedev/printer.h" +#include "machine/upd765.h" /* for floppy disc controller */ #include "sound/wave.h" /* for K7 sound*/ #include "sound/discrete.h" /* for 1 Bit sound*/ -#include "machine/upd765.h" /* for floppy disc controller */ + +#include "speaker.h" #include "formats/hect_tap.h" -#include "includes/hec2hrp.h" #include "formats/hect_dsk.h" -#include "cpu/z80/z80.h" + #ifndef DEBUG_TRACE_COM_HECTOR //#define DEBUG_TRACE_COM_HECTOR 1 diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp index a8e95d35a45..8d205d50672 100644 --- a/src/mame/machine/hp48.cpp +++ b/src/mame/machine/hp48.cpp @@ -9,11 +9,12 @@ **********************************************************************/ #include "emu.h" -#include "cpu/saturn/saturn.h" +#include "includes/hp48.h" +#include "cpu/saturn/saturn.h" #include "machine/nvram.h" -#include "includes/hp48.h" +#include "screen.h" /*************************************************************************** @@ -913,7 +914,7 @@ void hp48_state::hp48_encode_nibble( uint8_t* dst, uint8_t* src, int size ) /* ----- card images ------ */ -const device_type HP48_PORT = &device_creator; +const device_type HP48_PORT = device_creator; /* helper for load and create */ void hp48_port_image_device::hp48_fill_port() diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp index bf278444c11..101aa9b0453 100644 --- a/src/mame/machine/ibm6580_fdc.cpp +++ b/src/mame/machine/ibm6580_fdc.cpp @@ -17,7 +17,7 @@ } while (0) -const device_type DW_FDC = &device_creator; +const device_type DW_FDC = device_creator; ROM_START( dw_fdc ) ROM_REGION(0x800, "mcu", 0) diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp index edc28843960..5bd25997f8d 100644 --- a/src/mame/machine/ibm6580_kbd.cpp +++ b/src/mame/machine/ibm6580_kbd.cpp @@ -16,7 +16,7 @@ } while (0) -const device_type DW_KEYBOARD = &device_creator; +const device_type DW_KEYBOARD = device_creator; ROM_START( dw_keyboard ) ROM_REGION(0x800, "mcu", 0) diff --git a/src/mame/machine/ie15_kbd.cpp b/src/mame/machine/ie15_kbd.cpp index 88fc6f2b134..c5016c6006c 100644 --- a/src/mame/machine/ie15_kbd.cpp +++ b/src/mame/machine/ie15_kbd.cpp @@ -300,4 +300,4 @@ ioport_constructor ie15_keyboard_device::device_input_ports() const return INPUT_PORTS_NAME(ie15_keyboard); } -const device_type IE15_KEYBOARD = &device_creator; +const device_type IE15_KEYBOARD = device_creator; diff --git a/src/mame/machine/igs022.cpp b/src/mame/machine/igs022.cpp index f92f8425a26..afa5dda87e9 100644 --- a/src/mame/machine/igs022.cpp +++ b/src/mame/machine/igs022.cpp @@ -273,4 +273,4 @@ void igs022_device::IGS022_handle_command() } -const device_type IGS022 = &device_creator; +const device_type IGS022 = device_creator; diff --git a/src/mame/machine/igs022.h b/src/mame/machine/igs022.h index e13b3d149c1..0460b1586d6 100644 --- a/src/mame/machine/igs022.h +++ b/src/mame/machine/igs022.h @@ -1,6 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi /* IGS022 */ +#ifndef MAME_MACHINE_IGS022_H +#define MAME_MACHINE_IGS022_H class igs022_device : public device_t @@ -23,5 +25,6 @@ protected: }; - extern const device_type IGS022; + +#endif // MAME_MACHINE_IGS022_H diff --git a/src/mame/machine/igs025.cpp b/src/mame/machine/igs025.cpp index af750428f75..5bbec6fa07e 100644 --- a/src/mame/machine/igs025.cpp +++ b/src/mame/machine/igs025.cpp @@ -356,4 +356,4 @@ void igs025_device::killbld_protection_calculate_hilo() -const device_type IGS025 = &device_creator; +const device_type IGS025 = device_creator; diff --git a/src/mame/machine/igs025.h b/src/mame/machine/igs025.h index 652119e786c..d3dc87f0447 100644 --- a/src/mame/machine/igs025.h +++ b/src/mame/machine/igs025.h @@ -1,7 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi /* Common device stuff for IGS025 / IGS022, should be split into devices for each chip once we know where what part does what */ - +#ifndef MAME_MACHINE_IGS025_H +#define MAME_MACHINE_IGS025_H // used to connect the 022 @@ -56,5 +57,6 @@ protected: }; - extern const device_type IGS025; + +#endif // MAME_MACHINE_IGS025_H diff --git a/src/mame/machine/igs028.cpp b/src/mame/machine/igs028.cpp index 372c2617ef1..74205936960 100644 --- a/src/mame/machine/igs028.cpp +++ b/src/mame/machine/igs028.cpp @@ -212,4 +212,4 @@ void igs028_device::IGS028_handle() } -const device_type IGS028 = &device_creator; +const device_type IGS028 = device_creator; diff --git a/src/mame/machine/igs028.h b/src/mame/machine/igs028.h index 3607a16bfd0..911781d19ca 100644 --- a/src/mame/machine/igs028.h +++ b/src/mame/machine/igs028.h @@ -1,7 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi /* IGS 028 */ - +#ifndef MAME_MACHINE_IGS028_H +#define MAME_MACHINE_IGS028_H class igs028_device : public device_t @@ -24,5 +25,6 @@ protected: }; - extern const device_type IGS028; + +#endif // MAME_MACHINE_IGS028_H diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp index 66d297641d4..b199717fa76 100644 --- a/src/mame/machine/inder_sb.cpp +++ b/src/mame/machine/inder_sb.cpp @@ -5,10 +5,12 @@ #include "emu.h" #include "machine/inder_sb.h" + #include "sound/volt_reg.h" +#include "speaker.h" -extern const device_type INDER_AUDIO = &device_creator; +const device_type INDER_AUDIO = device_creator; inder_sb_device::inder_sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp index 325134d8e3d..82568dec121 100644 --- a/src/mame/machine/inder_vid.cpp +++ b/src/mame/machine/inder_vid.cpp @@ -8,9 +8,10 @@ #include "emu.h" #include "machine/inder_vid.h" +#include "screen.h" -extern const device_type INDER_VIDEO = &device_creator; +const device_type INDER_VIDEO = device_creator; inder_vid_device::inder_vid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp index 373f1545fcb..a169013b8fb 100644 --- a/src/mame/machine/interpro_ioga.cpp +++ b/src/mame/machine/interpro_ioga.cpp @@ -56,7 +56,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, interpro_ioga_device) AM_RANGE(0xb0, 0xbf) AM_READWRITE16(softint_vector_r, softint_vector_w, 0xffffffff) ADDRESS_MAP_END -const device_type INTERPRO_IOGA = &device_creator; +const device_type INTERPRO_IOGA = device_creator; interpro_ioga_device::interpro_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, INTERPRO_IOGA, "InterPro IOGA", tag, owner, clock, "ioga", __FILE__), diff --git a/src/mame/machine/interpro_mcga.cpp b/src/mame/machine/interpro_mcga.cpp index c35c7d13305..e049a76f5ef 100644 --- a/src/mame/machine/interpro_mcga.cpp +++ b/src/mame/machine/interpro_mcga.cpp @@ -25,7 +25,7 @@ DEVICE_ADDRESS_MAP_START(map, 16, interpro_mcga_device) AM_RANGE(0x00, 0x3f) AM_READWRITE16(read, write, 0xffff) ADDRESS_MAP_END -const device_type INTERPRO_MCGA = &device_creator; +const device_type INTERPRO_MCGA = device_creator; interpro_mcga_device::interpro_mcga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, INTERPRO_MCGA, "InterPro MCGA", tag, owner, clock, "mcga", __FILE__) diff --git a/src/mame/machine/interpro_sga.cpp b/src/mame/machine/interpro_sga.cpp index ee7b08905fe..37fddebd74f 100644 --- a/src/mame/machine/interpro_sga.cpp +++ b/src/mame/machine/interpro_sga.cpp @@ -35,7 +35,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, interpro_sga_device) AM_RANGE(0xbc, 0xbf) AM_READWRITE(ddtc1_r, ddtc1_w) ADDRESS_MAP_END -const device_type INTERPRO_SGA = &device_creator; +const device_type INTERPRO_SGA = device_creator; interpro_sga_device::interpro_sga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, INTERPRO_SGA, "InterPro SGA", tag, owner, clock, "sga", __FILE__) diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp index 6b0201b0e3c..df2562bd1f3 100644 --- a/src/mame/machine/isbc_208.cpp +++ b/src/mame/machine/isbc_208.cpp @@ -6,7 +6,7 @@ #include "emu.h" #include "isbc_208.h" -const device_type ISBC_208 = &device_creator; +const device_type ISBC_208 = device_creator; isbc_208_device::isbc_208_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ISBC_208, "ISBC 208 Flexible Disk Drive Controller", tag, owner, clock, "isbc_208", __FILE__), diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp index 9408e05d223..31eed1e394a 100644 --- a/src/mame/machine/isbc_215g.cpp +++ b/src/mame/machine/isbc_215g.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "isbc_215g.h" -const device_type ISBC_215G = &device_creator; +const device_type ISBC_215G = device_creator; isbc_215g_device::isbc_215g_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ISBC_215G, "ISBC 215G Winchester Disk Controller", tag, owner, clock, "isbc_215g", __FILE__), diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 561066b4164..9597d32851f 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -15,7 +15,7 @@ #define COM1_TAG "com1" #define COM2_TAG "com2" -const device_type ITEAGLE_FPGA = &device_creator; +const device_type ITEAGLE_FPGA = device_creator; MACHINE_CONFIG_FRAGMENT(iteagle_fpga) MCFG_NVRAM_ADD_0FILL("eagle2_rtc") @@ -595,7 +595,7 @@ WRITE32_MEMBER( iteagle_fpga_device::ram_w ) // Attached serial EEPROM //************************************ -const device_type ITEAGLE_EEPROM = &device_creator; +const device_type ITEAGLE_EEPROM = device_creator; DEVICE_ADDRESS_MAP_START(eeprom_map, 32, iteagle_eeprom_device) AM_RANGE(0x0000, 0x000F) AM_READWRITE(eeprom_r, eeprom_w) @@ -729,7 +729,7 @@ machine_config_constructor iteagle_periph_device::device_mconfig_additions() con return MACHINE_CONFIG_NAME(eagle1); } -const device_type ITEAGLE_PERIPH = &device_creator; +const device_type ITEAGLE_PERIPH = device_creator; DEVICE_ADDRESS_MAP_START(ctrl_map, 32, iteagle_periph_device) AM_RANGE(0x000, 0x0cf) AM_READWRITE(ctrl_r, ctrl_w) diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp index 494ebad62fa..5c9782524d7 100644 --- a/src/mame/machine/jvs13551.cpp +++ b/src/mame/machine/jvs13551.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "jvs13551.h" -const device_type SEGA_837_13551 = &device_creator; +const device_type SEGA_837_13551 = device_creator; WRITE_LINE_MEMBER(sega_837_13551::jvs13551_coin_1_w) { diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp index 5919920338c..e2dfa9a2edd 100644 --- a/src/mame/machine/k573cass.cpp +++ b/src/mame/machine/k573cass.cpp @@ -62,7 +62,7 @@ READ_LINE_MEMBER(konami573_cassette_interface::read_line_adc083x_sars) } -const device_type KONAMI573_CASSETTE_X = &device_creator; +const device_type KONAMI573_CASSETTE_X = device_creator; konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KONAMI573_CASSETTE_X, "Konami 573 Cassette X", tag, owner, clock, "k573cassx", __FILE__), @@ -118,7 +118,7 @@ READ_LINE_MEMBER(konami573_cassette_x_device::read_line_secflash_sda) } -const device_type KONAMI573_CASSETTE_XI = &device_creator; +const device_type KONAMI573_CASSETTE_XI = device_creator; konami573_cassette_xi_device::konami573_cassette_xi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : konami573_cassette_x_device(mconfig, KONAMI573_CASSETTE_XI, "Konami 573 Cassette XI", tag, owner, clock, "k573cassxi", __FILE__), @@ -178,7 +178,7 @@ READ_LINE_MEMBER(konami573_cassette_xi_device::read_line_adc083x_sars) } -const device_type KONAMI573_CASSETTE_Y = &device_creator; +const device_type KONAMI573_CASSETTE_Y = device_creator; konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KONAMI573_CASSETTE_Y, "Konami 573 Cassette Y", tag, owner, clock, "k573cassy", __FILE__), @@ -283,7 +283,7 @@ WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d7) } -const device_type KONAMI573_CASSETTE_YI = &device_creator; +const device_type KONAMI573_CASSETTE_YI = device_creator; konami573_cassette_yi_device::konami573_cassette_yi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : konami573_cassette_y_device(mconfig, KONAMI573_CASSETTE_YI, "Konami 573 Cassette YI", tag, owner, clock, "k573cassyi", __FILE__), @@ -314,7 +314,7 @@ READ_LINE_MEMBER(konami573_cassette_yi_device::read_line_ds2401) } -const device_type KONAMI573_CASSETTE_ZI = &device_creator; +const device_type KONAMI573_CASSETTE_ZI = device_creator; konami573_cassette_zi_device::konami573_cassette_zi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KONAMI573_CASSETTE_ZI, "Konami 573 Cassette ZI", tag, owner, clock, "k573casszi", __FILE__), @@ -376,7 +376,7 @@ READ_LINE_MEMBER(konami573_cassette_zi_device::read_line_secflash_sda) } -const device_type KONAMI573_CASSETTE_SLOT = &device_creator; +const device_type KONAMI573_CASSETTE_SLOT = device_creator; konami573_cassette_slot_device::konami573_cassette_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KONAMI573_CASSETTE_SLOT, "Konami 573 Cassette Slot", tag, owner, clock, "k573cassslot", __FILE__), diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 10aadf96119..e805f12c389 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -65,7 +65,7 @@ */ -const device_type KONAMI_573_DIGITAL_IO_BOARD = &device_creator; +const device_type KONAMI_573_DIGITAL_IO_BOARD = device_creator; DEVICE_ADDRESS_MAP_START(amap, 16, k573dio_device) AM_RANGE(0x00, 0x01) AM_READ(a00_r) diff --git a/src/mame/machine/k573mcr.cpp b/src/mame/machine/k573mcr.cpp index 273a4737c56..43db5e70cc7 100644 --- a/src/mame/machine/k573mcr.cpp +++ b/src/mame/machine/k573mcr.cpp @@ -31,4 +31,4 @@ const tiny_rom_entry *k573mcr_device::device_rom_region() const return ROM_NAME( k573mcr ); } -const device_type KONAMI_573_MEMORY_CARD_READER = &device_creator; +const device_type KONAMI_573_MEMORY_CARD_READER = device_creator; diff --git a/src/mame/machine/k573msu.cpp b/src/mame/machine/k573msu.cpp index 0ccdcf591ed..4113837a44e 100644 --- a/src/mame/machine/k573msu.cpp +++ b/src/mame/machine/k573msu.cpp @@ -94,4 +94,4 @@ const tiny_rom_entry *k573msu_device::device_rom_region() const return ROM_NAME( k573msu ); } -const device_type KONAMI_573_MULTI_SESSION_UNIT = &device_creator; +const device_type KONAMI_573_MULTI_SESSION_UNIT = device_creator; diff --git a/src/mame/machine/k573npu.cpp b/src/mame/machine/k573npu.cpp index 3664ddb09b8..5364b4c3001 100644 --- a/src/mame/machine/k573npu.cpp +++ b/src/mame/machine/k573npu.cpp @@ -91,4 +91,4 @@ const tiny_rom_entry *k573npu_device::device_rom_region() const return ROM_NAME( k573npu ); } -const device_type KONAMI_573_NETWORK_PCB_UNIT = &device_creator; +const device_type KONAMI_573_NETWORK_PCB_UNIT = device_creator; diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp index 7466a67ecb5..9c9114c8d4a 100644 --- a/src/mame/machine/k7659kb.cpp +++ b/src/mame/machine/k7659kb.cpp @@ -22,7 +22,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type K7659_KEYBOARD = &device_creator; +const device_type K7659_KEYBOARD = device_creator; diff --git a/src/mame/machine/kaneko_calc3.cpp b/src/mame/machine/kaneko_calc3.cpp index 44beeb77977..78ccadafb80 100644 --- a/src/mame/machine/kaneko_calc3.cpp +++ b/src/mame/machine/kaneko_calc3.cpp @@ -27,7 +27,7 @@ #include "kaneko_calc3.h" #include "machine/eepromser.h" -const device_type KANEKO_CALC3 = &device_creator; +const device_type KANEKO_CALC3 = device_creator; kaneko_calc3_device::kaneko_calc3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KANEKO_CALC3, "Kaneko CALC3 MCU", tag, owner, clock, "kaneko_calc3", __FILE__), diff --git a/src/mame/machine/kaneko_hit.cpp b/src/mame/machine/kaneko_hit.cpp index 4ecd6cd1f7c..47200d796b6 100644 --- a/src/mame/machine/kaneko_hit.cpp +++ b/src/mame/machine/kaneko_hit.cpp @@ -28,7 +28,7 @@ #include "emu.h" #include "kaneko_hit.h" -const device_type KANEKO_HIT = &device_creator; +const device_type KANEKO_HIT = device_creator; kaneko_hit_device::kaneko_hit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KANEKO_HIT, "Kaneko CALC Hitbox", tag, owner, clock, "kaneko_hit", __FILE__), diff --git a/src/mame/machine/kaneko_toybox.cpp b/src/mame/machine/kaneko_toybox.cpp index 82e893b008a..3a1868e4e9a 100644 --- a/src/mame/machine/kaneko_toybox.cpp +++ b/src/mame/machine/kaneko_toybox.cpp @@ -51,7 +51,7 @@ mcu_subcmd = kaneko16_mcu_ram[0x0014/2]; // sub-command parameter, happens o #include "kaneko_toybox.h" #include "machine/eepromser.h" -const device_type KANEKO_TOYBOX = &device_creator; +const device_type KANEKO_TOYBOX = device_creator; kaneko_toybox_device::kaneko_toybox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KANEKO_TOYBOX, "Kaneko Toybox MCU", tag, owner, clock, "kaneko_toybox", __FILE__), diff --git a/src/mame/machine/kc_keyb.cpp b/src/mame/machine/kc_keyb.cpp index 984bfa940cf..6dc9f46d0ec 100644 --- a/src/mame/machine/kc_keyb.cpp +++ b/src/mame/machine/kc_keyb.cpp @@ -328,7 +328,7 @@ triggers the time measurement by the CTC channel 3." // GLOBAL VARIABLES //************************************************************************** -const device_type KC_KEYBOARD = &device_creator; +const device_type KC_KEYBOARD = device_creator; //************************************************************************** // Input Ports diff --git a/src/mame/machine/km035.cpp b/src/mame/machine/km035.cpp index a1b66e3e856..133a03efc45 100644 --- a/src/mame/machine/km035.cpp +++ b/src/mame/machine/km035.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "km035.h" +#include "speaker.h" #define VERBOSE_DBG 0 /* general debug messages */ @@ -33,7 +34,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type KM035 = &device_creator; +const device_type KM035 = device_creator; ROM_START( km035 ) ROM_REGION (0x800, KM035_CPU_TAG, 0) diff --git a/src/mame/machine/konami1.cpp b/src/mame/machine/konami1.cpp index 5e84e9617f7..f3b6b920934 100644 --- a/src/mame/machine/konami1.cpp +++ b/src/mame/machine/konami1.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "konami1.h" -const device_type KONAMI1 = &device_creator; +const device_type KONAMI1 = device_creator; konami1_device::konami1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6809_base_device(mconfig, "KONAMI-1", tag, owner, clock, KONAMI1, 1, "konami1", __FILE__) diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp index d82c4eae573..2d841620c82 100644 --- a/src/mame/machine/konppc.cpp +++ b/src/mame/machine/konppc.cpp @@ -14,7 +14,7 @@ /*****************************************************************************/ -const device_type KONPPC = &device_creator; +const device_type KONPPC = device_creator; konppc_device::konppc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KONPPC, "Konami PowerPC Common Functions", tag, owner, clock, "konppc", __FILE__), diff --git a/src/mame/machine/lisa.cpp b/src/mame/machine/lisa.cpp index 69d4503b6b5..cfc9ef45f60 100644 --- a/src/mame/machine/lisa.cpp +++ b/src/mame/machine/lisa.cpp @@ -40,6 +40,7 @@ #include "emu.h" #include "includes/lisa.h" +#include "screen.h" /* diff --git a/src/mame/machine/lviv.cpp b/src/mame/machine/lviv.cpp index f7dee34255b..cebbe846cc6 100644 --- a/src/mame/machine/lviv.cpp +++ b/src/mame/machine/lviv.cpp @@ -12,18 +12,12 @@ ***************************************************************************/ #include "emu.h" -#include "imagedev/cassette.h" -#include "imagedev/snapquik.h" -#include "cpu/i8085/i8085.h" -#include "machine/i8255.h" #include "includes/lviv.h" -#include "sound/speaker.h" -#include "machine/ram.h" - -#define LVIV_SNAPSHOT_SIZE 82219 +#include "cpu/i8085/i8085.h" +#define LVIV_SNAPSHOT_SIZE 82219 void lviv_state::lviv_update_memory () diff --git a/src/mame/machine/m1comm.cpp b/src/mame/machine/m1comm.cpp index be789852184..be4f81f0381 100644 --- a/src/mame/machine/m1comm.cpp +++ b/src/mame/machine/m1comm.cpp @@ -95,7 +95,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -const device_type M1COMM = &device_creator; +const device_type M1COMM = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp index 4fb0be656ec..fa690919fa4 100644 --- a/src/mame/machine/m20_8086.cpp +++ b/src/mame/machine/m20_8086.cpp @@ -4,7 +4,7 @@ #include "m20_8086.h" #include "machine/ram.h" -const device_type M20_8086 = &device_creator; +const device_type M20_8086 = device_creator; m20_8086_device::m20_8086_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, M20_8086, "Olivetti M20 8086 Adapter", tag, owner, clock, "m20_8086", __FILE__), diff --git a/src/mame/machine/m20_kbd.cpp b/src/mame/machine/m20_kbd.cpp index 3d90493277f..796dcae5a7b 100644 --- a/src/mame/machine/m20_kbd.cpp +++ b/src/mame/machine/m20_kbd.cpp @@ -235,4 +235,4 @@ void m20_keyboard_device::received_byte(uint8_t byte) } -const device_type M20_KEYBOARD = &device_creator; +const device_type M20_KEYBOARD = device_creator; diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp index b753ddbe532..d29e8e6b23d 100644 --- a/src/mame/machine/m24_kbd.cpp +++ b/src/mame/machine/m24_kbd.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "m24_kbd.h" -const device_type M24_KEYBOARD = &device_creator; +const device_type M24_KEYBOARD = device_creator; ROM_START( m24_keyboard ) ROM_REGION(0x800, "mcu", 0) diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp index 73204a21acb..ffdc85a89d9 100644 --- a/src/mame/machine/m24_z8000.cpp +++ b/src/mame/machine/m24_z8000.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "m24_z8000.h" -const device_type M24_Z8000 = &device_creator; +const device_type M24_Z8000 = device_creator; m24_z8000_device::m24_z8000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, M24_Z8000, "Olivetti M24 Z8000 Adapter", tag, owner, clock, "m24_z8000", __FILE__), diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp index 8d15c93965c..d7b313b8e08 100644 --- a/src/mame/machine/m2comm.cpp +++ b/src/mame/machine/m2comm.cpp @@ -177,7 +177,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type M2COMM = &device_creator; +const device_type M2COMM = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp index 5ec45c587ac..0c90c8a025a 100644 --- a/src/mame/machine/m3comm.cpp +++ b/src/mame/machine/m3comm.cpp @@ -116,7 +116,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type M3COMM = &device_creator; +const device_type M3COMM = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/mame/machine/mackbd.cpp b/src/mame/machine/mackbd.cpp index cf768223e28..72f7c0d6a9c 100644 --- a/src/mame/machine/mackbd.cpp +++ b/src/mame/machine/mackbd.cpp @@ -65,7 +65,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MACKBD = &device_creator; +const device_type MACKBD = device_creator; ROM_START( mackbd ) ROM_REGION(0x800, MACKBD_CPU_TAG, 0) diff --git a/src/mame/machine/macrtc.cpp b/src/mame/machine/macrtc.cpp index ac615c0db4e..94a5c5435ff 100644 --- a/src/mame/machine/macrtc.cpp +++ b/src/mame/machine/macrtc.cpp @@ -33,7 +33,7 @@ enum //************************************************************************** // device type definition -const device_type RTC3430042 = &device_creator; +const device_type RTC3430042 = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/maple-dc.cpp b/src/mame/machine/maple-dc.cpp index 56a838a8967..aa51b0fcdf9 100644 --- a/src/mame/machine/maple-dc.cpp +++ b/src/mame/machine/maple-dc.cpp @@ -5,7 +5,7 @@ #include "maple-dc.h" #include "mie.h" -const device_type MAPLE_DC = &device_creator; +const device_type MAPLE_DC = device_creator; DEVICE_ADDRESS_MAP_START(amap, 32, maple_dc_device) AM_RANGE(0x04, 0x07) AM_READWRITE(sb_mdstar_r, sb_mdstar_w) diff --git a/src/mame/machine/mathbox.cpp b/src/mame/machine/mathbox.cpp index 1baf980268d..658881873dd 100644 --- a/src/mame/machine/mathbox.cpp +++ b/src/mame/machine/mathbox.cpp @@ -37,7 +37,7 @@ // mathbox_device - constructor //------------------------------------------------- -const device_type MATHBOX = &device_creator; +const device_type MATHBOX = device_creator; mathbox_device::mathbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MATHBOX, "Atari MATHBOX", tag, owner, clock, "mathbox", __FILE__) diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp index f3938f6c534..df371297ec3 100644 --- a/src/mame/machine/mega32x.cpp +++ b/src/mame/machine/mega32x.cpp @@ -202,8 +202,8 @@ GFX check (these don't explicitly fails): #include "sound/volt_reg.h" -const device_type SEGA_32X_NTSC = &device_creator; -const device_type SEGA_32X_PAL = &device_creator; +const device_type SEGA_32X_NTSC = device_creator; +const device_type SEGA_32X_PAL = device_creator; sega_32x_device::sega_32x_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) diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index 42caa03fc38..2262cf5a5b6 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -6,9 +6,9 @@ #include "megacd.lh" -const device_type SEGA_SEGACD_US = &device_creator; -const device_type SEGA_SEGACD_JAPAN = &device_creator; -const device_type SEGA_SEGACD_EUROPE = &device_creator; +const device_type SEGA_SEGACD_US = device_creator; +const device_type SEGA_SEGACD_JAPAN = device_creator; +const device_type SEGA_SEGACD_EUROPE = device_creator; /* Callback when the genesis enters interrupt code */ diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp index 47adee8fa80..23b9a9b0ff4 100644 --- a/src/mame/machine/megacdcd.cpp +++ b/src/mame/machine/megacdcd.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "machine/megacdcd.h" -const device_type LC89510_TEMP = &device_creator; +const device_type LC89510_TEMP = device_creator; lc89510_temp_device::lc89510_temp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LC89510_TEMP, "lc89510_temp_device", tag, owner, clock, "lc89510_temp", __FILE__) diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index 9347060ab1a..50d9ff92739 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -25,6 +25,7 @@ Known Non-Issues (confirmed on Real Genesis) #include "emu.h" #include "includes/megadriv.h" +#include "speaker.h" MACHINE_CONFIG_EXTERN( megadriv ); diff --git a/src/mame/machine/meters.cpp b/src/mame/machine/meters.cpp index 055aee26d18..9a15cf9b6e0 100644 --- a/src/mame/machine/meters.cpp +++ b/src/mame/machine/meters.cpp @@ -15,7 +15,7 @@ DEVICE INTERFACE *****************************************************************************/ -const device_type METERS = &device_creator; +const device_type METERS = device_creator; meters_device::meters_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, METERS, "Electro mechanical meters", tag, owner, clock, "meters", __FILE__), diff --git a/src/mame/machine/microdrv.cpp b/src/mame/machine/microdrv.cpp index c55f305f0f1..0c1dff43a03 100644 --- a/src/mame/machine/microdrv.cpp +++ b/src/mame/machine/microdrv.cpp @@ -37,7 +37,7 @@ ***************************************************************************/ // device type definition -const device_type MICRODRIVE = &device_creator; +const device_type MICRODRIVE = device_creator; //------------------------------------------------- // microdrive_image_device - constructor diff --git a/src/mame/machine/micropolis.cpp b/src/mame/machine/micropolis.cpp index f9d4220a83f..a747e7d2a36 100644 --- a/src/mame/machine/micropolis.cpp +++ b/src/mame/machine/micropolis.cpp @@ -63,7 +63,7 @@ static const uint8_t track_SD[][2] = { MAME DEVICE INTERFACE ***************************************************************************/ -const device_type MICROPOLIS = &device_creator; +const device_type MICROPOLIS = device_creator; micropolis_device::micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MICROPOLIS, "MICROPOLIS", tag, owner, clock, "micropolis", __FILE__), diff --git a/src/mame/machine/midikbd.cpp b/src/mame/machine/midikbd.cpp index 3b6ece1ce9d..3fdbb105cf9 100644 --- a/src/mame/machine/midikbd.cpp +++ b/src/mame/machine/midikbd.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "machine/midikbd.h" -const device_type MIDI_KBD = &device_creator; +const device_type MIDI_KBD = device_creator; midi_keyboard_device::midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MIDI_KBD, "Generic MIDI Keyboard", tag, owner, clock, "midi_kbd", __FILE__), diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index f15d4807799..c5b43035d14 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -105,7 +105,7 @@ void midway_serial_pic_device::serial_register_state() save_item(NAME(m_ormask)); } -const device_type MIDWAY_SERIAL_PIC = &device_creator; +const device_type MIDWAY_SERIAL_PIC = device_creator; //------------------------------------------------- @@ -200,7 +200,7 @@ WRITE8_MEMBER(midway_serial_pic_device::write) *************************************/ -const device_type MIDWAY_SERIAL_PIC_EMU = &device_creator; +const device_type MIDWAY_SERIAL_PIC_EMU = device_creator; //------------------------------------------------- @@ -285,7 +285,7 @@ static inline uint8_t make_bcd(uint8_t data) return ((data / 10) << 4) | (data % 10); } -const device_type MIDWAY_SERIAL_PIC2 = &device_creator; +const device_type MIDWAY_SERIAL_PIC2 = device_creator; //------------------------------------------------- @@ -662,7 +662,7 @@ void midway_ioasic_device::ioasic_register_state() save_item(NAME(m_fifo_force_buffer_empty_pc)); } -const device_type MIDWAY_IOASIC = &device_creator; +const device_type MIDWAY_IOASIC = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp index b06fe6d64f0..a130493dc3a 100644 --- a/src/mame/machine/mie.cpp +++ b/src/mame/machine/mie.cpp @@ -23,8 +23,8 @@ // - Speed is all wrong -const device_type MIE = &device_creator; -const device_type MIE_JVS = &device_creator; +const device_type MIE = device_creator; +const device_type MIE_JVS = device_creator; static ADDRESS_MAP_START( mie_map, AS_PROGRAM, 8, mie_device) AM_RANGE(0x0000, 0x07ff) AM_ROM diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp index dd620968e8a..875076bd196 100644 --- a/src/mame/machine/mm1kb.cpp +++ b/src/mame/machine/mm1kb.cpp @@ -8,6 +8,8 @@ #include "emu.h" #include "mm1kb.h" +#include "screen.h" +#include "speaker.h" @@ -15,7 +17,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MM1_KEYBOARD = &device_creator; +const device_type MM1_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp index d09ce6a4332..1f3ae8a3421 100644 --- a/src/mame/machine/ms7004.cpp +++ b/src/mame/machine/ms7004.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "ms7004.h" +#include "speaker.h" + #define VERBOSE_DBG 1 /* general debug messages */ @@ -34,7 +36,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type MS7004 = &device_creator; +const device_type MS7004 = device_creator; ROM_START( ms7004 ) ROM_REGION (0x800, MS7004_CPU_TAG, 0) diff --git a/src/mame/machine/msx_matsushita.cpp b/src/mame/machine/msx_matsushita.cpp index d5b1f13e44f..93d421ad51c 100644 --- a/src/mame/machine/msx_matsushita.cpp +++ b/src/mame/machine/msx_matsushita.cpp @@ -5,7 +5,7 @@ const uint8_t manufacturer_id = 0x08; -const device_type MSX_MATSUSHITA = &device_creator; +const device_type MSX_MATSUSHITA = device_creator; msx_matsushita_device::msx_matsushita_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MSX_MATSUSHITA, "Matsushita switched device", tag, owner, clock, "msx_matsushita", __FILE__) diff --git a/src/mame/machine/msx_s1985.cpp b/src/mame/machine/msx_s1985.cpp index 6096b6a9f76..f754541e873 100644 --- a/src/mame/machine/msx_s1985.cpp +++ b/src/mame/machine/msx_s1985.cpp @@ -5,7 +5,7 @@ const uint8_t manufacturer_id = 0xfe; -const device_type MSX_S1985 = &device_creator; +const device_type MSX_S1985 = device_creator; msx_s1985_device::msx_s1985_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MSX_S1985, "MSX-Engine S1985", tag, owner, clock, "msx_s1985", __FILE__) diff --git a/src/mame/machine/msx_systemflags.cpp b/src/mame/machine/msx_systemflags.cpp index 4ff1a5b2b42..4aa79e46fac 100644 --- a/src/mame/machine/msx_systemflags.cpp +++ b/src/mame/machine/msx_systemflags.cpp @@ -4,7 +4,7 @@ #include "msx_systemflags.h" -const device_type MSX_SYSTEMFLAGS = &device_creator; +const device_type MSX_SYSTEMFLAGS = device_creator; msx_systemflags_device::msx_systemflags_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/machine/mz700.cpp b/src/mame/machine/mz700.cpp index 1a2ccd1f3a5..b05bb44ce8e 100644 --- a/src/mame/machine/mz700.cpp +++ b/src/mame/machine/mz700.cpp @@ -9,14 +9,11 @@ #include "emu.h" #include "includes/mz700.h" + #include "cpu/z80/z80.h" -#include "machine/pit8253.h" -#include "machine/i8255.h" -#include "machine/z80pio.h" #include "machine/74145.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" -#include "machine/ram.h" +#include "screen.h" + #ifndef VERBOSE #define VERBOSE 1 diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp index 1b94269b7b4..348ea04eaa8 100644 --- a/src/mame/machine/n64.cpp +++ b/src/mame/machine/n64.cpp @@ -10,7 +10,7 @@ #include "video/n64.h" // device type definition -const device_type N64PERIPH = &device_creator; +const device_type N64PERIPH = device_creator; n64_periphs::n64_periphs(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, N64PERIPH, "N64 Periphal Chips", tag, owner, clock, "n64_periphs", __FILE__) diff --git a/src/mame/machine/namco06.cpp b/src/mame/machine/namco06.cpp index 40bf97858e5..11d2647abed 100644 --- a/src/mame/machine/namco06.cpp +++ b/src/mame/machine/namco06.cpp @@ -174,7 +174,7 @@ WRITE8_MEMBER( namco_06xx_device::ctrl_w ) } -const device_type NAMCO_06XX = &device_creator; +const device_type NAMCO_06XX = device_creator; namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_06XX, "Namco 06xx", tag, owner, clock, "namco06xx", __FILE__) diff --git a/src/mame/machine/namco50.cpp b/src/mame/machine/namco50.cpp index 62280849c39..8b54f21e05e 100644 --- a/src/mame/machine/namco50.cpp +++ b/src/mame/machine/namco50.cpp @@ -237,7 +237,7 @@ ROM_START( namco_50xx ) ROM_END -const device_type NAMCO_50XX = &device_creator; +const device_type NAMCO_50XX = device_creator; namco_50xx_device::namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_50XX, "Namco 50xx", tag, owner, clock, "namco50", __FILE__), diff --git a/src/mame/machine/namco51.cpp b/src/mame/machine/namco51.cpp index e9bc2dba237..a7b1257723a 100644 --- a/src/mame/machine/namco51.cpp +++ b/src/mame/machine/namco51.cpp @@ -58,6 +58,7 @@ #include "emu.h" #include "namco51.h" +#include "screen.h" #define VERBOSE 0 @@ -340,7 +341,7 @@ ROM_START( namco_51xx ) ROM_LOAD( "51xx.bin", 0x0000, 0x0400, CRC(c2f57ef8) SHA1(50de79e0d6a76bda95ffb02fcce369a79e6abfec) ) ROM_END -const device_type NAMCO_51XX = &device_creator; +const device_type NAMCO_51XX = device_creator; namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_51XX, "Namco 51xx", tag, owner, clock, "namco51", __FILE__), diff --git a/src/mame/machine/namco53.cpp b/src/mame/machine/namco53.cpp index 4b1b29173db..a76388149f1 100644 --- a/src/mame/machine/namco53.cpp +++ b/src/mame/machine/namco53.cpp @@ -143,7 +143,7 @@ ROM_START( namco_53xx ) ROM_LOAD( "53xx.bin", 0x0000, 0x0400, CRC(b326fecb) SHA1(758d8583d658e4f1df93184009d86c3eb8713899) ) ROM_END -const device_type NAMCO_53XX = &device_creator; +const device_type NAMCO_53XX = device_creator; namco_53xx_device::namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_53XX, "Namco 53xx", tag, owner, clock, "namco53", __FILE__), diff --git a/src/mame/machine/namco62.cpp b/src/mame/machine/namco62.cpp index fbb676015f2..4ef3d0e79e7 100644 --- a/src/mame/machine/namco62.cpp +++ b/src/mame/machine/namco62.cpp @@ -42,7 +42,7 @@ ROM_START( namco_62xx ) ROM_END -const device_type NAMCO_62XX = &device_creator; +const device_type NAMCO_62XX = device_creator; namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_62XX, "Namco 62xx", tag, owner, clock, "namco62", __FILE__), diff --git a/src/mame/machine/namco_c139.cpp b/src/mame/machine/namco_c139.cpp index ed021210762..9581a8325b0 100644 --- a/src/mame/machine/namco_c139.cpp +++ b/src/mame/machine/namco_c139.cpp @@ -21,7 +21,7 @@ //************************************************************************** // device type definition -const device_type NAMCO_C139 = &device_creator; +const device_type NAMCO_C139 = device_creator; //************************************************************************** diff --git a/src/mame/machine/namco_c148.cpp b/src/mame/machine/namco_c148.cpp index a12ece76d55..ab8470b67eb 100644 --- a/src/mame/machine/namco_c148.cpp +++ b/src/mame/machine/namco_c148.cpp @@ -54,7 +54,7 @@ Interrupt Controller C148 1C0000-1FFFFF R/W D00-D02 //************************************************************************** // device type definition -const device_type NAMCO_C148 = &device_creator; +const device_type NAMCO_C148 = device_creator; //************************************************************************** diff --git a/src/mame/machine/namco_settings.cpp b/src/mame/machine/namco_settings.cpp index 24415e62684..7d3a4c1a82b 100644 --- a/src/mame/machine/namco_settings.cpp +++ b/src/mame/machine/namco_settings.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "namco_settings.h" -const device_type NAMCO_SETTINGS = &device_creator; +const device_type NAMCO_SETTINGS = device_creator; namco_settings_device::namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NAMCO_SETTINGS, "Namco Settings", tag, owner, clock, "namco_settings", __FILE__) diff --git a/src/mame/machine/namcoio.cpp b/src/mame/machine/namcoio.cpp index 335fe4ea84f..b4a32041a0e 100644 --- a/src/mame/machine/namcoio.cpp +++ b/src/mame/machine/namcoio.cpp @@ -118,9 +118,9 @@ TODO: #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type NAMCO56XX = &device_creator; -const device_type NAMCO58XX = &device_creator; -const device_type NAMCO59XX = &device_creator; +const device_type NAMCO56XX = device_creator; +const device_type NAMCO58XX = device_creator; +const device_type NAMCO59XX = device_creator; namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, uint32_t clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), diff --git a/src/mame/machine/namcoio_gearbox.cpp b/src/mame/machine/namcoio_gearbox.cpp index 68f0c82e794..6e4d8096a7c 100644 --- a/src/mame/machine/namcoio_gearbox.cpp +++ b/src/mame/machine/namcoio_gearbox.cpp @@ -33,7 +33,7 @@ //************************************************************************** // device type definition -const device_type NAMCOIO_GEARBOX = &device_creator; +const device_type NAMCOIO_GEARBOX = device_creator; //************************************************************************** diff --git a/src/mame/machine/namcomcu.cpp b/src/mame/machine/namcomcu.cpp index 307d2ac3ab6..b49e53a1b7b 100644 --- a/src/mame/machine/namcomcu.cpp +++ b/src/mame/machine/namcomcu.cpp @@ -16,11 +16,11 @@ C76 System 11 #include "namcomcu.h" -const device_type NAMCO_C69 = &device_creator; -const device_type NAMCO_C70 = &device_creator; -const device_type NAMCO_C74 = &device_creator; -const device_type NAMCO_C75 = &device_creator; -const device_type NAMCO_C76 = &device_creator; +const device_type NAMCO_C69 = device_creator; +const device_type NAMCO_C70 = device_creator; +const device_type NAMCO_C74 = device_creator; +const device_type NAMCO_C75 = device_creator; +const device_type NAMCO_C76 = device_creator; ROM_START( c69 ) diff --git a/src/mame/machine/naomigd.cpp b/src/mame/machine/naomigd.cpp index d82eb9d0166..3f3508d54c9 100644 --- a/src/mame/machine/naomigd.cpp +++ b/src/mame/machine/naomigd.cpp @@ -98,7 +98,7 @@ SH4 IO port A bits */ -const device_type NAOMI_GDROM_BOARD = &device_creator; +const device_type NAOMI_GDROM_BOARD = device_creator; const uint32_t naomi_gdrom_board::DES_LEFTSWAP[] = { 0x00000000, 0x00000001, 0x00000100, 0x00000101, 0x00010000, 0x00010001, 0x00010100, 0x00010101, diff --git a/src/mame/machine/naomim1.cpp b/src/mame/machine/naomim1.cpp index 2068bfcaca0..84412849767 100644 --- a/src/mame/machine/naomim1.cpp +++ b/src/mame/machine/naomim1.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "naomim1.h" -const device_type NAOMI_M1_BOARD = &device_creator; +const device_type NAOMI_M1_BOARD = device_creator; DEVICE_ADDRESS_MAP_START(submap, 16, naomi_m1_board) AM_RANGE(0x0a, 0x0b) AM_READ(actel_id_r) diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index 6061fc4763d..a2d089e6e9b 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -109,7 +109,7 @@ note: if ROM is not mounted its area readed as 0xFF ********************************************************************************************************/ -const device_type NAOMI_M2_BOARD = &device_creator; +const device_type NAOMI_M2_BOARD = device_creator; naomi_m2_board::naomi_m2_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : naomi_board(mconfig, NAOMI_M2_BOARD, "Sega NAOMI M2 Board", tag, owner, clock, "naomi_m2_board", __FILE__), diff --git a/src/mame/machine/naomim4.cpp b/src/mame/machine/naomim4.cpp index f0799c9a770..12077a6f579 100644 --- a/src/mame/machine/naomim4.cpp +++ b/src/mame/machine/naomim4.cpp @@ -21,7 +21,7 @@ // the algorithm is a 32-bits key stored in the PIC16C621A. The hardware auto-reset the feed value // to the cart-based IV every 16 blocks (32 bytes); that reset is not address-based, but index-based. -const device_type NAOMI_M4_BOARD = &device_creator; +const device_type NAOMI_M4_BOARD = device_creator; const uint8_t naomi_m4_board::k_sboxes[4][16] = { {9,8,2,11,1,14,5,15,12,6,0,3,7,13,10,4}, diff --git a/src/mame/machine/naomirom.cpp b/src/mame/machine/naomirom.cpp index 6c92ae377ba..62f53eb4eb7 100644 --- a/src/mame/machine/naomirom.cpp +++ b/src/mame/machine/naomirom.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "naomirom.h" -const device_type NAOMI_ROM_BOARD = &device_creator; +const device_type NAOMI_ROM_BOARD = device_creator; naomi_rom_board::naomi_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : naomi_board(mconfig, NAOMI_ROM_BOARD, "Sega NAOMI ROM Board", tag, owner, clock, "naomi_rom_board", __FILE__), diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp index 92efbb0c1fe..7ce1d1f7010 100644 --- a/src/mame/machine/nb1413m3.cpp +++ b/src/mame/machine/nb1413m3.cpp @@ -21,7 +21,7 @@ Memo: #define NB1413M3_TIMER_BASE 20000000 -const device_type NB1413M3 = &device_creator; +const device_type NB1413M3 = device_creator; nb1413m3_device::nb1413m3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NB1413M3, "NB1413M3 Mahjong Custom", tag, owner, clock, "nb1413m3", __FILE__), diff --git a/src/mame/machine/nb1414m4.cpp b/src/mame/machine/nb1414m4.cpp index 22f758012ae..c7e4cfe98b2 100644 --- a/src/mame/machine/nb1414m4.cpp +++ b/src/mame/machine/nb1414m4.cpp @@ -29,13 +29,14 @@ Notes: #include "emu.h" #include "includes/nb1414m4.h" +#include "screen.h" -const device_type NB1414M4 = &device_creator; +const device_type NB1414M4 = device_creator; nb1414m4_device::nb1414m4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, NB1414M4, "NB1414M4 Mahjong Custom", tag, owner, clock, "nb1414m4", __FILE__), - device_video_interface(mconfig, *this), - m_data(*this, DEVICE_SELF) + : device_t(mconfig, NB1414M4, "NB1414M4 Mahjong Custom", tag, owner, clock, "nb1414m4", __FILE__) + , device_video_interface(mconfig, *this) + , m_data(*this, DEVICE_SELF) { } diff --git a/src/mame/machine/nextkbd.cpp b/src/mame/machine/nextkbd.cpp index 64c5df5ddc2..2f696f58cc3 100644 --- a/src/mame/machine/nextkbd.cpp +++ b/src/mame/machine/nextkbd.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "nextkbd.h" -const device_type NEXTKBD = &device_creator; +const device_type NEXTKBD = device_creator; DEVICE_ADDRESS_MAP_START(amap, 32, nextkbd_device) AM_RANGE(0x0, 0x3) AM_READWRITE8(status_snd_r, ctrl_snd_w, 0xff000000) diff --git a/src/mame/machine/nextmo.cpp b/src/mame/machine/nextmo.cpp index 25341374c25..2df3346f762 100644 --- a/src/mame/machine/nextmo.cpp +++ b/src/mame/machine/nextmo.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "nextmo.h" -const device_type NEXTMO = &device_creator; +const device_type NEXTMO = device_creator; DEVICE_ADDRESS_MAP_START(map, 8, nextmo_device) AM_RANGE(0x04, 0x04) AM_READWRITE(r4_r, r4_w) diff --git a/src/mame/machine/ng_memcard.cpp b/src/mame/machine/ng_memcard.cpp index 720306fab95..1f354d1c75a 100644 --- a/src/mame/machine/ng_memcard.cpp +++ b/src/mame/machine/ng_memcard.cpp @@ -13,7 +13,7 @@ #include "ng_memcard.h" // device type definition -const device_type NG_MEMCARD = &device_creator; +const device_type NG_MEMCARD = device_creator; //------------------------------------------------- // ng_memcard_device - constructor diff --git a/src/mame/machine/ngen_kb.cpp b/src/mame/machine/ngen_kb.cpp index 30001eb6a21..1fa1f79732d 100644 --- a/src/mame/machine/ngen_kb.cpp +++ b/src/mame/machine/ngen_kb.cpp @@ -106,4 +106,4 @@ void ngen_keyboard_device::key_break(uint8_t row, uint8_t column) } } -const device_type NGEN_KEYBOARD = &device_creator; +const device_type NGEN_KEYBOARD = device_creator; diff --git a/src/mame/machine/nmk004.cpp b/src/mame/machine/nmk004.cpp index 08c579fce3d..d8e117b6f25 100644 --- a/src/mame/machine/nmk004.cpp +++ b/src/mame/machine/nmk004.cpp @@ -90,7 +90,7 @@ ROM_START( nmk004 ) ROM_END -const device_type NMK004 = &device_creator; +const device_type NMK004 = device_creator; nmk004_device::nmk004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NMK004, "NMK004", tag, owner, clock, "nmk004", __FILE__), diff --git a/src/mame/machine/nmk112.cpp b/src/mame/machine/nmk112.cpp index 547fdff5a27..1f1d7157af4 100644 --- a/src/mame/machine/nmk112.cpp +++ b/src/mame/machine/nmk112.cpp @@ -17,7 +17,7 @@ -const device_type NMK112 = &device_creator; +const device_type NMK112 = device_creator; nmk112_device::nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NMK112, "NMK112", tag, owner, clock, "nmk112", __FILE__), diff --git a/src/mame/machine/ns10crypt.cpp b/src/mame/machine/ns10crypt.cpp index 19ed7f809ef..8d0975c0680 100644 --- a/src/mame/machine/ns10crypt.cpp +++ b/src/mame/machine/ns10crypt.cpp @@ -118,14 +118,14 @@ really exist. #include "emu.h" #include "ns10crypt.h" -const device_type CHOCOVDR_DECRYPTER = &device_creator; -const device_type GAMSHARA_DECRYPTER = &device_creator; -const device_type GJSPACE_DECRYPTER = &device_creator; -const device_type KNPUZZLE_DECRYPTER = &device_creator; -const device_type KONOTAKO_DECRYPTER = &device_creator; -const device_type MRDRILR2_DECRYPTER = &device_creator; -const device_type NFLCLSFB_DECRYPTER = &device_creator; -const device_type STARTRGN_DECRYPTER = &device_creator; +const device_type CHOCOVDR_DECRYPTER = device_creator; +const device_type GAMSHARA_DECRYPTER = device_creator; +const device_type GJSPACE_DECRYPTER = device_creator; +const device_type KNPUZZLE_DECRYPTER = device_creator; +const device_type KONOTAKO_DECRYPTER = device_creator; +const device_type MRDRILR2_DECRYPTER = device_creator; +const device_type NFLCLSFB_DECRYPTER = device_creator; +const device_type STARTRGN_DECRYPTER = device_creator; // base class diff --git a/src/mame/machine/ns11prot.cpp b/src/mame/machine/ns11prot.cpp index b323cbd2e7d..bec5d68e7a4 100644 --- a/src/mame/machine/ns11prot.cpp +++ b/src/mame/machine/ns11prot.cpp @@ -65,7 +65,7 @@ WRITE16_MEMBER(keycus_c406_device::write) logerror( "keycus_c406_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C406 = &device_creator; +const device_type KEYCUS_C406 = device_creator; /* soul edge */ @@ -105,7 +105,7 @@ WRITE16_MEMBER(keycus_c409_device::write) logerror( "keycus_c409_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C409 = &device_creator; +const device_type KEYCUS_C409 = device_creator; /* dunk mania */ @@ -159,7 +159,7 @@ WRITE16_MEMBER(keycus_c410_device::write) logerror( "keycus_c410_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C410 = &device_creator; +const device_type KEYCUS_C410 = device_creator; /* prime goal ex */ @@ -215,7 +215,7 @@ WRITE16_MEMBER(keycus_c411_device::write) logerror( "keycus_c411_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C411 = &device_creator; +const device_type KEYCUS_C411 = device_creator; /* xevious 3d/g */ @@ -274,7 +274,7 @@ WRITE16_MEMBER(keycus_c430_device::write) logerror( "keycus_c430_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C430 = &device_creator; +const device_type KEYCUS_C430 = device_creator; /* dancing eyes */ @@ -332,7 +332,7 @@ WRITE16_MEMBER(keycus_c431_device::write) logerror( "keycus_c431_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C431 = &device_creator; +const device_type KEYCUS_C431 = device_creator; /* pocket racer */ @@ -392,7 +392,7 @@ WRITE16_MEMBER(keycus_c432_device::write) logerror( "keycus_c432_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C432 = &device_creator; +const device_type KEYCUS_C432 = device_creator; /* star sweep */ @@ -440,7 +440,7 @@ WRITE16_MEMBER(keycus_c442_device::write) logerror( "keycus_c442_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C442 = &device_creator; +const device_type KEYCUS_C442 = device_creator; /* kosodate quiz my angel 3 / point blank 2 */ @@ -486,4 +486,4 @@ WRITE16_MEMBER(keycus_c443_device::write) logerror( "keycus_c443_device::write unexpected offset=%d data=%04x\n", offset, data ); } -const device_type KEYCUS_C443 = &device_creator; +const device_type KEYCUS_C443 = device_creator; diff --git a/src/mame/machine/octo_kbd.cpp b/src/mame/machine/octo_kbd.cpp index 7c12b1cfd90..a5d7219619b 100644 --- a/src/mame/machine/octo_kbd.cpp +++ b/src/mame/machine/octo_kbd.cpp @@ -260,6 +260,6 @@ void octopus_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, } -const device_type OCTOPUS_KEYBOARD = &device_creator; +const device_type OCTOPUS_KEYBOARD = device_creator; diff --git a/src/mame/machine/orion.cpp b/src/mame/machine/orion.cpp index 0146f95a2b5..2112a3d5a0e 100644 --- a/src/mame/machine/orion.cpp +++ b/src/mame/machine/orion.cpp @@ -11,11 +11,12 @@ #include "emu.h" -#include "cpu/i8085/i8085.h" -#include "imagedev/cassette.h" -#include "sound/speaker.h" #include "includes/orion.h" +#include "imagedev/cassette.h" +#include "screen.h" + + #define SCREEN_WIDTH_384 48 #define SCREEN_WIDTH_480 60 #define SCREEN_WIDTH_512 64 diff --git a/src/mame/machine/osborne1.cpp b/src/mame/machine/osborne1.cpp index 5472ac30bce..16873853e12 100644 --- a/src/mame/machine/osborne1.cpp +++ b/src/mame/machine/osborne1.cpp @@ -12,6 +12,8 @@ There are three IRQ sources: #include "emu.h" #include "includes/osborne1.h" +#include "screen.h" + WRITE8_MEMBER( osborne1_state::bank_0xxx_w ) { diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp index dbd6a14e958..a39ed7ef0ae 100644 --- a/src/mame/machine/pc1512kb.cpp +++ b/src/mame/machine/pc1512kb.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PC1512_KEYBOARD = &device_creator; +const device_type PC1512_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/pc9801_118.cpp b/src/mame/machine/pc9801_118.cpp index 7737582a209..3fdd6dd0e06 100644 --- a/src/mame/machine/pc9801_118.cpp +++ b/src/mame/machine/pc9801_118.cpp @@ -14,8 +14,11 @@ #include "emu.h" #include "machine/pc9801_118.h" + #include "machine/pic8259.h" #include "sound/2608intf.h" +#include "speaker.h" + #define MAIN_CLOCK_X2 XTAL_2_4576MHz @@ -24,7 +27,7 @@ //************************************************************************** // device type definition -const device_type PC9801_118 = &device_creator; +const device_type PC9801_118 = device_creator; READ8_MEMBER(pc9801_118_device::opn_porta_r) diff --git a/src/mame/machine/pc9801_26.cpp b/src/mame/machine/pc9801_26.cpp index ec01035bba3..29b65d10b96 100644 --- a/src/mame/machine/pc9801_26.cpp +++ b/src/mame/machine/pc9801_26.cpp @@ -13,8 +13,11 @@ #include "emu.h" #include "machine/pc9801_26.h" + #include "machine/pic8259.h" #include "sound/2203intf.h" +#include "speaker.h" + #define MAIN_CLOCK_X1 XTAL_1_9968MHz @@ -23,7 +26,7 @@ //************************************************************************** // device type definition -const device_type PC9801_26 = &device_creator; +const device_type PC9801_26 = device_creator; diff --git a/src/mame/machine/pc9801_86.cpp b/src/mame/machine/pc9801_86.cpp index 5a2b80ea2b7..15899b1029d 100644 --- a/src/mame/machine/pc9801_86.cpp +++ b/src/mame/machine/pc9801_86.cpp @@ -18,6 +18,7 @@ #include "emu.h" #include "machine/pc9801_86.h" #include "sound/volt_reg.h" +#include "speaker.h" #define MAIN_CLOCK_X1 XTAL_1_9968MHz #define QUEUE_SIZE 32768 @@ -27,7 +28,7 @@ //************************************************************************** // device type definition -const device_type PC9801_86 = &device_creator; +const device_type PC9801_86 = device_creator; READ8_MEMBER(pc9801_86_device::opn_porta_r) diff --git a/src/mame/machine/pc9801_cbus.cpp b/src/mame/machine/pc9801_cbus.cpp index 065bbe19e47..ec3b0df3eb0 100644 --- a/src/mame/machine/pc9801_cbus.cpp +++ b/src/mame/machine/pc9801_cbus.cpp @@ -15,7 +15,7 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type PC9801CBUS_SLOT = &device_creator; +const device_type PC9801CBUS_SLOT = device_creator; diff --git a/src/mame/machine/pc9801_cd.cpp b/src/mame/machine/pc9801_cd.cpp index 8e9216fc005..a8ec66ac672 100644 --- a/src/mame/machine/pc9801_cd.cpp +++ b/src/mame/machine/pc9801_cd.cpp @@ -4,7 +4,7 @@ #include "pc9801_cd.h" // device type definition -const device_type PC9801_CD = &device_creator; +const device_type PC9801_CD = device_creator; pc9801_cd_device::pc9801_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : atapi_cdrom_device(mconfig, PC9801_CD, "PC9801 CD-ROM Drive", tag, owner, clock, "pc9801_cd", __FILE__) diff --git a/src/mame/machine/pc9801_kbd.cpp b/src/mame/machine/pc9801_kbd.cpp index 728c9c4b23b..d7e01fc887a 100644 --- a/src/mame/machine/pc9801_kbd.cpp +++ b/src/mame/machine/pc9801_kbd.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -const device_type PC9801_KBD = &device_creator; +const device_type PC9801_KBD = device_creator; //************************************************************************** diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp index b05eaa8ab1c..ed6f8c84582 100644 --- a/src/mame/machine/pcd_kbd.cpp +++ b/src/mame/machine/pcd_kbd.cpp @@ -3,7 +3,11 @@ #include "emu.h" #include "pcd_kbd.h" -const device_type PCD_KEYBOARD = &device_creator; +#include "cpu/mcs48/mcs48.h" +#include "sound/spkrdev.h" +#include "speaker.h" + +const device_type PCD_KEYBOARD = device_creator; ROM_START( pcd_keyboard ) ROM_REGION(0x1000, "mcu", 0) diff --git a/src/mame/machine/pcd_kbd.h b/src/mame/machine/pcd_kbd.h index 6542ecdbc60..b899fab91d6 100644 --- a/src/mame/machine/pcd_kbd.h +++ b/src/mame/machine/pcd_kbd.h @@ -1,20 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Carl -#ifndef PCD_KBD_H_ -#define PCD_KBD_H_ - -#include "cpu/mcs48/mcs48.h" -#include "sound/speaker.h" +#ifndef MAME_INCLUDES_PCD_KBD_H +#define MAME_INCLUDES_PCD_KBD_H #define MCFG_PCD_KEYBOARD_OUT_TX_HANDLER(_devcb) \ devcb = &pcd_keyboard_device::set_out_tx_handler(*device, DEVCB_##_devcb); -class pcd_keyboard_device : public device_t +class pcd_keyboard_device : public device_t { public: pcd_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast(device).m_out_tx_handler.set_callback(object); } + template static devcb_base &set_out_tx_handler(device_t &device, Object &&cb) { return downcast(device).m_out_tx_handler.set_callback(std::forward(cb)); } virtual const tiny_rom_entry *device_rom_region() const override; virtual machine_config_constructor device_mconfig_additions() const override; @@ -36,4 +33,4 @@ private: extern const device_type PCD_KEYBOARD; -#endif /* PCD_KBD_H_ */ +#endif // MAME_INCLUDES_PCD_KBD_H diff --git a/src/mame/machine/pce220_ser.cpp b/src/mame/machine/pce220_ser.cpp index 2fd629a37bf..f9b01143c7d 100644 --- a/src/mame/machine/pce220_ser.cpp +++ b/src/mame/machine/pce220_ser.cpp @@ -37,7 +37,7 @@ enum }; // device type definition -const device_type PCE220SERIAL = &device_creator; +const device_type PCE220SERIAL = device_creator; //------------------------------------------------- // pce220_serial_device - constructor diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 13db6a9b06d..a3919312903 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -75,7 +75,7 @@ CD Interface Register 0x0f - ADPCM fade in/out register #define PCE_CD_CLOCK 9216000 -const device_type PCE_CD = &device_creator; +const device_type PCE_CD = device_creator; pce_cd_device::pce_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/machine/pecom.cpp b/src/mame/machine/pecom.cpp index fe7cba9bc21..894eed534bd 100644 --- a/src/mame/machine/pecom.cpp +++ b/src/mame/machine/pecom.cpp @@ -9,10 +9,9 @@ ****************************************************************************/ #include "emu.h" -#include "cpu/cosmac/cosmac.h" -#include "sound/cdp1869.h" #include "includes/pecom.h" + TIMER_CALLBACK_MEMBER(pecom_state::reset_tick) { m_reset = 1; diff --git a/src/mame/machine/pgmprot_igs027a_type1.cpp b/src/mame/machine/pgmprot_igs027a_type1.cpp index 39a8a76e753..51cb33039d3 100644 --- a/src/mame/machine/pgmprot_igs027a_type1.cpp +++ b/src/mame/machine/pgmprot_igs027a_type1.cpp @@ -58,9 +58,11 @@ ***********************************************************************/ #include "emu.h" -#include "includes/pgm.h" #include "machine/pgmprot_igs027a_type1.h" +#include "screen.h" + + /**************************** EMULATION *******************************/ /* used by photoy2k, kovsh */ diff --git a/src/mame/machine/pgmprot_igs027a_type1.h b/src/mame/machine/pgmprot_igs027a_type1.h index 91d1818e104..91dcf4ca761 100644 --- a/src/mame/machine/pgmprot_igs027a_type1.h +++ b/src/mame/machine/pgmprot_igs027a_type1.h @@ -1,13 +1,15 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi, Xing Xing +#include "includes/pgm.h" class pgm_arm_type1_state : public pgm_state { public: pgm_arm_type1_state(const machine_config &mconfig, device_type type, const char *tag) - : pgm_state(mconfig, type, tag), - m_arm7_shareram(*this, "arm7_shareram"), - m_prot(*this, "prot") { + : pgm_state(mconfig, type, tag) + , m_arm7_shareram(*this, "arm7_shareram") + , m_prot(*this, "prot") + { m_curslots = 0; m_puzzli_54_trigger = 0; } diff --git a/src/mame/machine/primo.cpp b/src/mame/machine/primo.cpp index 34bc2fd66b4..4c36389e6b4 100644 --- a/src/mame/machine/primo.cpp +++ b/src/mame/machine/primo.cpp @@ -17,12 +17,7 @@ /* Components */ #include "cpu/z80/z80.h" -#include "bus/cbmiec/cbmiec.h" -#include "sound/speaker.h" - -/* Devices */ -#include "imagedev/cassette.h" -#include "imagedev/snapquik.h" +#include "screen.h" diff --git a/src/mame/machine/prof80mmu.cpp b/src/mame/machine/prof80mmu.cpp index cc8af9d6790..a89ed51af15 100644 --- a/src/mame/machine/prof80mmu.cpp +++ b/src/mame/machine/prof80mmu.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type PROF80_MMU = &device_creator; +const device_type PROF80_MMU = device_creator; DEVICE_ADDRESS_MAP_START( z80_program_map, 8, prof80_mmu_device ) diff --git a/src/mame/machine/psion_pack.cpp b/src/mame/machine/psion_pack.cpp index e29d3fe7112..e90810a6de2 100644 --- a/src/mame/machine/psion_pack.cpp +++ b/src/mame/machine/psion_pack.cpp @@ -54,7 +54,7 @@ static const char *datapack_option_spec = // device type definition -const device_type PSION_DATAPACK = &device_creator; +const device_type PSION_DATAPACK = device_creator; //------------------------------------------------- // datapack_device - constructor diff --git a/src/mame/machine/psxcd.cpp b/src/mame/machine/psxcd.cpp index eafd7ed2562..f1b4a3fd0c5 100644 --- a/src/mame/machine/psxcd.cpp +++ b/src/mame/machine/psxcd.cpp @@ -83,7 +83,7 @@ enum submode_flags // DEVICE DEFINITIONS //************************************************************************** -const device_type PSXCD = &device_creator; +const device_type PSXCD = device_creator; psxcd_device::psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cdrom_image_device(mconfig, PSXCD, "PSX Cdrom", tag, owner, clock, "psx_cd", __FILE__), diff --git a/src/mame/machine/qimi.cpp b/src/mame/machine/qimi.cpp index 7bbfbe903af..c698f3d587f 100644 --- a/src/mame/machine/qimi.cpp +++ b/src/mame/machine/qimi.cpp @@ -15,7 +15,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type QIMI = &device_creator; +const device_type QIMI = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/qx10kbd.cpp b/src/mame/machine/qx10kbd.cpp index 14a91372c78..a93bf7c7dd4 100644 --- a/src/mame/machine/qx10kbd.cpp +++ b/src/mame/machine/qx10kbd.cpp @@ -244,4 +244,4 @@ ioport_constructor qx10_keyboard_device::device_input_ports() const } -const device_type QX10_KEYBOARD = &device_creator; +const device_type QX10_KEYBOARD = device_creator; diff --git a/src/mame/machine/rmnkbd.cpp b/src/mame/machine/rmnkbd.cpp index be3304ec472..b7ba96f296b 100644 --- a/src/mame/machine/rmnkbd.cpp +++ b/src/mame/machine/rmnkbd.cpp @@ -177,4 +177,4 @@ void rmnimbus_keyboard_device::received_byte(uint8_t byte) } -const device_type RMNIMBUS_KEYBOARD = &device_creator; +const device_type RMNIMBUS_KEYBOARD = device_creator; diff --git a/src/mame/machine/rx01.cpp b/src/mame/machine/rx01.cpp index 263e7f94a37..dd62af3cdc8 100644 --- a/src/mame/machine/rx01.cpp +++ b/src/mame/machine/rx01.cpp @@ -42,7 +42,7 @@ MACHINE_CONFIG_END // DEVICE DEFINITIONS //************************************************************************** -const device_type RX01 = &device_creator; +const device_type RX01 = device_creator; //------------------------------------------------- // rx01_device - constructor diff --git a/src/mame/machine/s32comm.cpp b/src/mame/machine/s32comm.cpp index 793f3600187..d25d3bdfc32 100644 --- a/src/mame/machine/s32comm.cpp +++ b/src/mame/machine/s32comm.cpp @@ -79,7 +79,7 @@ MACHINE_CONFIG_END // GLOBAL VARIABLES //************************************************************************** -const device_type S32COMM = &device_creator; +const device_type S32COMM = device_creator; //------------------------------------------------- // machine_config_additions - device-specific diff --git a/src/mame/machine/samcoupe.cpp b/src/mame/machine/samcoupe.cpp index fa7a5fe80ca..85be0128bbf 100644 --- a/src/mame/machine/samcoupe.cpp +++ b/src/mame/machine/samcoupe.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/samcoupe.h" +#include "screen.h" /*************************************************************************** CONSTANTS diff --git a/src/mame/machine/segabb.cpp b/src/mame/machine/segabb.cpp index aa03b4e483e..e930caa4f3c 100644 --- a/src/mame/machine/segabb.cpp +++ b/src/mame/machine/segabb.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "segabb.h" -const device_type SEGA_LINDBERGH_BASEBOARD = &device_creator; +const device_type SEGA_LINDBERGH_BASEBOARD = device_creator; DEVICE_ADDRESS_MAP_START(map1, 32, sega_lindbergh_baseboard_device) ADDRESS_MAP_END diff --git a/src/mame/machine/segacrp2_device.cpp b/src/mame/machine/segacrp2_device.cpp index 9df96b7bb7c..be21a1919ef 100644 --- a/src/mame/machine/segacrp2_device.cpp +++ b/src/mame/machine/segacrp2_device.cpp @@ -85,18 +85,18 @@ static void decode(uint8_t *rom, uint8_t *decrypted, } -const device_type SEGACRP2_Z80 = &device_creator; - -const device_type SEGA_315_5179 = &device_creator; -const device_type SEGA_315_5178 = &device_creator; -const device_type SEGA_315_5177 = &device_creator; // also seen as 317-5000 -const device_type SEGA_315_5176 = &device_creator; // TODO! -const device_type SEGA_315_5162 = &device_creator; - -const device_type SEGA_317_0004 = &device_creator; -const device_type SEGA_317_0005 = &device_creator; -const device_type SEGA_317_0006 = &device_creator; -const device_type SEGA_317_0007 = &device_creator; +const device_type SEGACRP2_Z80 = device_creator; + +const device_type SEGA_315_5179 = device_creator; +const device_type SEGA_315_5178 = device_creator; +const device_type SEGA_315_5177 = device_creator; // also seen as 317-5000 +const device_type SEGA_315_5176 = device_creator; // TODO! +const device_type SEGA_315_5162 = device_creator; + +const device_type SEGA_317_0004 = device_creator; +const device_type SEGA_317_0005 = device_creator; +const device_type SEGA_317_0006 = device_creator; +const device_type SEGA_317_0007 = device_creator; diff --git a/src/mame/machine/segacrpt_device.cpp b/src/mame/machine/segacrpt_device.cpp index d889e4045cb..bda64ba277e 100644 --- a/src/mame/machine/segacrpt_device.cpp +++ b/src/mame/machine/segacrpt_device.cpp @@ -255,35 +255,35 @@ static void decode(uint8_t *data, uint8_t *opcodes, int size, const uint8_t conv -const device_type SEGACRPT_Z80 = &device_creator; - -const device_type SEGA_315_5132 = &device_creator; -const device_type SEGA_315_5155 = &device_creator; -const device_type SEGA_315_5110 = &device_creator; -const device_type SEGA_315_5135 = &device_creator; -const device_type SEGA_315_5051 = &device_creator; -const device_type SEGA_315_5098 = &device_creator; // also 315-5030 ? -const device_type SEGA_315_5102 = &device_creator; -const device_type SEGA_315_5065 = &device_creator; -const device_type SEGA_315_5064 = &device_creator; -const device_type SEGA_315_5033 = &device_creator; -const device_type SEGA_315_5041 = &device_creator; -const device_type SEGA_315_5048 = &device_creator; -const device_type SEGA_315_5093 = &device_creator; -const device_type SEGA_315_5099 = &device_creator; -const device_type SEGA_315_5015 = &device_creator; -const device_type SEGA_315_5133 = &device_creator; // NOT DECRYPTED YET -const device_type SEGA_315_5061 = &device_creator; -const device_type SEGA_315_5028 = &device_creator; -const device_type SEGA_315_5084 = &device_creator; -const device_type SEGA_315_5013 = &device_creator; -const device_type SEGA_315_5014 = &device_creator; -const device_type SEGA_315_5018 = &device_creator; -const device_type SEGA_315_5010 = &device_creator; +const device_type SEGACRPT_Z80 = device_creator; + +const device_type SEGA_315_5132 = device_creator; +const device_type SEGA_315_5155 = device_creator; +const device_type SEGA_315_5110 = device_creator; +const device_type SEGA_315_5135 = device_creator; +const device_type SEGA_315_5051 = device_creator; +const device_type SEGA_315_5098 = device_creator; // also 315-5030 ? +const device_type SEGA_315_5102 = device_creator; +const device_type SEGA_315_5065 = device_creator; +const device_type SEGA_315_5064 = device_creator; +const device_type SEGA_315_5033 = device_creator; +const device_type SEGA_315_5041 = device_creator; +const device_type SEGA_315_5048 = device_creator; +const device_type SEGA_315_5093 = device_creator; +const device_type SEGA_315_5099 = device_creator; +const device_type SEGA_315_5015 = device_creator; +const device_type SEGA_315_5133 = device_creator; // NOT DECRYPTED YET +const device_type SEGA_315_5061 = device_creator; +const device_type SEGA_315_5028 = device_creator; +const device_type SEGA_315_5084 = device_creator; +const device_type SEGA_315_5013 = device_creator; +const device_type SEGA_315_5014 = device_creator; +const device_type SEGA_315_5018 = device_creator; +const device_type SEGA_315_5010 = device_creator; // below are unknown part numbers -const device_type SEGA_315_SPAT = &device_creator; // unknown part number -const device_type SEGA_CPU_PBACTIO4 = &device_creator; +const device_type SEGA_315_SPAT = device_creator; // unknown part number +const device_type SEGA_CPU_PBACTIO4 = device_creator; diff --git a/src/mame/machine/segaic16.cpp b/src/mame/machine/segaic16.cpp index 11ec0dddc8c..ecb16a4bf73 100644 --- a/src/mame/machine/segaic16.cpp +++ b/src/mame/machine/segaic16.cpp @@ -27,10 +27,10 @@ //************************************************************************** // device type definition -const device_type SEGA_315_5195_MEM_MAPPER = &device_creator; -const device_type SEGA_315_5248_MULTIPLIER = &device_creator; -const device_type SEGA_315_5249_DIVIDER = &device_creator; -const device_type SEGA_315_5250_COMPARE_TIMER = &device_creator; +const device_type SEGA_315_5195_MEM_MAPPER = device_creator; +const device_type SEGA_315_5248_MULTIPLIER = device_creator; +const device_type SEGA_315_5249_DIVIDER = device_creator; +const device_type SEGA_315_5250_COMPARE_TIMER = device_creator; diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h index 25205c34985..28c672e6583 100644 --- a/src/mame/machine/segaic16.h +++ b/src/mame/machine/segaic16.h @@ -6,14 +6,15 @@ ***************************************************************************/ -#pragma once +#ifndef MAME_MACHINE_SEGAIC16_H +#define MAME_MACHINE_SEGAIC16_H -#ifndef __SEGAIC16_H__ -#define __SEGAIC16_H__ +#pragma once #include "cpu/m68000/m68000.h" #include "machine/fd1089.h" #include "machine/fd1094.h" +#include "screen.h" //************************************************************************** @@ -274,4 +275,4 @@ extern const device_type SEGA_315_5249_DIVIDER; extern const device_type SEGA_315_5250_COMPARE_TIMER; -#endif +#endif // MAME_MACHINE_SEGAIC16_H diff --git a/src/mame/machine/seibucop/seibucop.cpp b/src/mame/machine/seibucop/seibucop.cpp index 8b5cab3a08b..70a3beb7660 100644 --- a/src/mame/machine/seibucop/seibucop.cpp +++ b/src/mame/machine/seibucop/seibucop.cpp @@ -110,7 +110,7 @@ if (LOG_Commands) logerror -const device_type RAIDEN2COP = &device_creator; +const device_type RAIDEN2COP = device_creator; raiden2cop_device::raiden2cop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RAIDEN2COP, "Seibu COP (Raiden 2)", tag, owner, clock, "raiden2cop", __FILE__), diff --git a/src/mame/machine/seicop.cpp b/src/mame/machine/seicop.cpp index addb3a792a8..515b31282a1 100644 --- a/src/mame/machine/seicop.cpp +++ b/src/mame/machine/seicop.cpp @@ -18,7 +18,7 @@ #include "includes/legionna.h" -const device_type SEIBU_COP_BOOTLEG = &device_creator; +const device_type SEIBU_COP_BOOTLEG = device_creator; READ16_MEMBER(seibu_cop_bootleg_device::reg_lo_addr_r) { diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp index c190315041c..909d821fef0 100644 --- a/src/mame/machine/sgi.cpp +++ b/src/mame/machine/sgi.cpp @@ -28,7 +28,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_ } #endif -const device_type SGI_MC = &device_creator; +const device_type SGI_MC = device_creator; sgi_mc_device::sgi_mc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SGI_MC, "SGI Memory Controller", tag, owner, clock, "sgi_mc", __FILE__), diff --git a/src/mame/machine/slapstic.cpp b/src/mame/machine/slapstic.cpp index 0361b53f4d7..38f74b9358d 100644 --- a/src/mame/machine/slapstic.cpp +++ b/src/mame/machine/slapstic.cpp @@ -185,7 +185,7 @@ #include "includes/slapstic.h" -extern const device_type SLAPSTIC = &device_creator; +const device_type SLAPSTIC = device_creator; atari_slapstic_device::atari_slapstic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SLAPSTIC, "Atari Slapstic", tag, owner, clock, "slapstic", __FILE__), diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index d39d6c1bc41..fc14f746b50 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -4,8 +4,10 @@ #include "emu.h" #include "st0016.h" +#include "speaker.h" -const device_type ST0016_CPU = &device_creator; + +const device_type ST0016_CPU = device_creator; static ADDRESS_MAP_START(st0016_cpu_internal_map, AS_PROGRAM, 8, st0016_cpu_device) AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w) diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h index c82e4eacfdb..c25b1e425e5 100644 --- a/src/mame/machine/st0016.h +++ b/src/mame/machine/st0016.h @@ -2,13 +2,14 @@ // copyright-holders:Tomasz Slanina, David Haywood /* ST0016 - CPU (z80) + Sound + Video */ -#pragma once +#ifndef MAME_MACHINE_ST0016_CPU_H +#define MAME_MACHINE_ST0016_CPU_H -#ifndef __ST0016_CPU__ -#define __ST0016_CPU__ +#pragma once #include "cpu/z80/z80.h" #include "sound/st0016.h" +#include "screen.h" #define ISMACS (m_game_flag & 0x80) #define ISMACS1 (((m_game_flag & 0x180) == 0x180)) @@ -113,4 +114,4 @@ private: extern const device_type ST0016_CPU; -#endif /// __ST0016_CPU__ +#endif // MAME_MACHINE_ST0016_CPU_H diff --git a/src/mame/machine/swim.cpp b/src/mame/machine/swim.cpp index cac2f6ed387..59537173bd8 100644 --- a/src/mame/machine/swim.cpp +++ b/src/mame/machine/swim.cpp @@ -32,7 +32,7 @@ enum DEVICE ***************************************************************************/ -const device_type SWIM = &device_creator; +const device_type SWIM = device_creator; //------------------------------------------------- // ctor diff --git a/src/mame/machine/tait8741.cpp b/src/mame/machine/tait8741.cpp index 3ea6607b1b0..ba5c223a025 100644 --- a/src/mame/machine/tait8741.cpp +++ b/src/mame/machine/tait8741.cpp @@ -33,7 +33,7 @@ gladiatr and Great Swordsman set. #define CMD_08 1 #define CMD_4a 2 -const device_type TAITO8741_4PACK = &device_creator; +const device_type TAITO8741_4PACK = device_creator; taito8741_4pack_device::taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TAITO8741_4PACK, "I8741 MCU Simulation (Taito 4Pack)", tag, owner, clock, "taito8741_4pack", __FILE__), diff --git a/src/mame/machine/taito68705interface.cpp b/src/mame/machine/taito68705interface.cpp index 3cb18183b9a..b66233d70ff 100644 --- a/src/mame/machine/taito68705interface.cpp +++ b/src/mame/machine/taito68705interface.cpp @@ -73,10 +73,10 @@ MACHINE_CONFIG_END } // anonymous namespace -device_type const TAITO68705_MCU = &device_creator; -device_type const TAITO68705_MCU_TIGER = &device_creator; -device_type const ARKANOID_68705P3 = &device_creator; -device_type const ARKANOID_68705P5 = &device_creator; +device_type const TAITO68705_MCU = device_creator; +device_type const TAITO68705_MCU_TIGER = device_creator; +device_type const ARKANOID_68705P3 = device_creator; +device_type const ARKANOID_68705P5 = device_creator; READ8_MEMBER(taito68705_mcu_device_base::data_r) diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp index c19e1ffd02b..cd38073857a 100644 --- a/src/mame/machine/taitoio.cpp +++ b/src/mame/machine/taitoio.cpp @@ -59,7 +59,7 @@ MACHINE_CONFIG_END /* */ /***************************************************************************/ -const device_type TC0220IOC = &device_creator; +const device_type TC0220IOC = device_creator; tc0220ioc_device::tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0220IOC, "Taito TC0220IOC", tag, owner, clock, "tc0220ioc", __FILE__), @@ -196,7 +196,7 @@ WRITE8_MEMBER( tc0220ioc_device::portreg_w ) /***************************************************************************/ -const device_type TC0510NIO = &device_creator; +const device_type TC0510NIO = device_creator; tc0510nio_device::tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0510NIO, "Taito TC0510NIO", tag, owner, clock, "tc0510nio", __FILE__), @@ -334,7 +334,7 @@ WRITE16_MEMBER( tc0510nio_device::halfword_wordswap_w ) /***************************************************************************/ -const device_type TC0640FIO = &device_creator; +const device_type TC0640FIO = device_creator; tc0640fio_device::tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0640FIO, "Taito TC0640FIO", tag, owner, clock, "tc0640fio", __FILE__), diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp index ff76291c1ff..fa84fbec7ee 100644 --- a/src/mame/machine/tandy2kb.cpp +++ b/src/mame/machine/tandy2kb.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TANDY2K_KEYBOARD = &device_creator; +const device_type TANDY2K_KEYBOARD = device_creator; diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp index d93c498e371..b2b3ffdae10 100644 --- a/src/mame/machine/teleprinter.cpp +++ b/src/mame/machine/teleprinter.cpp @@ -3,6 +3,10 @@ #include "emu.h" #include "teleprinter.h" +#include "screen.h" +#include "speaker.h" + + static const uint8_t teleprinter_font[128*8] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -237,4 +241,4 @@ void teleprinter_device::device_reset() generic_terminal_device::device_reset(); } -const device_type TELEPRINTER = &device_creator; +const device_type TELEPRINTER = device_creator; diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index b1c7d004b2c..9bce968b43c 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -593,7 +593,7 @@ READ8_MEMBER( thomson_state::to7_sys_portb_in ) because the Data Transmit Ready bit is shared in an incompatible way! */ -const device_type TO7_IO_LINE = &device_creator; +const device_type TO7_IO_LINE = device_creator; //------------------------------------------------- // to7_io_line_device - constructor diff --git a/src/mame/machine/ticket.cpp b/src/mame/machine/ticket.cpp index 81db8e0caf0..68cb586d32e 100644 --- a/src/mame/machine/ticket.cpp +++ b/src/mame/machine/ticket.cpp @@ -26,7 +26,7 @@ //************************************************************************** // device type definition -const device_type TICKET_DISPENSER = &device_creator; +const device_type TICKET_DISPENSER = device_creator; diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp index 0fe207f1ab0..86a73ed9c7d 100644 --- a/src/mame/machine/trs80m2kb.cpp +++ b/src/mame/machine/trs80m2kb.cpp @@ -23,7 +23,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type TRS80M2_KEYBOARD = &device_creator; +const device_type TRS80M2_KEYBOARD = device_creator; diff --git a/src/mame/machine/upd65031.cpp b/src/mame/machine/upd65031.cpp index 6a98da0660c..8c57602dbd6 100644 --- a/src/mame/machine/upd65031.cpp +++ b/src/mame/machine/upd65031.cpp @@ -27,7 +27,7 @@ // device type definition -const device_type UPD65031 = &device_creator; +const device_type UPD65031 = device_creator; //************************************************************************** diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp index 05f7114e8c9..33b3be0a86d 100644 --- a/src/mame/machine/v1050kb.cpp +++ b/src/mame/machine/v1050kb.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "v1050kb.h" +#include "speaker.h" + //************************************************************************** @@ -24,7 +26,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type V1050_KEYBOARD = &device_creator; +const device_type V1050_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/vector06.cpp b/src/mame/machine/vector06.cpp index efe3e81ff0d..f16eae3e56a 100644 --- a/src/mame/machine/vector06.cpp +++ b/src/mame/machine/vector06.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "includes/vector06.h" +#include "screen.h" READ8_MEMBER( vector06_state::vector06_8255_portb_r ) diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index d23f62126a2..e63fa8364be 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -86,7 +86,7 @@ const int victor_9000_fdc_t::rpm[] = { 252, 252, 252, 252, 252, 252, 252, 252, 2 // DEVICE DEFINITIONS //************************************************************************** -const device_type VICTOR_9000_FDC = &device_creator; +const device_type VICTOR_9000_FDC = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/victor9kb.cpp b/src/mame/machine/victor9kb.cpp index 9fb6e882caf..b26df2526ac 100644 --- a/src/mame/machine/victor9kb.cpp +++ b/src/mame/machine/victor9kb.cpp @@ -353,7 +353,7 @@ Y11 104 103 102 101 100 99 98 97 kN/A k. k00 k0 RGHT LEFT PAUS // DEVICE DEFINITIONS //************************************************************************** -const device_type VICTOR9K_KEYBOARD = &device_creator; +const device_type VICTOR9K_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/vtech2.cpp b/src/mame/machine/vtech2.cpp index 4d1fcefdf96..f8d7d2a38b0 100644 --- a/src/mame/machine/vtech2.cpp +++ b/src/mame/machine/vtech2.cpp @@ -17,9 +17,8 @@ #include "emu.h" #include "includes/vtech2.h" + #include "imagedev/flopdrv.h" -#include "imagedev/cassette.h" -#include "sound/speaker.h" /* public */ diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp index e502814d13e..e9332d7dc06 100644 --- a/src/mame/machine/wangpckb.cpp +++ b/src/mame/machine/wangpckb.cpp @@ -52,6 +52,7 @@ Notes: #include "emu.h" #include "wangpckb.h" +#include "speaker.h" //************************************************************************** @@ -69,7 +70,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type WANGPC_KEYBOARD = &device_creator; +const device_type WANGPC_KEYBOARD = device_creator; diff --git a/src/mame/machine/wpc.cpp b/src/mame/machine/wpc.cpp index 346daf954a1..b959966164e 100644 --- a/src/mame/machine/wpc.cpp +++ b/src/mame/machine/wpc.cpp @@ -11,7 +11,7 @@ #define LOG_WPC (0) -const device_type WPCASIC = &device_creator; +const device_type WPCASIC = device_creator; wpc_device::wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig,WPCASIC,"Williams WPC ASIC",tag,owner,clock, "wpc", __FILE__), diff --git a/src/mame/machine/wpc_lamp.cpp b/src/mame/machine/wpc_lamp.cpp index a2d7a4713fa..d40bc033b03 100644 --- a/src/mame/machine/wpc_lamp.cpp +++ b/src/mame/machine/wpc_lamp.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "wpc_lamp.h" -const device_type WPC_LAMP = &device_creator; +const device_type WPC_LAMP = device_creator; wpc_lamp_device::wpc_lamp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WPC_LAMP, "Williams Pinball Controller Lamp Control", tag, owner, clock, "wpc_lamp", __FILE__) diff --git a/src/mame/machine/wpc_out.cpp b/src/mame/machine/wpc_out.cpp index 67e02e1768e..1e5cb36f084 100644 --- a/src/mame/machine/wpc_out.cpp +++ b/src/mame/machine/wpc_out.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "wpc_out.h" -const device_type WPC_OUT = &device_creator; +const device_type WPC_OUT = device_creator; wpc_out_device::wpc_out_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WPC_OUT, "Williams Pinball Controller Output Control", tag, owner, clock, "wpc_out", __FILE__) diff --git a/src/mame/machine/wpc_pic.cpp b/src/mame/machine/wpc_pic.cpp index c61d0b5213b..64ec9fbafb5 100644 --- a/src/mame/machine/wpc_pic.cpp +++ b/src/mame/machine/wpc_pic.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "wpc_pic.h" -const device_type WPC_PIC = &device_creator; +const device_type WPC_PIC = device_creator; wpc_pic_device::wpc_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WPC_PIC, "Williams Pinball Controller PIC Security", tag, owner, clock, "wpc_pic", __FILE__), diff --git a/src/mame/machine/wpc_shift.cpp b/src/mame/machine/wpc_shift.cpp index cbd534dc12a..a8cfa7c853c 100644 --- a/src/mame/machine/wpc_shift.cpp +++ b/src/mame/machine/wpc_shift.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "wpc_shift.h" -const device_type WPC_SHIFT = &device_creator; +const device_type WPC_SHIFT = device_creator; wpc_shift_device::wpc_shift_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, WPC_SHIFT, "Williams Pinball Controller Shifter", tag, owner, clock, "wpc_shift", __FILE__) diff --git a/src/mame/machine/x1.cpp b/src/mame/machine/x1.cpp index cb724cd326f..71cdb6ff643 100644 --- a/src/mame/machine/x1.cpp +++ b/src/mame/machine/x1.cpp @@ -9,7 +9,7 @@ // LIVE DEVICE //************************************************************************** -const device_type X1_KEYBOARD = &device_creator; +const device_type X1_KEYBOARD = device_creator; //------------------------------------------------- // z80ctc_device - constructor diff --git a/src/mame/machine/x68k_hdc.cpp b/src/mame/machine/x68k_hdc.cpp index cb8400b18e5..aee064627cb 100644 --- a/src/mame/machine/x68k_hdc.cpp +++ b/src/mame/machine/x68k_hdc.cpp @@ -22,7 +22,7 @@ #include "imagedev/harddriv.h" #include "image.h" -const device_type X68KHDC = &device_creator; +const device_type X68KHDC = device_creator; x68k_hdc_image_device::x68k_hdc_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, X68KHDC, "SASI Hard Disk", tag, owner, clock, "x68k_hdc_image", __FILE__), diff --git a/src/mame/machine/x68k_kbd.cpp b/src/mame/machine/x68k_kbd.cpp index 94c49450f87..7aa06e76a31 100644 --- a/src/mame/machine/x68k_kbd.cpp +++ b/src/mame/machine/x68k_kbd.cpp @@ -302,7 +302,7 @@ void x68k_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, in } -const device_type X68K_KEYBOARD = &device_creator; +const device_type X68K_KEYBOARD = device_creator; #if 0 diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp index 569ce6270bb..e9f1b57f49d 100644 --- a/src/mame/machine/x820kb.cpp +++ b/src/mame/machine/x820kb.cpp @@ -57,7 +57,7 @@ Notes: // DEVICE DEFINITIONS //************************************************************************** -const device_type XEROX_820_KEYBOARD = &device_creator; +const device_type XEROX_820_KEYBOARD = device_creator; //------------------------------------------------- diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index 753a1406c77..fa5b2e28f87 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -1,22 +1,20 @@ // license:BSD-3-Clause // copyright-holders:Samuele Zannoli -#include - #include "emu.h" +#include "includes/xbox.h" + #include "cpu/i386/i386.h" #include "machine/lpci.h" -#include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/idectrl.h" -#include "video/poly.h" -#include "bitmap.h" -#include "debugger.h" #include "debug/debugcon.h" #include "debug/debugcmd.h" -#include "includes/xbox_nv2a.h" -#include "includes/xbox.h" -#include "includes/xbox_usb.h" + +#include "debugger.h" + +#include "bitmap.h" + +#include #define LOG_PCI //#define LOG_AUDIO diff --git a/src/mame/machine/xbox_usb.cpp b/src/mame/machine/xbox_usb.cpp index 96d18b1f5bb..41356020862 100644 --- a/src/mame/machine/xbox_usb.cpp +++ b/src/mame/machine/xbox_usb.cpp @@ -2,13 +2,8 @@ // copyright-holders:Samuele Zannoli #include "emu.h" -#include "machine/pic8259.h" -#include "machine/idectrl.h" -#include "video/poly.h" -#include "bitmap.h" -#include "includes/xbox_nv2a.h" -#include "includes/xbox.h" #include "includes/xbox_usb.h" +#include "includes/xbox.h" //#define LOG_OHCI @@ -43,7 +38,7 @@ static const char *const usbregnames[] = { }; #endif -const device_type OHCI_USB_CONTROLLER = &device_creator; +const device_type OHCI_USB_CONTROLLER = device_creator; ohci_usb_controller::ohci_usb_controller(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, OHCI_USB_CONTROLLER, "OHCI USB CONTROLLER", tag, owner, clock, "ohciusb", __FILE__), @@ -1391,7 +1386,7 @@ const USBStandardInterfaceDescriptor ohci_game_controller_device::intdesc = { 9, const USBStandardEndpointDescriptor ohci_game_controller_device::enddesc82 = { 7,5,0x82,3,0x20,4 }; const USBStandardEndpointDescriptor ohci_game_controller_device::enddesc02 = { 7,5,0x02,3,0x20,4 }; -const device_type OHCI_GAME_CONTROLLER = &device_creator; +const device_type OHCI_GAME_CONTROLLER = device_creator; ohci_game_controller_device::ohci_game_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, OHCI_GAME_CONTROLLER, "OHCI Game Controller", tag, owner, clock, "ohci_gc", __FILE__), diff --git a/src/mame/machine/znmcu.cpp b/src/mame/machine/znmcu.cpp index 3ef5f405388..8e4d1d8ba2c 100644 --- a/src/mame/machine/znmcu.cpp +++ b/src/mame/machine/znmcu.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "znmcu.h" -const device_type ZNMCU = &device_creator; +const device_type ZNMCU = device_creator; znmcu_device::znmcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ZNMCU, "Sony ZN MCU", tag, owner, clock, "znmcu", __FILE__), diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp index d25636a8947..b0aa346a688 100644 --- a/src/mame/machine/zorbakbd.cpp +++ b/src/mame/machine/zorbakbd.cpp @@ -8,12 +8,12 @@ * switches are only read on startup. The row select outputs are * decoded by a 74159 so only one row can be driven at a time. * - * The keyboard has an unpopulated PCB location for the DIP switches, - * but they're unpopulated so all the switches are always off unless you - * add them or solder in wire links. The keyclick/bell beeper also - * appears to be unpopulated. The 300 Baud option is probably to allow - * the MCU program to be used with other CP/M systems (e.g. Kaypro - * expects this Baud rate). + * The keyboard has a PCB location for the DIP switches, but they're + * unpopulated so all the switches are always off unless you add them or + * solder in wire links. The keyclick/bell beeper also appears to be + * unpopulated. The 300 Baud option is probably to allow the same MCU + * program to be used with other CP/M systems (e.g. Kaypro expects this + * Baud rate). * * In addition to the asynchronous serial output, the program supports * synchronous output. If enabled with DIP switches, characters are @@ -74,6 +74,7 @@ #include "zorbakbd.h" #include "cpu/m6805/m68705.h" +#include "speaker.h" namespace { @@ -259,7 +260,7 @@ ROM_END } // anonymous namespace -device_type const ZORBA_KEYBOARD = &device_creator; +device_type const ZORBA_KEYBOARD = device_creator; zorba_keyboard_device::zorba_keyboard_device( diff --git a/src/mame/machine/zs01.cpp b/src/mame/machine/zs01.cpp index 1c2d60343e4..57d938939d3 100644 --- a/src/mame/machine/zs01.cpp +++ b/src/mame/machine/zs01.cpp @@ -28,7 +28,7 @@ inline void ATTR_PRINTF( 3, 4 ) zs01_device::verboselog( int n_level, const char } // device type definition -const device_type ZS01 = &device_creator; +const device_type ZS01 = device_creator; zs01_device::zs01_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t( mconfig, ZS01, "Konami ZS01 PIC", tag, owner, clock, "zs01", __FILE__ ), diff --git a/src/mame/machine/zx8302.cpp b/src/mame/machine/zx8302.cpp index d7ae084ce7f..e4680ef865f 100644 --- a/src/mame/machine/zx8302.cpp +++ b/src/mame/machine/zx8302.cpp @@ -41,7 +41,7 @@ static const int RTC_BASE_ADJUST = 283996800; // DEVICE DEFINITIONS //************************************************************************** -const device_type ZX8302 = &device_creator; +const device_type ZX8302 = device_creator; //************************************************************************** // INLINE HELPERS diff --git a/src/mame/video/20pacgal.cpp b/src/mame/video/20pacgal.cpp index 6026245223b..142b9aea817 100644 --- a/src/mame/video/20pacgal.cpp +++ b/src/mame/video/20pacgal.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/20pacgal.h" +#include "screen.h" #define SCREEN_HEIGHT (224) diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index 52e1f27be6f..f5fc7277af5 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -27,6 +27,7 @@ #include "emu.h" #include "733_asr.h" +#include "screen.h" enum { @@ -78,7 +79,7 @@ PALETTE_INIT_MEMBER(asr733_device, asr733) } -const device_type ASR733 = &device_creator; +const device_type ASR733 = device_creator; asr733_device::asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ASR733, "733 ASR", tag, owner, clock, "asr733", __FILE__), diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp index 0f2fa8ad020..96a6236c262 100644 --- a/src/mame/video/911_vdt.cpp +++ b/src/mame/video/911_vdt.cpp @@ -17,6 +17,10 @@ TODO: #include "911_chr.h" #include "911_key.h" +#include "screen.h" +#include "speaker.h" + + #define MAX_VDT 1 static const gfx_layout fontlayout_7bit = @@ -141,7 +145,7 @@ static void apply_char_overrides(int nb_char_overrides, const char_override_t ch } } -const device_type VDT911 = &device_creator; +const device_type VDT911 = device_creator; vdt911_device::vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VDT911, "911 VDT", tag, owner, clock, "vdt911", __FILE__), diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index 2dc8e3782a0..559590ec1cc 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -44,7 +44,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type ABC1600_MOVER = &device_creator; +const device_type ABC1600_MOVER = device_creator; DEVICE_ADDRESS_MAP_START( vram_map, 8, abc1600_mover_device ) diff --git a/src/mame/video/abc80.cpp b/src/mame/video/abc80.cpp index 6db67ee15da..ecc95facf1a 100644 --- a/src/mame/video/abc80.cpp +++ b/src/mame/video/abc80.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/abc80.h" +#include "screen.h" diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index 136fbf96866..39ba7db31f5 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/abc80x.h" +#include "screen.h" diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp index 27e08da77a1..d9c88a039b2 100644 --- a/src/mame/video/abc802.cpp +++ b/src/mame/video/abc802.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/abc80x.h" +#include "screen.h" diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp index a465072537b..547a73d27f0 100644 --- a/src/mame/video/abc806.cpp +++ b/src/mame/video/abc806.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/abc80x.h" +#include "screen.h" diff --git a/src/mame/video/aerofgt.cpp b/src/mame/video/aerofgt.cpp index 20da54b7f9b..5fd380b385b 100644 --- a/src/mame/video/aerofgt.cpp +++ b/src/mame/video/aerofgt.cpp @@ -2,6 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" #include "includes/aerofgt.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/airraid_dev.cpp b/src/mame/video/airraid_dev.cpp index 7308785da62..1b3d1b768e3 100644 --- a/src/mame/video/airraid_dev.cpp +++ b/src/mame/video/airraid_dev.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "airraid_dev.h" -extern const device_type AIRRAID_VIDEO = &device_creator; +const device_type AIRRAID_VIDEO = device_creator; airraid_video_device::airraid_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, AIRRAID_VIDEO, "Seibu Air Raid Video", tag, owner, clock, "airraid_vid", __FILE__), diff --git a/src/mame/video/airraid_dev.h b/src/mame/video/airraid_dev.h index be7fa1ffa53..fb91af5e28c 100644 --- a/src/mame/video/airraid_dev.h +++ b/src/mame/video/airraid_dev.h @@ -1,11 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina, Angelo Salese, hap, David Haywood -#pragma once +#ifndef MAME_VIDEO_AIRRAID_DEV_H +#define MAME_VIDEO_AIRRAID_DEV_H -#ifndef __AIRRAID_VIDEO__ -#define __AIRRAID_VIDEO__ +#pragma once +#include "screen.h" extern const device_type AIRRAID_VIDEO; @@ -72,4 +73,4 @@ private: void mix_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t* clut, int base); }; -#endif +#endif // MAME_VIDEO_AIRRAID_DEV_H diff --git a/src/mame/video/angelkds.cpp b/src/mame/video/angelkds.cpp index 63700ca7313..afe1501c3a6 100644 --- a/src/mame/video/angelkds.cpp +++ b/src/mame/video/angelkds.cpp @@ -10,6 +10,7 @@ enable / disable tilemap bits might be wrong #include "emu.h" #include "includes/angelkds.h" +#include "screen.h" /*** Text Layer Tilemap diff --git a/src/mame/video/antic.cpp b/src/mame/video/antic.cpp index a384aa4d7b1..247173d40fd 100644 --- a/src/mame/video/antic.cpp +++ b/src/mame/video/antic.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "antic.h" +#include "screen.h" #ifdef MAME_DEBUG #define VERBOSE 1 @@ -20,7 +21,7 @@ #define LOG(x) do { if (VERBOSE) logerror x; } while (0) // devices -const device_type ATARI_ANTIC = &device_creator; +const device_type ATARI_ANTIC = device_creator; //------------------------------------------------- // antic_device - constructor diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index 8d5981f0ef7..9f1e9f9d59b 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -13,14 +13,19 @@ * */ +#include "emu.h" + #define VERBOSE 0 -#include "emu.h" #include "includes/apollo.h" + #include "rendlay.h" +#include "screen.h" + #include "apollo.lh" #include "apollo_15i.lh" + /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ @@ -1715,7 +1720,7 @@ MACHINE_CONFIG_FRAGMENT( apollo_graphics ) MCFG_SCREEN_UPDATE_DEVICE(APOLLO_SCREEN_TAG, apollo_graphics_15i, screen_update) MACHINE_CONFIG_END -const device_type APOLLO_GRAPHICS = &device_creator ; +const device_type APOLLO_GRAPHICS = device_creator ; apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, APOLLO_GRAPHICS, "Apollo Screen", tag, owner, clock,"apollo_graphics_15i", __FILE__), @@ -1886,7 +1891,7 @@ MACHINE_CONFIG_FRAGMENT( apollo_mono19i ) MCFG_SCREEN_UPDATE_DEVICE(APOLLO_SCREEN_TAG, apollo_graphics_19i, screen_update) MACHINE_CONFIG_END -const device_type APOLLO_MONO19I = &device_creator ; +const device_type APOLLO_MONO19I = device_creator ; apollo_graphics_19i::apollo_graphics_19i(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp index 7dc2708f571..9747cee634e 100644 --- a/src/mame/video/apple2.cpp +++ b/src/mame/video/apple2.cpp @@ -668,7 +668,7 @@ uint32_t apple2_state::screen_update_apple2(screen_device &screen, bitmap_ind16 New implementation */ -const device_type APPLE2_VIDEO = &device_creator; +const device_type APPLE2_VIDEO = device_creator; //------------------------------------------------- // a2_video_device - constructor diff --git a/src/mame/video/apple2.h b/src/mame/video/apple2.h index 5f5a8c142d2..e3daa888210 100644 --- a/src/mame/video/apple2.h +++ b/src/mame/video/apple2.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef __A2_VIDEO__ -#define __A2_VIDEO__ +#ifndef MAME_VIDEO_APPLE2_H +#define MAME_VIDEO_APPLE2_H class a2_video_device : @@ -60,4 +60,4 @@ private: // device type definition extern const device_type APPLE2_VIDEO; -#endif +#endif // MAME_VIDEO_APPLE2_H diff --git a/src/mame/video/asterix.cpp b/src/mame/video/asterix.cpp index f0de3a1939d..50726b4dd8a 100644 --- a/src/mame/video/asterix.cpp +++ b/src/mame/video/asterix.cpp @@ -2,6 +2,7 @@ // copyright-holders:Olivier Galibert #include "emu.h" #include "includes/asterix.h" +#include "screen.h" void asterix_state::reset_spritebank() diff --git a/src/mame/video/asuka.cpp b/src/mame/video/asuka.cpp index b703d450d7d..21a5586e768 100644 --- a/src/mame/video/asuka.cpp +++ b/src/mame/video/asuka.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves, Brian Troha #include "emu.h" #include "includes/asuka.h" +#include "screen.h" /************************************************************** SPRITE READ AND WRITE HANDLERS diff --git a/src/mame/video/atari400.cpp b/src/mame/video/atari400.cpp index 956ef67ed7f..c57ed2d8aaa 100644 --- a/src/mame/video/atari400.cpp +++ b/src/mame/video/atari400.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/atari400.h" +#include "screen.h" #define VERBOSE 0 diff --git a/src/mame/video/atarimo.cpp b/src/mame/video/atarimo.cpp index 6afe7c4abd2..e16b5499567 100644 --- a/src/mame/video/atarimo.cpp +++ b/src/mame/video/atarimo.cpp @@ -66,6 +66,7 @@ shuuz 1 1 1 0 0 0 0 8 0 0 0x000 0x100 0 00ff,0,0 #include "emu.h" #include "atarimo.h" +#include "screen.h" //************************************************************************** @@ -117,7 +118,7 @@ inline int atari_motion_objects_device::round_to_powerof2(int value) //************************************************************************** // device type definition -const device_type ATARI_MOTION_OBJECTS = &device_creator; +const device_type ATARI_MOTION_OBJECTS = device_creator; //------------------------------------------------- // atari_motion_objects_device - constructor diff --git a/src/mame/video/atarirle.cpp b/src/mame/video/atarirle.cpp index 6c328eca057..d3e41edff56 100644 --- a/src/mame/video/atarirle.cpp +++ b/src/mame/video/atarirle.cpp @@ -22,13 +22,14 @@ #include "emu.h" #include "atarirle.h" +#include "screen.h" //************************************************************************** // CONSTANTS //************************************************************************** -const device_type ATARI_RLE_OBJECTS = &device_creator; +const device_type ATARI_RLE_OBJECTS = device_creator; enum { atarirle_hilite_index = -1 }; diff --git a/src/mame/video/atarist.cpp b/src/mame/video/atarist.cpp index d72cc91be93..b897754b778 100644 --- a/src/mame/video/atarist.cpp +++ b/src/mame/video/atarist.cpp @@ -12,11 +12,13 @@ */ #include "emu.h" -#include "cpu/m68000/m68000.h" -#include "machine/ram.h" #include "video/atarist.h" #include "includes/atarist.h" +#include "cpu/m68000/m68000.h" +#include "machine/ram.h" +#include "screen.h" + //************************************************************************** diff --git a/src/mame/video/avgdvg.cpp b/src/mame/video/avgdvg.cpp index 5f68e24367f..99ef35ae8a5 100644 --- a/src/mame/video/avgdvg.cpp +++ b/src/mame/video/avgdvg.cpp @@ -16,6 +16,7 @@ #include "emu.h" #include "avgdvg.h" +#include "screen.h" /************************************* * @@ -1567,11 +1568,11 @@ avg_tomcat_device::avg_tomcat_device(const machine_config &mconfig, const char * { } -const device_type DVG = &device_creator; -const device_type AVG = &device_creator; -const device_type AVG_TEMPEST = &device_creator; -const device_type AVG_MHAVOC = &device_creator; -const device_type AVG_STARWARS = &device_creator; -const device_type AVG_QUANTUM = &device_creator; -const device_type AVG_BZONE = &device_creator; -const device_type AVG_TOMCAT = &device_creator; +const device_type DVG = device_creator; +const device_type AVG = device_creator; +const device_type AVG_TEMPEST = device_creator; +const device_type AVG_MHAVOC = device_creator; +const device_type AVG_STARWARS = device_creator; +const device_type AVG_QUANTUM = device_creator; +const device_type AVG_BZONE = device_creator; +const device_type AVG_TOMCAT = device_creator; diff --git a/src/mame/video/bbc.cpp b/src/mame/video/bbc.cpp index 3fccfef2460..f80bddeb6b2 100644 --- a/src/mame/video/bbc.cpp +++ b/src/mame/video/bbc.cpp @@ -20,6 +20,7 @@ #include "includes/bbc.h" #include "video/saa5050.h" #include "video/mc6845.h" +#include "screen.h" /************************************************************************ * C0 and C1 along with MA12 output from the 6845 drive 4 NAND gates in ICs 27,36 and 40 diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp index b4f51180c92..bb7b46f2844 100644 --- a/src/mame/video/bfm_adr2.cpp +++ b/src/mame/video/bfm_adr2.cpp @@ -93,10 +93,12 @@ E000-FFFF | R | D D D D D D D D | 8K ROM ***************************************************************************/ #include "emu.h" +#include "video/bfm_adr2.h" + #include "cpu/m6809/m6809.h" #include "machine/bfm_bd1.h" // vfd -#include "video/bfm_adr2.h" #include "rendlay.h" +#include "screen.h" #ifdef MAME_DEBUG #define VERBOSE 1 @@ -135,7 +137,7 @@ static GFXDECODE_START( adder2 ) GFXDECODE_ENTRY( ":gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END -const device_type BFM_ADDER2 = &device_creator; +const device_type BFM_ADDER2 = device_creator; bfm_adder2_device::bfm_adder2_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t(mconfig, BFM_ADDER2, "BFM ADDER2", tag, owner, clock, "bfm_adder2", __FILE__), diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp index 07879cdbb93..3077451f046 100644 --- a/src/mame/video/bfm_dm01.cpp +++ b/src/mame/video/bfm_dm01.cpp @@ -51,7 +51,7 @@ Standard dm01 memorymap #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type BF_DM01 = &device_creator; +const device_type BF_DM01 = device_creator; bfmdm01_device::bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/video/bfm_dm01.h b/src/mame/video/bfm_dm01.h index f23910552c3..47755cd2582 100644 --- a/src/mame/video/bfm_dm01.h +++ b/src/mame/video/bfm_dm01.h @@ -5,6 +5,8 @@ Bellfruit dotmatrix driver, (under heavy construction !!!) *************************************************************************************/ +#include "screen.h" + #ifndef BFM_DM01 #define BFM_DM01 diff --git a/src/mame/video/blmbycar.cpp b/src/mame/video/blmbycar.cpp index 83ee3efc677..9b10ee24163 100644 --- a/src/mame/video/blmbycar.cpp +++ b/src/mame/video/blmbycar.cpp @@ -32,6 +32,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: #include "emu.h" #include "includes/blmbycar.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/bloodbro.cpp b/src/mame/video/bloodbro.cpp index 7262975fb9d..5e9a680eda0 100644 --- a/src/mame/video/bloodbro.cpp +++ b/src/mame/video/bloodbro.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "includes/bloodbro.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/boogwing.cpp b/src/mame/video/boogwing.cpp index f969686845e..ce885ae8fb5 100644 --- a/src/mame/video/boogwing.cpp +++ b/src/mame/video/boogwing.cpp @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail, David Haywood #include "emu.h" #include "includes/boogwing.h" +#include "screen.h" void boogwing_state::video_start() diff --git a/src/mame/video/c45.cpp b/src/mame/video/c45.cpp index 09fdb02fe02..960c1fc23c0 100644 --- a/src/mame/video/c45.cpp +++ b/src/mame/video/c45.cpp @@ -45,7 +45,7 @@ //**************************************************************************** // device type definition -const device_type NAMCO_C45_ROAD = &device_creator; +const device_type NAMCO_C45_ROAD = device_creator; const gfx_layout namco_c45_road_device::tilelayout = diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp index 9d1de33d516..828e0b4f063 100644 --- a/src/mame/video/cgc7900.cpp +++ b/src/mame/video/cgc7900.cpp @@ -2,6 +2,7 @@ // copyright-holders:Curt Coder #include "emu.h" #include "includes/cgc7900.h" +#include "screen.h" /*************************************************************************** PARAMETERS diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp index dbf113cc3ee..8ddeb581583 100644 --- a/src/mame/video/cidelsa.cpp +++ b/src/mame/video/cidelsa.cpp @@ -1,10 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "cpu/cosmac/cosmac.h" -#include "sound/cdp1869.h" -#include "sound/ay8910.h" #include "includes/cidelsa.h" +#include "speaker.h" + /* Register Access */ diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp index a596fcdfeac..32da4703c94 100644 --- a/src/mame/video/comx35.cpp +++ b/src/mame/video/comx35.cpp @@ -1,12 +1,15 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "rendlay.h" #include "includes/comx35.h" + #include "cpu/cosmac/cosmac.h" #include "sound/cdp1869.h" #include "sound/wave.h" #include "video/mc6845.h" +#include "rendlay.h" +#include "screen.h" +#include "speaker.h" WRITE8_MEMBER( comx35_state::cdp1869_w ) { diff --git a/src/mame/video/crt.cpp b/src/mame/video/crt.cpp index 3ecbf3d0acb..a29fce66706 100644 --- a/src/mame/video/crt.cpp +++ b/src/mame/video/crt.cpp @@ -39,7 +39,7 @@ enum // device type definition -const device_type CRT = &device_creator; +const device_type CRT = device_creator; //************************************************************************** // LIVE DEVICE diff --git a/src/mame/video/dassault.cpp b/src/mame/video/dassault.cpp index 07f5e0bf2d2..c09ff6381f3 100644 --- a/src/mame/video/dassault.cpp +++ b/src/mame/video/dassault.cpp @@ -17,6 +17,7 @@ #include "emu.h" #include "includes/dassault.h" +#include "screen.h" /******************************************************************************/ diff --git a/src/mame/video/dcon.cpp b/src/mame/video/dcon.cpp index fa61a60e7d5..85bafa1be6f 100644 --- a/src/mame/video/dcon.cpp +++ b/src/mame/video/dcon.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/dcon.h" +#include "screen.h" /******************************************************************************/ diff --git a/src/mame/video/deadang.cpp b/src/mame/video/deadang.cpp index 6a7143e22d8..9511fc32179 100644 --- a/src/mame/video/deadang.cpp +++ b/src/mame/video/deadang.cpp @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail, David Haywood #include "emu.h" #include "includes/deadang.h" +#include "screen.h" /******************************************************************************/ diff --git a/src/mame/video/decbac06.cpp b/src/mame/video/decbac06.cpp index 8bb592e8daa..7f140cf2365 100644 --- a/src/mame/video/decbac06.cpp +++ b/src/mame/video/decbac06.cpp @@ -65,7 +65,7 @@ Priority word (Midres): #include "emu.h" #include "decbac06.h" -const device_type DECO_BAC06 = &device_creator; +const device_type DECO_BAC06 = device_creator; deco_bac06_device::deco_bac06_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECO_BAC06, "DECO BAC06 Tilemap", tag, owner, clock, "deco_bac06", __FILE__), diff --git a/src/mame/video/deckarn.cpp b/src/mame/video/deckarn.cpp index 53f6835d3a0..78f4f38f49b 100644 --- a/src/mame/video/deckarn.cpp +++ b/src/mame/video/deckarn.cpp @@ -12,7 +12,7 @@ void deco_karnovsprites_device::set_gfx_region(device_t &device, int region) dev.m_gfxregion = region; } -const device_type DECO_KARNOVSPRITES = &device_creator; +const device_type DECO_KARNOVSPRITES = device_creator; deco_karnovsprites_device::deco_karnovsprites_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECO_KARNOVSPRITES, "DECO Karnov Sprites", tag, owner, clock, "deco_karnovsprites", __FILE__) diff --git a/src/mame/video/decmxc06.cpp b/src/mame/video/decmxc06.cpp index fe997a7e399..46966a99a2e 100644 --- a/src/mame/video/decmxc06.cpp +++ b/src/mame/video/decmxc06.cpp @@ -39,6 +39,7 @@ todo: #include "emu.h" #include "decmxc06.h" +#include "screen.h" void deco_mxc06_device::set_gfx_region(device_t &device, int region) { @@ -47,7 +48,7 @@ void deco_mxc06_device::set_gfx_region(device_t &device, int region) } -const device_type DECO_MXC06 = &device_creator; +const device_type DECO_MXC06 = device_creator; deco_mxc06_device::deco_mxc06_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECO_MXC06, "DECO MXC06 Sprite", tag, owner, clock, "deco_mxc06", __FILE__) diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp index 8cd4f6c57ee..aa5e5cf99e0 100644 --- a/src/mame/video/deco16ic.cpp +++ b/src/mame/video/deco16ic.cpp @@ -174,7 +174,7 @@ Rowscroll style: #include "video/deco16ic.h" #include "render.h" -const device_type DECO16IC = &device_creator; +const device_type DECO16IC = device_creator; deco16ic_device::deco16ic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECO16IC, "DECO 55 / 56 / 74 / 141 IC", tag, owner, clock, "deco16ic", __FILE__), diff --git a/src/mame/video/deco_zoomspr.cpp b/src/mame/video/deco_zoomspr.cpp index e6401a994bc..1933b0797eb 100644 --- a/src/mame/video/deco_zoomspr.cpp +++ b/src/mame/video/deco_zoomspr.cpp @@ -13,7 +13,7 @@ #include "emu.h" #include "deco_zoomspr.h" -const device_type DECO_ZOOMSPR = &device_creator; +const device_type DECO_ZOOMSPR = device_creator; deco_zoomspr_device::deco_zoomspr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECO_ZOOMSPR, "DECO Zooming Sprites", tag, owner, clock, "deco_zoomspr", __FILE__) diff --git a/src/mame/video/decocomn.cpp b/src/mame/video/decocomn.cpp index 2911b589471..b9612e2ea4f 100644 --- a/src/mame/video/decocomn.cpp +++ b/src/mame/video/decocomn.cpp @@ -10,7 +10,7 @@ #include "video/decocomn.h" -const device_type DECOCOMN = &device_creator; +const device_type DECOCOMN = device_creator; decocomn_device::decocomn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECOCOMN, "DECO Common Video Functions", tag, owner, clock, "decocomn", __FILE__), diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp index d6c638a1203..810d9562208 100644 --- a/src/mame/video/decodmd1.cpp +++ b/src/mame/video/decodmd1.cpp @@ -10,8 +10,9 @@ #include "emu.h" #include "decodmd1.h" #include "rendlay.h" +#include "screen.h" -const device_type DECODMD1 = &device_creator; +const device_type DECODMD1 = device_creator; READ8_MEMBER( decodmd_type1_device::latch_r ) { diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp index 4000863acd7..d801afe3025 100644 --- a/src/mame/video/decodmd2.cpp +++ b/src/mame/video/decodmd2.cpp @@ -11,8 +11,9 @@ #include "emu.h" #include "decodmd2.h" #include "rendlay.h" +#include "screen.h" -const device_type DECODMD2 = &device_creator; +const device_type DECODMD2 = device_creator; WRITE8_MEMBER( decodmd_type2_device::bank_w ) { diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp index cc12153364a..a5702d4c97d 100644 --- a/src/mame/video/decodmd3.cpp +++ b/src/mame/video/decodmd3.cpp @@ -11,8 +11,9 @@ #include "emu.h" #include "decodmd3.h" #include "rendlay.h" +#include "screen.h" -const device_type DECODMD3 = &device_creator; +const device_type DECODMD3 = device_creator; WRITE8_MEMBER( decodmd_type3_device::data_w ) { diff --git a/src/mame/video/decospr.cpp b/src/mame/video/decospr.cpp index 48400724877..f98e5e61f9c 100644 --- a/src/mame/video/decospr.cpp +++ b/src/mame/video/decospr.cpp @@ -132,6 +132,7 @@ passing offs+2 which lacks the extra priority bit #include "emu.h" #include "decospr.h" +#include "screen.h" DECOSPR_COLOUR_CB_MEMBER(decospr_device::default_col_cb) { @@ -145,7 +146,7 @@ void decospr_device::set_gfx_region(device_t &device, int gfxregion) // printf("decospr_device::set_gfx_region()\n"); } -const device_type DECO_SPRITE = &device_creator; +const device_type DECO_SPRITE = device_creator; decospr_device::decospr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DECO_SPRITE, "DECO 52 Sprite", tag, owner, clock, "decospr", __FILE__), diff --git a/src/mame/video/deniam.cpp b/src/mame/video/deniam.cpp index 4cf9b6e9bee..76cad3e8f34 100644 --- a/src/mame/video/deniam.cpp +++ b/src/mame/video/deniam.cpp @@ -2,6 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" #include "includes/deniam.h" +#include "screen.h" void deniam_state::deniam_common_init( ) diff --git a/src/mame/video/docastle.cpp b/src/mame/video/docastle.cpp index 1e847d97564..b4e3b09e789 100644 --- a/src/mame/video/docastle.cpp +++ b/src/mame/video/docastle.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/docastle.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/dooyong.cpp b/src/mame/video/dooyong.cpp index 34c88ba3ff1..cd3999440d5 100644 --- a/src/mame/video/dooyong.cpp +++ b/src/mame/video/dooyong.cpp @@ -14,9 +14,9 @@ when the x scroll moves out of range (trying to decode the whole lot at once uses hundreds of megabytes of RAM). */ -device_type const DOOYONG_ROM_TILEMAP = &device_creator; -device_type const RSHARK_ROM_TILEMAP = &device_creator; -device_type const DOOYONG_RAM_TILEMAP = &device_creator; +device_type const DOOYONG_ROM_TILEMAP = device_creator; +device_type const RSHARK_ROM_TILEMAP = device_creator; +device_type const DOOYONG_RAM_TILEMAP = device_creator; dooyong_tilemap_device_base::dooyong_tilemap_device_base( diff --git a/src/mame/video/electron.cpp b/src/mame/video/electron.cpp index c0daea2699e..edd2081ef55 100644 --- a/src/mame/video/electron.cpp +++ b/src/mame/video/electron.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "includes/electron.h" +#include "screen.h" /* From the ElectrEm site: diff --git a/src/mame/video/esd16.cpp b/src/mame/video/esd16.cpp index 68fea4de83e..a89d23cd1cc 100644 --- a/src/mame/video/esd16.cpp +++ b/src/mame/video/esd16.cpp @@ -37,6 +37,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: #include "emu.h" #include "includes/esd16.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/excellent_spr.cpp b/src/mame/video/excellent_spr.cpp index 90f5bf4caf9..2b77f721cbd 100644 --- a/src/mame/video/excellent_spr.cpp +++ b/src/mame/video/excellent_spr.cpp @@ -17,9 +17,10 @@ #include "emu.h" #include "excellent_spr.h" +#include "screen.h" -const device_type EXCELLENT_SPRITE = &device_creator; +const device_type EXCELLENT_SPRITE = device_creator; excellent_spr_device::excellent_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, EXCELLENT_SPRITE, "Excellent 8-bit Sprite", tag, owner, clock, "excellent_spr", __FILE__), diff --git a/src/mame/video/f1gp.cpp b/src/mame/video/f1gp.cpp index 787579f3514..a28a6f12874 100644 --- a/src/mame/video/f1gp.cpp +++ b/src/mame/video/f1gp.cpp @@ -1,9 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" - #include "includes/f1gp.h" +#include "screen.h" + #define TOTAL_CHARS 0x800 diff --git a/src/mame/video/finalizr.cpp b/src/mame/video/finalizr.cpp index 716c03831e3..e133389ffb3 100644 --- a/src/mame/video/finalizr.cpp +++ b/src/mame/video/finalizr.cpp @@ -9,8 +9,9 @@ ***************************************************************************/ #include "emu.h" -#include "video/resnet.h" #include "includes/finalizr.h" +#include "video/resnet.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/flkatck.cpp b/src/mame/video/flkatck.cpp index e2ca207badf..4e1569643dc 100644 --- a/src/mame/video/flkatck.cpp +++ b/src/mame/video/flkatck.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/flkatck.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/fm7.cpp b/src/mame/video/fm7.cpp index 38c880201f3..1fb805781ce 100644 --- a/src/mame/video/fm7.cpp +++ b/src/mame/video/fm7.cpp @@ -7,9 +7,11 @@ */ #include "emu.h" -#include "cpu/m6809/m6809.h" #include "includes/fm7.h" +#include "cpu/m6809/m6809.h" +#include "screen.h" + /* * Main CPU: Sub-CPU interface (port 0xfd05) diff --git a/src/mame/video/fmtowns.cpp b/src/mame/video/fmtowns.cpp index 68a7fecfb80..ae0cb1b98a5 100644 --- a/src/mame/video/fmtowns.cpp +++ b/src/mame/video/fmtowns.cpp @@ -87,9 +87,12 @@ */ #include "emu.h" +#include "includes/fmtowns.h" + #include "machine/pic8259.h" #include "machine/ram.h" -#include "includes/fmtowns.h" +#include "screen.h" + //#define CRTC_REG_DISP 1 //#define SPR_DEBUG 1 diff --git a/src/mame/video/fuukifg.cpp b/src/mame/video/fuukifg.cpp index 9f6b1a0f956..1e43d668911 100644 --- a/src/mame/video/fuukifg.cpp +++ b/src/mame/video/fuukifg.cpp @@ -5,8 +5,9 @@ #include "emu.h" #include "fuukifg.h" +#include "screen.h" -const device_type FUUKI_VIDEO = &device_creator; +const device_type FUUKI_VIDEO = device_creator; fuukivid_device::fuukivid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, FUUKI_VIDEO, "Fuuki Video", tag, owner, clock, "fuukivid", __FILE__) diff --git a/src/mame/video/gaelco.cpp b/src/mame/video/gaelco.cpp index 7bbee896166..6e1b93899e7 100644 --- a/src/mame/video/gaelco.cpp +++ b/src/mame/video/gaelco.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/gaelco.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/gaelco2.cpp b/src/mame/video/gaelco2.cpp index 15b54d64f53..5632581de32 100644 --- a/src/mame/video/gaelco2.cpp +++ b/src/mame/video/gaelco2.cpp @@ -80,6 +80,7 @@ Multi monitor notes: #include "emu.h" #include "includes/gaelco2.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/galaxy.cpp b/src/mame/video/galaxy.cpp index f4eeef8a916..e242e301cd1 100644 --- a/src/mame/video/galaxy.cpp +++ b/src/mame/video/galaxy.cpp @@ -12,7 +12,9 @@ #include "emu.h" #include "includes/galaxy.h" + #include "cpu/z80/z80.h" +#include "screen.h" TIMER_CALLBACK_MEMBER(galaxy_state::gal_video) diff --git a/src/mame/video/galpani2.cpp b/src/mame/video/galpani2.cpp index a7ebb4e6705..8ba47f672fa 100644 --- a/src/mame/video/galpani2.cpp +++ b/src/mame/video/galpani2.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "includes/galpani2.h" +#include "screen.h" /* 304000:0040 0000 0100 0000-0000 0000 0000 0000 (Sprites regs) diff --git a/src/mame/video/gamecom.cpp b/src/mame/video/gamecom.cpp index 4aa8982b6de..3d9bad32397 100644 --- a/src/mame/video/gamecom.cpp +++ b/src/mame/video/gamecom.cpp @@ -4,6 +4,9 @@ #include "emu.h" #include "includes/gamecom.h" +#include "screen.h" + + #define Y_PIXELS 200 diff --git a/src/mame/video/gcpinbal.cpp b/src/mame/video/gcpinbal.cpp index 6fc85537f38..2d358eaec07 100644 --- a/src/mame/video/gcpinbal.cpp +++ b/src/mame/video/gcpinbal.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves, R. Belmont #include "emu.h" #include "includes/gcpinbal.h" +#include "screen.h" /*******************************************************************/ diff --git a/src/mame/video/gic.cpp b/src/mame/video/gic.cpp index 21a45b4f76c..03d9f27b4b4 100644 --- a/src/mame/video/gic.cpp +++ b/src/mame/video/gic.cpp @@ -62,9 +62,10 @@ #include "emu.h" #include "gic.h" +#include "screen.h" // device type definition -const device_type GIC = &device_creator; +const device_type GIC = device_creator; //Font data taken from Paul Robson's simulator diff --git a/src/mame/video/gime.cpp b/src/mame/video/gime.cpp index f9c4dd7c258..a4ccfdd9419 100644 --- a/src/mame/video/gime.cpp +++ b/src/mame/video/gime.cpp @@ -2017,8 +2017,8 @@ const uint8_t gime_base_device::hires_font[128][12] = // VARIATIONS //************************************************************************** -const device_type GIME_NTSC = &device_creator; -const device_type GIME_PAL = &device_creator; +const device_type GIME_NTSC = device_creator; +const device_type GIME_PAL = device_creator; diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp index 823be4d9a6c..3469e84b95a 100644 --- a/src/mame/video/gp9001.cpp +++ b/src/mame/video/gp9001.cpp @@ -125,6 +125,7 @@ Pipi & Bibis | Fix Eight | V-Five | Snow Bros. 2 | #include "emu.h" #include "gp9001.h" +#include "screen.h" /* Single VDP mixing priority note: @@ -211,7 +212,7 @@ GFXDECODE_MEMBER( gp9001vdp_device::gfxinfo ) GFXDECODE_END -const device_type GP9001_VDP = &device_creator; +const device_type GP9001_VDP = device_creator; gp9001vdp_device::gp9001vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, GP9001_VDP, "GP9001 VDP", tag, owner, clock, "gp9001vdp", __FILE__), diff --git a/src/mame/video/groundfx.cpp b/src/mame/video/groundfx.cpp index d6444f792bc..ace0e91afd5 100644 --- a/src/mame/video/groundfx.cpp +++ b/src/mame/video/groundfx.cpp @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail, David Graves #include "emu.h" #include "includes/groundfx.h" +#include "screen.h" /******************************************************************/ diff --git a/src/mame/video/gtia.cpp b/src/mame/video/gtia.cpp index 6b7162da6a7..3010dad1121 100644 --- a/src/mame/video/gtia.cpp +++ b/src/mame/video/gtia.cpp @@ -12,6 +12,7 @@ #include "emu.h" #include "video/gtia.h" +#include "screen.h" #define GTIA_P0 0x01 #define GTIA_P1 0x02 @@ -111,7 +112,7 @@ // devices -const device_type ATARI_GTIA = &device_creator; +const device_type ATARI_GTIA = device_creator; //------------------------------------------------- // upd7220_device - constructor diff --git a/src/mame/video/gunbustr.cpp b/src/mame/video/gunbustr.cpp index b285af5dc3b..0ca835f72df 100644 --- a/src/mame/video/gunbustr.cpp +++ b/src/mame/video/gunbustr.cpp @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail, David Graves #include "emu.h" #include "includes/gunbustr.h" +#include "screen.h" /************************************************************/ diff --git a/src/mame/video/hcastle.cpp b/src/mame/video/hcastle.cpp index 998334b32e6..b760ee26bea 100644 --- a/src/mame/video/hcastle.cpp +++ b/src/mame/video/hcastle.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/hcastle.h" +#include "screen.h" PALETTE_INIT_MEMBER(hcastle_state, hcastle) diff --git a/src/mame/video/hec2hrp.cpp b/src/mame/video/hec2hrp.cpp index 89ffe24ad1e..fcc874726e1 100644 --- a/src/mame/video/hec2hrp.cpp +++ b/src/mame/video/hec2hrp.cpp @@ -34,9 +34,10 @@ */ #include "emu.h" - #include "includes/hec2hrp.h" +#include "screen.h" + void hec2hrp_state::Init_Hector_Palette() { diff --git a/src/mame/video/homedata.cpp b/src/mame/video/homedata.cpp index ab2e6ca1dba..f3a20512a58 100644 --- a/src/mame/video/homedata.cpp +++ b/src/mame/video/homedata.cpp @@ -1,9 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, Nicola Salmoria #include "emu.h" -#include "cpu/m6809/m6809.h" #include "includes/homedata.h" +#include "cpu/m6809/m6809.h" +#include "screen.h" + + /* video control registers: 0 xxxxxxxx unknown diff --git a/src/mame/video/igs017_igs031.cpp b/src/mame/video/igs017_igs031.cpp index 617c3674ee8..9c6e46c010d 100644 --- a/src/mame/video/igs017_igs031.cpp +++ b/src/mame/video/igs017_igs031.cpp @@ -73,7 +73,7 @@ GFXDECODE_MEMBER( igs017_igs031_device::gfxinfo ) GFXDECODE_END -const device_type IGS017_IGS031 = &device_creator; +const device_type IGS017_IGS031 = device_creator; igs017_igs031_device::igs017_igs031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, IGS017_IGS031, "IGS017_IGS031", tag, owner, clock, "igs017_igs031", __FILE__), diff --git a/src/mame/video/inufuku.cpp b/src/mame/video/inufuku.cpp index ce28ba7f444..c22177f52dc 100644 --- a/src/mame/video/inufuku.cpp +++ b/src/mame/video/inufuku.cpp @@ -14,8 +14,8 @@ ******************************************************************************/ #include "emu.h" -#include "vsystem_spr.h" #include "includes/inufuku.h" +#include "screen.h" /****************************************************************************** diff --git a/src/mame/video/jalblend.cpp b/src/mame/video/jalblend.cpp index 1065ca57ef2..3f0faeab5f6 100644 --- a/src/mame/video/jalblend.cpp +++ b/src/mame/video/jalblend.cpp @@ -22,7 +22,7 @@ -const device_type JALECO_BLEND = &device_creator; +const device_type JALECO_BLEND = device_creator; jaleco_blend_device::jaleco_blend_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, JALECO_BLEND, "Jaleco Blending Device", tag, owner, clock, "jaleco_blend", __FILE__), diff --git a/src/mame/video/k001005.cpp b/src/mame/video/k001005.cpp index cdaf616fd3c..f677a03d15d 100644 --- a/src/mame/video/k001005.cpp +++ b/src/mame/video/k001005.cpp @@ -1181,7 +1181,7 @@ void k001005_renderer::draw(bitmap_rgb32 &bitmap, const rectangle &cliprect) -const device_type K001005 = &device_creator; +const device_type K001005 = device_creator; k001005_device::k001005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K001005, "K001005 Polygon Renderer", tag, owner, clock, "k001005", __FILE__), diff --git a/src/mame/video/k001006.cpp b/src/mame/video/k001006.cpp index 64bb613896a..9d4b1f62516 100644 --- a/src/mame/video/k001006.cpp +++ b/src/mame/video/k001006.cpp @@ -12,7 +12,7 @@ /* */ /***************************************************************************/ -const device_type K001006 = &device_creator; +const device_type K001006 = device_creator; k001006_device::k001006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K001006, "K001006 Texel Unit", tag, owner, clock, "k001006", __FILE__), diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp index 8dca813ad91..6735d79dad1 100644 --- a/src/mame/video/k001604.cpp +++ b/src/mame/video/k001604.cpp @@ -15,7 +15,7 @@ #define K001604_NUM_TILES_LAYER0 16384 #define K001604_NUM_TILES_LAYER1 4096 -const device_type K001604 = &device_creator; +const device_type K001604 = device_creator; k001604_device::k001604_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K001604, "K001604 2D tilemaps + 2x ROZ", tag, owner, clock, "k001604", __FILE__), diff --git a/src/mame/video/k007121.cpp b/src/mame/video/k007121.cpp index bf3a5316531..312c2d0b4b1 100644 --- a/src/mame/video/k007121.cpp +++ b/src/mame/video/k007121.cpp @@ -119,7 +119,7 @@ control registers #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type K007121 = &device_creator; +const device_type K007121 = device_creator; k007121_device::k007121_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K007121, "K007121 Sprite/Tilemap Controller", tag, owner, clock, "k007121", __FILE__) diff --git a/src/mame/video/k007342.cpp b/src/mame/video/k007342.cpp index 184cb93c8f2..65fa0dc9ae1 100644 --- a/src/mame/video/k007342.cpp +++ b/src/mame/video/k007342.cpp @@ -35,7 +35,7 @@ control registers #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type K007342 = &device_creator; +const device_type K007342 = device_creator; k007342_device::k007342_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K007342, "K007342 Video Controller", tag, owner, clock, "k007342", __FILE__), diff --git a/src/mame/video/k007420.cpp b/src/mame/video/k007420.cpp index 701059c8e7b..30c735f7248 100644 --- a/src/mame/video/k007420.cpp +++ b/src/mame/video/k007420.cpp @@ -16,7 +16,7 @@ and a variable amount of ROM. Nothing is known about its external interface. #define K007420_SPRITERAM_SIZE 0x200 -const device_type K007420 = &device_creator; +const device_type K007420 = device_creator; k007420_device::k007420_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K007420, "K007420 Sprite Generator", tag, owner, clock, "k007420", __FILE__) diff --git a/src/mame/video/k037122.cpp b/src/mame/video/k037122.cpp index 6b11efcc9e8..5e25e19a897 100644 --- a/src/mame/video/k037122.cpp +++ b/src/mame/video/k037122.cpp @@ -7,13 +7,14 @@ Konami 037122 #include "emu.h" #include "k037122.h" #include "konami_helper.h" +#include "screen.h" #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) #define K037122_NUM_TILES 16384 -const device_type K037122 = &device_creator; +const device_type K037122 = device_creator; k037122_device::k037122_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K037122, "K037122 2D Tilemap", tag, owner, clock, "k037122", __FILE__), diff --git a/src/mame/video/k051316.cpp b/src/mame/video/k051316.cpp index f24bec821f9..22b78747023 100644 --- a/src/mame/video/k051316.cpp +++ b/src/mame/video/k051316.cpp @@ -43,7 +43,7 @@ control registers #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type K051316 = &device_creator; +const device_type K051316 = device_creator; const gfx_layout k051316_device::charlayout4 = diff --git a/src/mame/video/k051733.cpp b/src/mame/video/k051733.cpp index ab1a47a67be..6bd7f99d412 100644 --- a/src/mame/video/k051733.cpp +++ b/src/mame/video/k051733.cpp @@ -62,7 +62,7 @@ reads from 0x0006, and only uses bit 1. #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type K051733 = &device_creator; +const device_type K051733 = device_creator; k051733_device::k051733_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K051733, "K051733 Protection", tag, owner, clock, "k051733", __FILE__), diff --git a/src/mame/video/k051960.cpp b/src/mame/video/k051960.cpp index 4038bdf59b2..b0fb6d5893e 100644 --- a/src/mame/video/k051960.cpp +++ b/src/mame/video/k051960.cpp @@ -63,7 +63,7 @@ memory map: #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type K051960 = &device_creator; +const device_type K051960 = device_creator; const gfx_layout k051960_device::spritelayout = { diff --git a/src/mame/video/k051960.h b/src/mame/video/k051960.h index 79e5fb958f6..caab61d3975 100644 --- a/src/mame/video/k051960.h +++ b/src/mame/video/k051960.h @@ -1,8 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont +#ifndef MAME_VIDEO_K051960_H +#define MAME_VIDEO_K051960_H + #pragma once -#ifndef __K051960_H__ -#define __K051960_H__ + +#include "screen.h" enum { @@ -110,4 +113,4 @@ private: extern const device_type K051960; -#endif +#endif // MAME_VIDEO_K051960_H diff --git a/src/mame/video/k052109.cpp b/src/mame/video/k052109.cpp index a5aebd44abf..3dbab67b8c7 100644 --- a/src/mame/video/k052109.cpp +++ b/src/mame/video/k052109.cpp @@ -126,7 +126,7 @@ to through the chip. #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type K052109 = &device_creator; +const device_type K052109 = device_creator; const gfx_layout k052109_device::charlayout = { diff --git a/src/mame/video/k052109.h b/src/mame/video/k052109.h index a2fed40e6cc..e31adc250a0 100644 --- a/src/mame/video/k052109.h +++ b/src/mame/video/k052109.h @@ -1,8 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont +#ifndef MAME_VIDEO_K052109_H +#define MAME_VIDEO_K052109_H #pragma once -#ifndef __K052109_H__ -#define __K052109_H__ + +#include "screen.h" typedef device_delegate k052109_cb_delegate; #define K052109_CB_MEMBER(_name) void _name(int layer, int bank, int *code, int *color, int *flags, int *priority) @@ -116,4 +118,4 @@ private: extern const device_type K052109; -#endif +#endif // MAME_VIDEO_K052109_H diff --git a/src/mame/video/k053244_k053245.cpp b/src/mame/video/k053244_k053245.cpp index af0467c584c..186942fa794 100644 --- a/src/mame/video/k053244_k053245.cpp +++ b/src/mame/video/k053244_k053245.cpp @@ -41,7 +41,7 @@ main ram and the buffer. DEVICE INTERFACE *****************************************************************************/ -const device_type K053244 = &device_creator; +const device_type K053244 = device_creator; const gfx_layout k05324x_device::spritelayout = { diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp index 30b0a5cf41a..bfb4885de65 100644 --- a/src/mame/video/k053246_k053247_k055673.cpp +++ b/src/mame/video/k053246_k053247_k055673.cpp @@ -900,7 +900,7 @@ void k053247_device::zdrawgfxzoom32GP( -const device_type K055673 = &device_creator; +const device_type K055673 = device_creator; k055673_device::k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : k053247_device(mconfig, K055673, "K053246 & K055673 Sprite Generator", tag, owner, clock, "k055673", __FILE__) @@ -1035,7 +1035,7 @@ void k055673_device::device_start() -const device_type K053246 = &device_creator; +const device_type K053246 = device_creator; k053247_device::k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K053246, "K053246 & K053247 Sprite Generator", tag, owner, clock, "k053247", __FILE__), diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h index ee09e8bbac6..339a6ebaf6c 100644 --- a/src/mame/video/k053246_k053247_k055673.h +++ b/src/mame/video/k053246_k053247_k055673.h @@ -3,10 +3,12 @@ /* */ /* todo: remove code from header, linker starts throwing silly messages when I try due to the templates.. make sense of them */ +#ifndef MAME_INCLUDES_K053246_K053247_K055673_H +#define MAME_INCLUDES_K053246_K053247_K055673_H #pragma once -#ifndef __K05324x_H__ -#define __K05324x_H__ + +#include "screen.h" #define NORMAL_PLANE_ORDER 4 @@ -505,4 +507,4 @@ extern const device_type K055673; #define MCFG_K055673_PALETTE MCFG_GFX_PALETTE -#endif +#endif // MAME_INCLUDES_K053246_K053247_K055673_H diff --git a/src/mame/video/k053250.cpp b/src/mame/video/k053250.cpp index 6c3f9281cc8..09ad0464add 100644 --- a/src/mame/video/k053250.cpp +++ b/src/mame/video/k053250.cpp @@ -2,8 +2,10 @@ // copyright-holders:Olivier Galibert #include "emu.h" #include "k053250.h" +#include "screen.h" -const device_type K053250 = &device_creator; + +const device_type K053250 = device_creator; k053250_device::k053250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K053250, "K053250 LVC", tag, owner, clock, "k053250", __FILE__), diff --git a/src/mame/video/k053251.cpp b/src/mame/video/k053251.cpp index 1323bbd4d87..876a1497666 100644 --- a/src/mame/video/k053251.cpp +++ b/src/mame/video/k053251.cpp @@ -124,7 +124,7 @@ actually used, since the priority is taken from the external ports. #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type K053251 = &device_creator; +const device_type K053251 = device_creator; k053251_device::k053251_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K053251, "K053251 Priority Encoder", tag, owner, clock, "k053251", __FILE__), diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp index e902676d756..54269a89a32 100644 --- a/src/mame/video/k053936.cpp +++ b/src/mame/video/k053936.cpp @@ -227,7 +227,7 @@ void K053936_set_offset(int chip, int xoffs, int yoffs) /* */ /***************************************************************************/ -const device_type K053936 = &device_creator; +const device_type K053936 = device_creator; k053936_device::k053936_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K053936, "K053936 Video Controller", tag, owner, clock, "k053936", __FILE__), diff --git a/src/mame/video/k054000.cpp b/src/mame/video/k054000.cpp index 0deac237c8d..f34f8c84155 100644 --- a/src/mame/video/k054000.cpp +++ b/src/mame/video/k054000.cpp @@ -52,7 +52,7 @@ Memory map: /* */ /***************************************************************************/ -const device_type K054000 = &device_creator; +const device_type K054000 = device_creator; k054000_device::k054000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K054000, "K054000 Protection", tag, owner, clock, "k054000", __FILE__) diff --git a/src/mame/video/k054156_k054157_k056832.cpp b/src/mame/video/k054156_k054157_k056832.cpp index 8bb50544cba..c908c4ce72d 100644 --- a/src/mame/video/k054156_k054157_k056832.cpp +++ b/src/mame/video/k054156_k054157_k056832.cpp @@ -179,7 +179,7 @@ ones. The other 7 words are ignored. Global scrollx is ignored. -const device_type K056832 = &device_creator; +const device_type K056832 = device_creator; k056832_device::k056832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K056832, "K056832 Tilemap Generator", tag, owner, clock, "k056832", __FILE__), diff --git a/src/mame/video/k054338.cpp b/src/mame/video/k054338.cpp index 1d02d3f22fc..1ca97eea33b 100644 --- a/src/mame/video/k054338.cpp +++ b/src/mame/video/k054338.cpp @@ -18,7 +18,7 @@ // because the implementation is video dependant, this is just a // register-handling shell. -const device_type K054338 = &device_creator; +const device_type K054338 = device_creator; k054338_device::k054338_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K054338, "K054338 Mixer", tag, owner, clock, "k054338", __FILE__), diff --git a/src/mame/video/k055555.cpp b/src/mame/video/k055555.cpp index f820071cd66..5be5657e5ce 100644 --- a/src/mame/video/k055555.cpp +++ b/src/mame/video/k055555.cpp @@ -140,7 +140,7 @@ int k055555_device::K055555_get_palette_index(int idx) -const device_type K055555 = &device_creator; +const device_type K055555 = device_creator; k055555_device::k055555_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K055555, "K055555 Priority Encoder", tag, owner, clock, "k055555", __FILE__) diff --git a/src/mame/video/k057714.cpp b/src/mame/video/k057714.cpp index 40de5bc9551..ddbad471cfe 100644 --- a/src/mame/video/k057714.cpp +++ b/src/mame/video/k057714.cpp @@ -5,13 +5,14 @@ #include "emu.h" #include "k057714.h" +#include "screen.h" #define DUMP_VRAM 0 #define PRINT_GCU 0 -const device_type K057714 = &device_creator; +const device_type K057714 = device_creator; k057714_device::k057714_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K057714, "K057714 GCU", tag, owner, clock, "k057714", __FILE__), diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp index edc06e120ee..402345f1060 100644 --- a/src/mame/video/k1ge.cpp +++ b/src/mame/video/k1ge.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "k1ge.h" +#include "screen.h" PALETTE_INIT_MEMBER(k1ge_device, k1ge) @@ -861,7 +862,7 @@ void k1ge_device::device_reset() } -const device_type K1GE = &device_creator; +const device_type K1GE = device_creator; k1ge_device::k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K1GE, "K1GE Monochrome Graphics + LCD", tag, owner, clock, "k1ge", __FILE__) @@ -895,7 +896,7 @@ machine_config_constructor k1ge_device::device_mconfig_additions() const } -const device_type K2GE = &device_creator; +const device_type K2GE = device_creator; k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : k1ge_device(mconfig, K2GE, "K2GE Color Graphics + LCD", tag, owner, clock, "k2ge", __FILE__) diff --git a/src/mame/video/kan_pand.cpp b/src/mame/video/kan_pand.cpp index 49aa1e16595..c8639ebfc57 100644 --- a/src/mame/video/kan_pand.cpp +++ b/src/mame/video/kan_pand.cpp @@ -51,8 +51,9 @@ #include "emu.h" #include "video/kan_pand.h" +#include "screen.h" -const device_type KANEKO_PANDORA = &device_creator; +const device_type KANEKO_PANDORA = device_creator; kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KANEKO_PANDORA, "Kaneko PANDORA GFX", tag, owner, clock, "kaneko_pandora", __FILE__) diff --git a/src/mame/video/kaneko16.cpp b/src/mame/video/kaneko16.cpp index c2322468fc3..e929975b070 100644 --- a/src/mame/video/kaneko16.cpp +++ b/src/mame/video/kaneko16.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/kaneko16.h" +#include "screen.h" WRITE16_MEMBER(kaneko16_state::kaneko16_display_enable) diff --git a/src/mame/video/kaneko_grap2.cpp b/src/mame/video/kaneko_grap2.cpp index e0ec47f9415..bcc09283668 100644 --- a/src/mame/video/kaneko_grap2.cpp +++ b/src/mame/video/kaneko_grap2.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "kaneko_grap2.h" -const device_type KANEKO_GRAP2 = &device_creator; +const device_type KANEKO_GRAP2 = device_creator; kaneko_grap2_device::kaneko_grap2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KANEKO_GRAP2, "Kaneko GRAP2", tag, owner, clock, "kaneko_grap2", __FILE__) diff --git a/src/mame/video/kaneko_spr.cpp b/src/mame/video/kaneko_spr.cpp index 501b6dfc7c9..67021ac58a7 100644 --- a/src/mame/video/kaneko_spr.cpp +++ b/src/mame/video/kaneko_spr.cpp @@ -26,10 +26,11 @@ #include "emu.h" #include "kaneko_spr.h" +#include "screen.h" -//const device_type KANEKO16_SPRITE = &device_creator; // we have pure virtual functions -const device_type KANEKO_VU002_SPRITE = &device_creator; -const device_type KANEKO_KC002_SPRITE = &device_creator; +//const device_type KANEKO16_SPRITE = device_creator; // we have pure virtual functions +const device_type KANEKO_VU002_SPRITE = device_creator; +const device_type KANEKO_KC002_SPRITE = device_creator; kaneko16_sprite_device::kaneko16_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, device_type type) : device_t(mconfig, type, "Kaneko 16-bit Sprites", tag, owner, clock, "kaneko16_sprite", __FILE__) diff --git a/src/mame/video/kaneko_tmap.cpp b/src/mame/video/kaneko_tmap.cpp index 6f5f648a178..77e1046d49a 100644 --- a/src/mame/video/kaneko_tmap.cpp +++ b/src/mame/video/kaneko_tmap.cpp @@ -94,7 +94,7 @@ There are more! #include "emu.h" #include "kaneko_tmap.h" -const device_type KANEKO_TMAP = &device_creator; +const device_type KANEKO_TMAP = device_creator; kaneko_view2_tilemap_device::kaneko_view2_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, KANEKO_TMAP, "Kaneko VIEW2 Tilemaps", tag, owner, clock, "kaneko_view2_tilemap", __FILE__) diff --git a/src/mame/video/kaypro.cpp b/src/mame/video/kaypro.cpp index 0c2e3c6e8d3..5ed14cf2875 100644 --- a/src/mame/video/kaypro.cpp +++ b/src/mame/video/kaypro.cpp @@ -3,6 +3,7 @@ #include "emu.h" #include "includes/kaypro.h" +#include "screen.h" diff --git a/src/mame/video/kc.cpp b/src/mame/video/kc.cpp index 192986cbfab..04aad5206b8 100644 --- a/src/mame/video/kc.cpp +++ b/src/mame/video/kc.cpp @@ -11,6 +11,9 @@ #include "emu.h" #include "includes/kc.h" +#include "screen.h" + + // 3 bit colour value. bit 2->green, bit 1->red, bit 0->blue static const uint8_t kc85_palette[KC85_PALETTE_SIZE * 3] = { diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp index 0a5d45da297..cddcd55380e 100644 --- a/src/mame/video/kyocera.cpp +++ b/src/mame/video/kyocera.cpp @@ -2,7 +2,10 @@ // copyright-holders:Curt Coder #include "emu.h" #include "includes/kyocera.h" + #include "rendlay.h" +#include "screen.h" + PALETTE_INIT_MEMBER(kc85_state,kc85) { diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp index ff2fa6b8729..ec03b0865f2 100644 --- a/src/mame/video/legionna.cpp +++ b/src/mame/video/legionna.cpp @@ -20,6 +20,7 @@ #include "emu.h" #include "includes/legionna.h" +#include "screen.h" /******************************************************************************/ diff --git a/src/mame/video/lethal.cpp b/src/mame/video/lethal.cpp index be619ede79d..f04361d4e4c 100644 --- a/src/mame/video/lethal.cpp +++ b/src/mame/video/lethal.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "includes/lethal.h" +#include "screen.h" + K05324X_CB_MEMBER(lethal_state::sprite_callback) { diff --git a/src/mame/video/lethalj.cpp b/src/mame/video/lethalj.cpp index f6242e519d2..c23f2e5f987 100644 --- a/src/mame/video/lethalj.cpp +++ b/src/mame/video/lethalj.cpp @@ -7,7 +7,6 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/tms34010/tms34010.h" #include "includes/lethalj.h" diff --git a/src/mame/video/lkage.cpp b/src/mame/video/lkage.cpp index fc27bf1b92c..4a8824e5f9f 100644 --- a/src/mame/video/lkage.cpp +++ b/src/mame/video/lkage.cpp @@ -41,6 +41,7 @@ #include "emu.h" #include "includes/lkage.h" +#include "screen.h" WRITE8_MEMBER(lkage_state::lkage_videoram_w) diff --git a/src/mame/video/m90.cpp b/src/mame/video/m90.cpp index 12d4f2b2d8a..3fbe1c0dc24 100644 --- a/src/mame/video/m90.cpp +++ b/src/mame/video/m90.cpp @@ -30,6 +30,7 @@ #include "emu.h" #include "includes/m90.h" +#include "screen.h" inline void m90_state::get_tile_info(tile_data &tileinfo,int tile_index,int layer,int page_mask) diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp index e189cb90085..f6edc99d19c 100644 --- a/src/mame/video/madalien.cpp +++ b/src/mame/video/madalien.cpp @@ -9,8 +9,9 @@ ***************************************************************************/ #include "emu.h" -#include "video/mc6845.h" #include "includes/madalien.h" +#include "video/mc6845.h" +#include "screen.h" #define PIXEL_CLOCK (MADALIEN_MAIN_CLOCK / 2) diff --git a/src/mame/video/maria.cpp b/src/mame/video/maria.cpp index 11a3a89b68a..d76cced296a 100644 --- a/src/mame/video/maria.cpp +++ b/src/mame/video/maria.cpp @@ -48,13 +48,14 @@ #include "emu.h" #include "maria.h" +#include "screen.h" #define TRIGGER_HSYNC 64717 #define READ_MEM(x) space.read_byte(x) -const device_type ATARI_MARIA = &device_creator; +const device_type ATARI_MARIA = device_creator; diff --git a/src/mame/video/mb60553.cpp b/src/mame/video/mb60553.cpp index b5693e52ad6..9f34417a83c 100644 --- a/src/mame/video/mb60553.cpp +++ b/src/mame/video/mb60553.cpp @@ -10,9 +10,10 @@ #include "emu.h" #include "mb60553.h" +#include "screen.h" -const device_type MB60553 = &device_creator; +const device_type MB60553 = device_creator; mb60553_zooming_tilemap_device::mb60553_zooming_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MB60553, "MB60553 Zooming Tilemap", tag, owner, clock, "mb60553", __FILE__), diff --git a/src/mame/video/mcatadv.cpp b/src/mame/video/mcatadv.cpp index 7c7ca0cfd90..56149fa1b20 100644 --- a/src/mame/video/mcatadv.cpp +++ b/src/mame/video/mcatadv.cpp @@ -12,6 +12,7 @@ ToDo: Fix Sprites & Rowscroll/Select for Cocktail #include "emu.h" #include "includes/mcatadv.h" +#include "screen.h" TILE_GET_INFO_MEMBER(mcatadv_state::get_mcatadv_tile_info1) { diff --git a/src/mame/video/mcd212.cpp b/src/mame/video/mcd212.cpp index 3c000775fbb..a87dc288561 100644 --- a/src/mame/video/mcd212.cpp +++ b/src/mame/video/mcd212.cpp @@ -22,12 +22,15 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "cpu/m68000/m68000.h" #include "video/mcd212.h" #include "includes/cdi.h" +#include "cpu/m68000/m68000.h" +#include "screen.h" + + // device type definition -const device_type MACHINE_MCD212 = &device_creator; +const device_type MACHINE_MCD212 = device_creator; #if ENABLE_VERBOSE_LOG static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...) diff --git a/src/mame/video/mcr.cpp b/src/mame/video/mcr.cpp index 320ecbf2fed..0164e188620 100644 --- a/src/mame/video/mcr.cpp +++ b/src/mame/video/mcr.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/mcr.h" +#include "screen.h" int8_t mcr12_sprite_xoffs; diff --git a/src/mame/video/midyunit.cpp b/src/mame/video/midyunit.cpp index 57266ea88f7..62e954bcb6c 100644 --- a/src/mame/video/midyunit.cpp +++ b/src/mame/video/midyunit.cpp @@ -8,8 +8,8 @@ **************************************************************************/ #include "emu.h" -#include "cpu/tms34010/tms34010.h" #include "includes/midyunit.h" +#include "screen.h" /* compile-time options */ diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp index bf3f318fe7c..d32320a69ff 100644 --- a/src/mame/video/mikromik.cpp +++ b/src/mame/video/mikromik.cpp @@ -2,6 +2,7 @@ // copyright-holders:Curt Coder #include "emu.h" #include "includes/mikromik.h" +#include "screen.h" #define HORIZONTAL_CHARACTER_PIXELS 10 diff --git a/src/mame/video/ms1_tmap.cpp b/src/mame/video/ms1_tmap.cpp index 4b4471d050b..baf05535713 100644 --- a/src/mame/video/ms1_tmap.cpp +++ b/src/mame/video/ms1_tmap.cpp @@ -36,7 +36,7 @@ static constexpr int TILES_PER_PAGE = TILES_PER_PAGE_X * TILES_PER_PAGE_Y; */ -const device_type MEGASYS1_TILEMAP = &device_creator; +const device_type MEGASYS1_TILEMAP = device_creator; megasys1_tilemap_device::megasys1_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, MEGASYS1_TILEMAP, "Mega System 1 Tilemap", tag, owner, clock, "ms1_tmap", __FILE__), diff --git a/src/mame/video/namco_c116.cpp b/src/mame/video/namco_c116.cpp index b2c74a459d5..c62831ba901 100644 --- a/src/mame/video/namco_c116.cpp +++ b/src/mame/video/namco_c116.cpp @@ -68,7 +68,7 @@ i960 CPU, needs to write its clip and raster values byteswapped. #include "emu.h" #include "video/namco_c116.h" -const device_type NAMCO_C116 = &device_creator; +const device_type NAMCO_C116 = device_creator; //------------------------------------------------- // namco_c116_device -- constructor diff --git a/src/mame/video/namcos1.cpp b/src/mame/video/namcos1.cpp index 59bbb123405..cba0f3e3a7d 100644 --- a/src/mame/video/namcos1.cpp +++ b/src/mame/video/namcos1.cpp @@ -8,6 +8,7 @@ Namco System 1 Video Hardware #include "emu.h" #include "includes/namcos1.h" +#include "screen.h" /* diff --git a/src/mame/video/namcos86.cpp b/src/mame/video/namcos86.cpp index b24ffc3204a..e075e830b50 100644 --- a/src/mame/video/namcos86.cpp +++ b/src/mame/video/namcos86.cpp @@ -8,6 +8,7 @@ Namco System 86 Video Hardware #include "emu.h" #include "includes/namcos86.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/neogeo_spr.cpp b/src/mame/video/neogeo_spr.cpp index 8caf9ff0ab9..89ad9aab742 100644 --- a/src/mame/video/neogeo_spr.cpp +++ b/src/mame/video/neogeo_spr.cpp @@ -5,9 +5,11 @@ #include "emu.h" #include "neogeo_spr.h" +#include "screen.h" + // pure virtual functions -//const device_type NEOGEO_SPRITE_BASE = &device_creator; +//const device_type NEOGEO_SPRITE_BASE = device_creator; /* neosprite_base_device::neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -648,7 +650,7 @@ void neosprite_base_device::set_pens(const pen_t* pens) /* regions (alternatively I could add an additional size check in the draw routine, but that would be slower) */ /*********************************************************************************************************************************/ -const device_type NEOGEO_SPRITE_REGULAR = &device_creator; +const device_type NEOGEO_SPRITE_REGULAR = device_creator; neosprite_regular_device::neosprite_regular_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_REGULAR) @@ -696,7 +698,7 @@ inline void neosprite_regular_device::draw_pixel(int romaddr, uint32_t* dst, con /* for additional speed */ /*********************************************************************************************************************************/ -const device_type NEOGEO_SPRITE_OPTIMZIED = &device_creator; +const device_type NEOGEO_SPRITE_OPTIMZIED = device_creator; neosprite_optimized_device::neosprite_optimized_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_OPTIMZIED), @@ -772,7 +774,7 @@ inline void neosprite_optimized_device::draw_pixel(int romaddr, uint32_t* dst, c /* and uploads the zoom table. The additional videoram buffering is a guess because 'hammer' is very glitchy without it */ /*********************************************************************************************************************************/ -const device_type NEOGEO_SPRITE_MIDAS = &device_creator; +const device_type NEOGEO_SPRITE_MIDAS = device_creator; neosprite_midas_device::neosprite_midas_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index 6403ba6c5c1..89353d8ccb5 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "includes/newbrain.h" #include "rendlay.h" +#include "screen.h" #define LOG 0 diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp index e01d0e68cec..21a03eef2db 100644 --- a/src/mame/video/newport.cpp +++ b/src/mame/video/newport.cpp @@ -80,7 +80,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_l #define XMAP1_MODETBLIDX m_XMAP1.nRegister[0x07] -const device_type NEWPORT_VIDEO = &device_creator; +const device_type NEWPORT_VIDEO = device_creator; newport_video_device::newport_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/video/nick.cpp b/src/mame/video/nick.cpp index 40d6d4f81e7..d8191174fdf 100644 --- a/src/mame/video/nick.cpp +++ b/src/mame/video/nick.cpp @@ -73,7 +73,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type NICK = &device_creator; +const device_type NICK = device_creator; DEVICE_ADDRESS_MAP_START( vram_map, 8, nick_device ) diff --git a/src/mame/video/nick.h b/src/mame/video/nick.h index 220bb521e1f..4a8ccb6357e 100644 --- a/src/mame/video/nick.h +++ b/src/mame/video/nick.h @@ -6,13 +6,14 @@ **********************************************************************/ -#pragma once +#ifndef MAME_VIDEO_NICK_H +#define MAME_VIDEO_NICK_H -#ifndef __NICK__ -#define __NICK__ +#pragma once #include "machine/rescap.h" #include "video/resnet.h" +#include "screen.h" @@ -169,6 +170,4 @@ private: // device type definition extern const device_type NICK; - - -#endif +#endif // MAME_VIDEO_NICK_H diff --git a/src/mame/video/opwolf.cpp b/src/mame/video/opwolf.cpp index faa17ef5e46..a0248dbf2f9 100644 --- a/src/mame/video/opwolf.cpp +++ b/src/mame/video/opwolf.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "includes/opwolf.h" +#include "screen.h" WRITE16_MEMBER(opwolf_state::opwolf_spritectrl_w) diff --git a/src/mame/video/osi.cpp b/src/mame/video/osi.cpp index da140b84d5e..9a38db647c5 100644 --- a/src/mame/video/osi.cpp +++ b/src/mame/video/osi.cpp @@ -2,6 +2,7 @@ // copyright-holders:Curt Coder, Robbbert, Wilbert Pol #include "emu.h" #include "includes/osi.h" +#include "screen.h" /* Palette Initialization */ diff --git a/src/mame/video/othunder.cpp b/src/mame/video/othunder.cpp index accd19bc17a..0717e7388ad 100644 --- a/src/mame/video/othunder.cpp +++ b/src/mame/video/othunder.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves #include "emu.h" #include "includes/othunder.h" +#include "screen.h" void othunder_state::video_start() diff --git a/src/mame/video/pc080sn.cpp b/src/mame/video/pc080sn.cpp index 8dcf7b3a7f0..40022810636 100644 --- a/src/mame/video/pc080sn.cpp +++ b/src/mame/video/pc080sn.cpp @@ -44,11 +44,12 @@ Control registers #include "emu.h" #include "pc080sn.h" #include "video/taito_helper.h" +#include "screen.h" #define PC080SN_RAM_SIZE 0x10000 #define TOPSPEED_ROAD_COLORS -const device_type PC080SN = &device_creator; +const device_type PC080SN = device_creator; pc080sn_device::pc080sn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PC080SN, "Taito PC080SN", tag, owner, clock, "pc080sn", __FILE__), diff --git a/src/mame/video/pc090oj.cpp b/src/mame/video/pc090oj.cpp index 74f9194bec2..21c9373e7ab 100644 --- a/src/mame/video/pc090oj.cpp +++ b/src/mame/video/pc090oj.cpp @@ -72,7 +72,7 @@ Taito pc090oj *****************************************************************************/ -const device_type PC090OJ = &device_creator; +const device_type PC090OJ = device_creator; pc090oj_device::pc090oj_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PC090OJ, "Taito PC090OJ", tag, owner, clock, "pc090oj", __FILE__), diff --git a/src/mame/video/pc1512.cpp b/src/mame/video/pc1512.cpp index fd2cb347f64..bd3d34c0bea 100644 --- a/src/mame/video/pc1512.cpp +++ b/src/mame/video/pc1512.cpp @@ -2,6 +2,7 @@ // copyright-holders:Curt Coder #include "emu.h" #include "includes/pc1512.h" +#include "screen.h" diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp index e470749db9d..a4a91c8c61b 100644 --- a/src/mame/video/pc_t1t.cpp +++ b/src/mame/video/pc_t1t.cpp @@ -12,8 +12,11 @@ #include "emu.h" #include "pc_t1t.h" + #include "machine/pic8259.h" #include "machine/ram.h" +#include "screen.h" + enum { @@ -28,8 +31,8 @@ enum }; -const device_type PCVIDEO_T1000 = &device_creator; -const device_type PCVIDEO_PCJR = &device_creator; +const device_type PCVIDEO_T1000 = device_creator; +const device_type PCVIDEO_PCJR = device_creator; pc_t1t_device::pc_t1t_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), diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index b757764b53e..4ad58ebb3fe 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -3,11 +3,14 @@ #include "emu.h" #include "pcd.h" -#include "cpu/mcs51/mcs51.h" + #include "cpu/mcs48/mcs48.h" +#include "cpu/mcs51/mcs51.h" +#include "screen.h" + -const device_type PCD_VIDEO = &device_creator; -const device_type PCX_VIDEO = &device_creator; +const device_type PCD_VIDEO = device_creator; +const device_type PCX_VIDEO = device_creator; pcdx_video_device::pcdx_video_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), diff --git a/src/mame/video/pcw16.cpp b/src/mame/video/pcw16.cpp index c31e37cf3b9..f3754095141 100644 --- a/src/mame/video/pcw16.cpp +++ b/src/mame/video/pcw16.cpp @@ -3,6 +3,7 @@ #include "emu.h" #include "includes/pcw16.h" #include "machine/ram.h" +#include "screen.h" #if 0 diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp index 74653af7432..cb79b8ea4cd 100644 --- a/src/mame/video/pecom.cpp +++ b/src/mame/video/pecom.cpp @@ -9,11 +9,12 @@ ****************************************************************************/ #include "emu.h" -#include "sound/cdp1869.h" -#include "sound/wave.h" -#include "cpu/cosmac/cosmac.h" #include "includes/pecom.h" +#include "sound/wave.h" +#include "speaker.h" + + WRITE8_MEMBER(pecom_state::pecom_cdp1869_w) { uint16_t ma = m_cdp1802->get_memory_address(); diff --git a/src/mame/video/pgm.cpp b/src/mame/video/pgm.cpp index 608a049ea85..249554fcfd5 100644 --- a/src/mame/video/pgm.cpp +++ b/src/mame/video/pgm.cpp @@ -5,6 +5,7 @@ #include "emu.h" #include "includes/pgm.h" +#include "screen.h" /****************************************************************************** Sprites diff --git a/src/mame/video/pktgaldx.cpp b/src/mame/video/pktgaldx.cpp index 0e3a39022f4..56b95374fb1 100644 --- a/src/mame/video/pktgaldx.cpp +++ b/src/mame/video/pktgaldx.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Haywood, Bryan McPhail #include "emu.h" #include "includes/pktgaldx.h" +#include "screen.h" /* Video on the orginal */ diff --git a/src/mame/video/playch10.cpp b/src/mame/video/playch10.cpp index e9b4af34fb5..d9c3224fd35 100644 --- a/src/mame/video/playch10.cpp +++ b/src/mame/video/playch10.cpp @@ -1,9 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi,Brad Oliver #include "emu.h" -#include "video/ppu2c0x.h" #include "includes/playch10.h" +#include "video/ppu2c0x.h" +#include "screen.h" WRITE8_MEMBER(playch10_state::playch10_videoram_w) diff --git a/src/mame/video/playmark.cpp b/src/mame/video/playmark.cpp index b993de9834e..4601f6d4fa9 100644 --- a/src/mame/video/playmark.cpp +++ b/src/mame/video/playmark.cpp @@ -2,6 +2,7 @@ // copyright-holders:Nicola Salmoria, Pierpaolo Prazzoli, Quench #include "emu.h" #include "includes/playmark.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/plygonet.cpp b/src/mame/video/plygonet.cpp index ff16d15f2d8..2e73dcd3c82 100644 --- a/src/mame/video/plygonet.cpp +++ b/src/mame/video/plygonet.cpp @@ -10,8 +10,9 @@ */ #include "emu.h" - #include "includes/plygonet.h" +#include "screen.h" + /* TTL text plane */ diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp index 50a8f00a4df..e49bc6f845c 100644 --- a/src/mame/video/powervr2.cpp +++ b/src/mame/video/powervr2.cpp @@ -11,7 +11,7 @@ #include "rendutil.h" #include "video/rgbutil.h" -const device_type POWERVR2 = &device_creator; +const device_type POWERVR2 = device_creator; DEVICE_ADDRESS_MAP_START(ta_map, 32, powervr2_device) AM_RANGE(0x0000, 0x0003) AM_READ( id_r) diff --git a/src/mame/video/prehisle.cpp b/src/mame/video/prehisle.cpp index 1dae1c4c599..d001a580bc6 100644 --- a/src/mame/video/prehisle.cpp +++ b/src/mame/video/prehisle.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/prehisle.h" +#include "screen.h" WRITE16_MEMBER(prehisle_state::fg_vram_w) diff --git a/src/mame/video/rallyx.cpp b/src/mame/video/rallyx.cpp index f0368f335c7..df2e839dc11 100644 --- a/src/mame/video/rallyx.cpp +++ b/src/mame/video/rallyx.cpp @@ -30,8 +30,9 @@ needs more color combination to render its graphics. ***************************************************************************/ #include "emu.h" -#include "video/resnet.h" #include "includes/rallyx.h" +#include "video/resnet.h" +#include "screen.h" #define STARS_COLOR_BASE (0x104) diff --git a/src/mame/video/rastan.cpp b/src/mame/video/rastan.cpp index 0b13351eb65..08bce30ba63 100644 --- a/src/mame/video/rastan.cpp +++ b/src/mame/video/rastan.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "includes/rastan.h" +#include "screen.h" /***************************************************************************/ diff --git a/src/mame/video/rbisland.cpp b/src/mame/video/rbisland.cpp index aa5680e656c..c326b856f01 100644 --- a/src/mame/video/rbisland.cpp +++ b/src/mame/video/rbisland.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/rbisland.h" +#include "screen.h" /***************************************************************************/ diff --git a/src/mame/video/rohga.cpp b/src/mame/video/rohga.cpp index 73886784c1b..0a387565c30 100644 --- a/src/mame/video/rohga.cpp +++ b/src/mame/video/rohga.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/rohga.h" +#include "screen.h" WRITE16_MEMBER(rohga_state::rohga_buffer_spriteram16_w) diff --git a/src/mame/video/rollerg.cpp b/src/mame/video/rollerg.cpp index 6faa1075b7b..737851c4ddd 100644 --- a/src/mame/video/rollerg.cpp +++ b/src/mame/video/rollerg.cpp @@ -2,6 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" #include "includes/rollerg.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/samcoupe.cpp b/src/mame/video/samcoupe.cpp index a1e20dc415c..b3bd8d82649 100644 --- a/src/mame/video/samcoupe.cpp +++ b/src/mame/video/samcoupe.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/samcoupe.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/sega16sp.cpp b/src/mame/video/sega16sp.cpp index 3055cff7227..7f17e58d3d6 100644 --- a/src/mame/video/sega16sp.cpp +++ b/src/mame/video/sega16sp.cpp @@ -17,14 +17,14 @@ //**************************************************************************** // device type definition -const device_type SEGA_HANGON_SPRITES = &device_creator; -const device_type SEGA_SHARRIER_SPRITES = &device_creator; -const device_type SEGA_OUTRUN_SPRITES = &device_creator; -const device_type SEGA_SYS16A_SPRITES = &device_creator; -const device_type BOOTLEG_SYS16A_SPRITES = &device_creator; -const device_type SEGA_SYS16B_SPRITES = &device_creator; -const device_type SEGA_XBOARD_SPRITES = &device_creator; -const device_type SEGA_YBOARD_SPRITES = &device_creator; +const device_type SEGA_HANGON_SPRITES = device_creator; +const device_type SEGA_SHARRIER_SPRITES = device_creator; +const device_type SEGA_OUTRUN_SPRITES = device_creator; +const device_type SEGA_SYS16A_SPRITES = device_creator; +const device_type BOOTLEG_SYS16A_SPRITES = device_creator; +const device_type SEGA_SYS16B_SPRITES = device_creator; +const device_type SEGA_XBOARD_SPRITES = device_creator; +const device_type SEGA_YBOARD_SPRITES = device_creator; diff --git a/src/mame/video/segaic16.cpp b/src/mame/video/segaic16.cpp index c37e17a7115..d3b7a6767d6 100644 --- a/src/mame/video/segaic16.cpp +++ b/src/mame/video/segaic16.cpp @@ -354,7 +354,9 @@ Quick review of the system16 hardware: #include "emu.h" #include "segaic16.h" + #include "video/resnet.h" +#include "screen.h" @@ -371,7 +373,7 @@ Quick review of the system16 hardware: -const device_type SEGAIC16VID = &device_creator; +const device_type SEGAIC16VID = device_creator; segaic16_video_device::segaic16_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGAIC16VID, "Sega 16-bit Video", tag, owner, clock, "segaic16_video", __FILE__), diff --git a/src/mame/video/segaic16_road.cpp b/src/mame/video/segaic16_road.cpp index 86c6c24f8d0..d20ceb9aba4 100644 --- a/src/mame/video/segaic16_road.cpp +++ b/src/mame/video/segaic16_road.cpp @@ -6,7 +6,7 @@ #include "segaic16_road.h" #include "video/resnet.h" -const device_type SEGAIC16_ROAD = &device_creator; +const device_type SEGAIC16_ROAD = device_creator; segaic16_road_device::segaic16_road_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGAIC16_ROAD, "Sega 16-bit Road Generator", tag, owner, clock, "segaic16_road", __FILE__) diff --git a/src/mame/video/segaic24.cpp b/src/mame/video/segaic24.cpp index c36fd1b75e9..d4bb17157b5 100644 --- a/src/mame/video/segaic24.cpp +++ b/src/mame/video/segaic24.cpp @@ -16,11 +16,12 @@ System 24 68000x2 315-5292 315-5293 315-5294 315-5242 ym2151 da #include "emu.h" #include "segaic24.h" +#include "screen.h" -const device_type S24TILE = &device_creator; -const device_type S24SPRITE = &device_creator; -const device_type S24MIXER = &device_creator; +const device_type S24TILE = device_creator; +const device_type S24SPRITE = device_creator; +const device_type S24MIXER = device_creator; segas24_tile::segas24_tile(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/video/seibu_crtc.cpp b/src/mame/video/seibu_crtc.cpp index 5576f7e182a..774507e970e 100644 --- a/src/mame/video/seibu_crtc.cpp +++ b/src/mame/video/seibu_crtc.cpp @@ -213,7 +213,7 @@ List of default vregs (title screen): //************************************************************************** // device type definition -const device_type SEIBU_CRTC = &device_creator; +const device_type SEIBU_CRTC = device_creator; static ADDRESS_MAP_START( seibu_crtc_vregs, AS_0, 16, seibu_crtc_device ) AM_RANGE(0x0014, 0x0015) AM_WRITE(decrypt_key_w) diff --git a/src/mame/video/seibuspi.cpp b/src/mame/video/seibuspi.cpp index 6c9d2c6a758..1cadd8798f5 100644 --- a/src/mame/video/seibuspi.cpp +++ b/src/mame/video/seibuspi.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "includes/seibuspi.h" #include "machine/seibuspi.h" +#include "screen.h" /************************************************************************** diff --git a/src/mame/video/seta.cpp b/src/mame/video/seta.cpp index df22695c26e..eeac4a5c1a1 100644 --- a/src/mame/video/seta.cpp +++ b/src/mame/video/seta.cpp @@ -139,6 +139,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: #include "emu.h" #include "includes/seta.h" +#include "screen.h" /* note that drgnunit, stg and qzkklogy run on the same board, yet they need different alignment */ static const game_offset game_offsets[] = diff --git a/src/mame/video/seta001.cpp b/src/mame/video/seta001.cpp index 61933206c71..25adb5ce2ba 100644 --- a/src/mame/video/seta001.cpp +++ b/src/mame/video/seta001.cpp @@ -27,9 +27,10 @@ #include "emu.h" #include "seta001.h" +#include "screen.h" -const device_type SETA001_SPRITE = &device_creator; +const device_type SETA001_SPRITE = device_creator; seta001_device::seta001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SETA001_SPRITE, "Seta SETA001 Sprite", tag, owner, clock, "seta001", __FILE__) diff --git a/src/mame/video/shootout.cpp b/src/mame/video/shootout.cpp index a8eaf925ff7..34e56ac0744 100644 --- a/src/mame/video/shootout.cpp +++ b/src/mame/video/shootout.cpp @@ -7,6 +7,7 @@ #include "emu.h" #include "includes/shootout.h" +#include "screen.h" PALETTE_INIT_MEMBER(shootout_state, shootout) diff --git a/src/mame/video/silkroad.cpp b/src/mame/video/silkroad.cpp index 949be656ecb..722dbe03c52 100644 --- a/src/mame/video/silkroad.cpp +++ b/src/mame/video/silkroad.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Haywood, R. Belmont #include "emu.h" #include "includes/silkroad.h" +#include "screen.h" /* Sprites probably need to be delayed */ /* Some scroll layers may need to be offset slightly? */ diff --git a/src/mame/video/simpl156.cpp b/src/mame/video/simpl156.cpp index 060afe1d392..ec1246e0a47 100644 --- a/src/mame/video/simpl156.cpp +++ b/src/mame/video/simpl156.cpp @@ -6,7 +6,7 @@ #include "emu.h" #include "includes/simpl156.h" - +#include "screen.h" void simpl156_state::video_start() diff --git a/src/mame/video/sknsspr.cpp b/src/mame/video/sknsspr.cpp index 559040aa9c4..8efcd50503a 100644 --- a/src/mame/video/sknsspr.cpp +++ b/src/mame/video/sknsspr.cpp @@ -17,8 +17,9 @@ #include "emu.h" #include "sknsspr.h" +#include "screen.h" -const device_type SKNS_SPRITE = &device_creator; +const device_type SKNS_SPRITE = device_creator; sknsspr_device::sknsspr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/video/sknsspr.h b/src/mame/video/sknsspr.h index 5bb49abd3e1..ca9548c1e98 100644 --- a/src/mame/video/sknsspr.h +++ b/src/mame/video/sknsspr.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#ifndef MAME_VIDEO_SKNSSPR_H +#define MAME_VIDEO_SKNSSPR_H class sknsspr_device : public device_t, public device_video_interface @@ -21,3 +23,5 @@ private: }; extern const device_type SKNS_SPRITE; + +#endif // MAME_VIDEO_SKNSSPR_H diff --git a/src/mame/video/slapshot.cpp b/src/mame/video/slapshot.cpp index c58de8242e8..a9a6318ee1b 100644 --- a/src/mame/video/slapshot.cpp +++ b/src/mame/video/slapshot.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves #include "emu.h" #include "includes/slapshot.h" +#include "screen.h" /**********************************************************/ diff --git a/src/mame/video/snk68_spr.cpp b/src/mame/video/snk68_spr.cpp index 621cb44697e..a11d9900d47 100644 --- a/src/mame/video/snk68_spr.cpp +++ b/src/mame/video/snk68_spr.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "snk68_spr.h" -const device_type SNK68_SPR = &device_creator; +const device_type SNK68_SPR = device_creator; snk68_spr_device::snk68_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SNK68_SPR, "SNK68 Sprites", tag, owner, clock, "snk68_spr", __FILE__) diff --git a/src/mame/video/snk68_spr.h b/src/mame/video/snk68_spr.h index f06ad28754e..bbcc05c8b98 100644 --- a/src/mame/video/snk68_spr.h +++ b/src/mame/video/snk68_spr.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, Acho A. Tang, Nicola Salmoria +#include "screen.h" + typedef device_delegate snk68_tile_indirection_delegate; #define MCFG_SNK68_SPR_GFXDECODE(_gfxtag) \ diff --git a/src/mame/video/spectrum.cpp b/src/mame/video/spectrum.cpp index 5ce158a02d4..0f6ee5485d5 100644 --- a/src/mame/video/spectrum.cpp +++ b/src/mame/video/spectrum.cpp @@ -17,6 +17,8 @@ #include "emu.h" #include "includes/spectrum.h" +#include "screen.h" + /*************************************************************************** Start the video hardware emulation. diff --git a/src/mame/video/sprint4.cpp b/src/mame/video/sprint4.cpp index 3ae0f5219c9..ae6883f53d9 100644 --- a/src/mame/video/sprint4.cpp +++ b/src/mame/video/sprint4.cpp @@ -7,8 +7,9 @@ Atari Sprint 4 video emulation ***************************************************************************/ #include "emu.h" -#include "audio/sprint4.h" #include "includes/sprint4.h" +#include "audio/sprint4.h" +#include "screen.h" PALETTE_INIT_MEMBER(sprint4_state, sprint4) diff --git a/src/mame/video/st0020.cpp b/src/mame/video/st0020.cpp index c5f9db64e7a..f58b1d4e430 100644 --- a/src/mame/video/st0020.cpp +++ b/src/mame/video/st0020.cpp @@ -13,7 +13,7 @@ #include "st0020.h" #include "render.h" -const device_type ST0020_SPRITES = &device_creator; +const device_type ST0020_SPRITES = device_creator; st0020_device::st0020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ST0020_SPRITES, "Seta ST0020 Sprites", tag, owner, clock, "st0020", __FILE__) diff --git a/src/mame/video/stactics.cpp b/src/mame/video/stactics.cpp index c343cb642a7..64755130256 100644 --- a/src/mame/video/stactics.cpp +++ b/src/mame/video/stactics.cpp @@ -50,6 +50,7 @@ tilt the mirror up and down, and the monitor left and right. #include "emu.h" #include "includes/stactics.h" +#include "screen.h" diff --git a/src/mame/video/starcrus.cpp b/src/mame/video/starcrus.cpp index 6163a09b997..8bd2ce947b4 100644 --- a/src/mame/video/starcrus.cpp +++ b/src/mame/video/starcrus.cpp @@ -4,8 +4,9 @@ /* Ramtek - Star Cruiser */ #include "emu.h" -#include "sound/samples.h" #include "includes/starcrus.h" +#include "sound/samples.h" +#include "screen.h" /* The collision detection techniques use in this driver are well explained in the comments in the sprint2 driver */ diff --git a/src/mame/video/stfight_dev.cpp b/src/mame/video/stfight_dev.cpp index 3593e9ae36c..d434b61fea6 100644 --- a/src/mame/video/stfight_dev.cpp +++ b/src/mame/video/stfight_dev.cpp @@ -6,10 +6,10 @@ #include "emu.h" #include "stfight_dev.h" +#include "screen.h" - -extern const device_type STFIGHT_VIDEO = &device_creator; +const device_type STFIGHT_VIDEO = device_creator; stfight_video_device::stfight_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/video/stfight_dev.h b/src/mame/video/stfight_dev.h index 74747c805d7..24b5a0227a0 100644 --- a/src/mame/video/stfight_dev.h +++ b/src/mame/video/stfight_dev.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mark McDougall, David Haywood -#pragma once +#ifndef MAME_VIDEO_STFIGHT_VIDEO_H +#define MAME_VIDEO_STFIGHT_VIDEO_H -#ifndef __STFIGHT_VIDEO__ -#define __STFIGHT_VIDEO__ +#pragma once @@ -73,4 +73,4 @@ private: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; -#endif +#endif // MAME_VIDEO_STFIGHT_VIDEO_H diff --git a/src/mame/video/stic.cpp b/src/mame/video/stic.cpp index 705c895d9ae..85a38be4580 100644 --- a/src/mame/video/stic.cpp +++ b/src/mame/video/stic.cpp @@ -9,9 +9,10 @@ #include "emu.h" #include "video/stic.h" +#include "screen.h" -const device_type STIC = &device_creator; +const device_type STIC = device_creator; //------------------------------------------------- // stic_device - constructor diff --git a/src/mame/video/superchs.cpp b/src/mame/video/superchs.cpp index 33423422660..4396e25fdad 100644 --- a/src/mame/video/superchs.cpp +++ b/src/mame/video/superchs.cpp @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail, David Graves #include "emu.h" #include "includes/superchs.h" +#include "screen.h" void superchs_state::video_start() { diff --git a/src/mame/video/suprridr.cpp b/src/mame/video/suprridr.cpp index 797e80c6570..ff5e614c024 100644 --- a/src/mame/video/suprridr.cpp +++ b/src/mame/video/suprridr.cpp @@ -8,6 +8,7 @@ #include "emu.h" #include "includes/suprridr.h" +#include "screen.h" /************************************* diff --git a/src/mame/video/taito_f2.cpp b/src/mame/video/taito_f2.cpp index 4600a3afa18..89f039d2ded 100644 --- a/src/mame/video/taito_f2.cpp +++ b/src/mame/video/taito_f2.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves, Bryan McPhail, Brad Oliver, Andrew Prime, Brian Troha, Nicola Salmoria #include "emu.h" #include "includes/taito_f2.h" +#include "screen.h" /************************************************************ SPRITE BANKING diff --git a/src/mame/video/taito_l.cpp b/src/mame/video/taito_l.cpp index 998e5bf681e..d275c363fc6 100644 --- a/src/mame/video/taito_l.cpp +++ b/src/mame/video/taito_l.cpp @@ -2,6 +2,7 @@ // copyright-holders:Olivier Galibert #include "emu.h" #include "includes/taito_l.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/taito_z.cpp b/src/mame/video/taito_z.cpp index 96f4511158d..df69f67626d 100644 --- a/src/mame/video/taito_z.cpp +++ b/src/mame/video/taito_z.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves #include "emu.h" #include "includes/taito_z.h" +#include "screen.h" /**********************************************************/ diff --git a/src/mame/video/taotaido.cpp b/src/mame/video/taotaido.cpp index 12b20cf33ee..0bacd6ec616 100644 --- a/src/mame/video/taotaido.cpp +++ b/src/mame/video/taotaido.cpp @@ -11,8 +11,8 @@ zooming might be wrong (only used on title logo?) */ #include "emu.h" -#include "vsystem_spr.h" #include "includes/taotaido.h" +#include "screen.h" /* sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers */ WRITE16_MEMBER(taotaido_state::sprite_character_bank_select_w) diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index d4bebe1c5a2..20df26758dd 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail #include "emu.h" #include "includes/tatsumi.h" +#include "screen.h" /******************************************************************************/ diff --git a/src/mame/video/tc0080vco.cpp b/src/mame/video/tc0080vco.cpp index a516c95116a..774ae2a44fb 100644 --- a/src/mame/video/tc0080vco.cpp +++ b/src/mame/video/tc0080vco.cpp @@ -61,10 +61,13 @@ this seems to be the only zoom feature actually used in the games. */ #include "emu.h" -#include "drawgfxm.h" #include "tc0080vco.h" #include "video/taito_helper.h" +#include "drawgfxm.h" +#include "screen.h" + + #define TC0080VCO_RAM_SIZE 0x21000 #define TC0080VCO_CHAR_RAM_SIZE 0x2000 #define TC0080VCO_TOTAL_CHARS 256 @@ -75,7 +78,7 @@ this seems to be the only zoom feature actually used in the games. *****************************************************************************/ -const device_type TC0080VCO = &device_creator; +const device_type TC0080VCO = device_creator; tc0080vco_device::tc0080vco_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0080VCO, "Taito TC0080VCO", tag, owner, clock, "tc0080vco", __FILE__), diff --git a/src/mame/video/tc0100scn.cpp b/src/mame/video/tc0100scn.cpp index 791774fa615..7489bee5b9a 100644 --- a/src/mame/video/tc0100scn.cpp +++ b/src/mame/video/tc0100scn.cpp @@ -142,11 +142,12 @@ the wide tilemap mode) #include "emu.h" #include "tc0100scn.h" +#include "screen.h" #define TC0100SCN_RAM_SIZE 0x14000 /* enough for double-width tilemaps */ #define TC0100SCN_TOTAL_CHARS 256 -const device_type TC0100SCN = &device_creator; +const device_type TC0100SCN = device_creator; tc0100scn_device::tc0100scn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0100SCN, "Taito TC0100SCN", tag, owner, clock, "tc0100scn", __FILE__), diff --git a/src/mame/video/tc0110pcr.cpp b/src/mame/video/tc0110pcr.cpp index 4c56f4b3b7e..f1e1dab12c4 100644 --- a/src/mame/video/tc0110pcr.cpp +++ b/src/mame/video/tc0110pcr.cpp @@ -18,7 +18,7 @@ The data bus is 16 bits wide. #define TC0110PCR_RAM_SIZE 0x2000 -const device_type TC0110PCR = &device_creator; +const device_type TC0110PCR = device_creator; tc0110pcr_device::tc0110pcr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0110PCR, "Taito TC0110PCR", tag, owner, clock, "tc0110pcr", __FILE__) diff --git a/src/mame/video/tc0150rod.cpp b/src/mame/video/tc0150rod.cpp index d62244c80de..c85d6cf8ede 100644 --- a/src/mame/video/tc0150rod.cpp +++ b/src/mame/video/tc0150rod.cpp @@ -12,7 +12,7 @@ Road generator. Two roads allow for forking. Gfx data fetched from ROM. Refer to #define TC0150ROD_RAM_SIZE 0x2000 -const device_type TC0150ROD = &device_creator; +const device_type TC0150ROD = device_creator; tc0150rod_device::tc0150rod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0150ROD, "Taito TC0150ROD", tag, owner, clock, "tc0150rod", __FILE__), diff --git a/src/mame/video/tc0180vcu.cpp b/src/mame/video/tc0180vcu.cpp index 7c1374ebc1a..19cf6694bee 100644 --- a/src/mame/video/tc0180vcu.cpp +++ b/src/mame/video/tc0180vcu.cpp @@ -9,7 +9,7 @@ #define TC0180VCU_SCROLLRAM_SIZE 0x0800 -const device_type TC0180VCU = &device_creator; +const device_type TC0180VCU = device_creator; tc0180vcu_device::tc0180vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0180VCU, "Taito TC0180VCU", tag, owner, clock, "tc0180vcu", __FILE__), diff --git a/src/mame/video/tc0280grd.cpp b/src/mame/video/tc0280grd.cpp index f26a3cd5509..86504d584b2 100644 --- a/src/mame/video/tc0280grd.cpp +++ b/src/mame/video/tc0280grd.cpp @@ -25,7 +25,7 @@ control registers: #define TC0280GRD_RAM_SIZE 0x2000 -const device_type TC0280GRD = &device_creator; +const device_type TC0280GRD = device_creator; tc0280grd_device::tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0280GRD, "Taito TC0280GRD & TC0430GRW", tag, owner, clock, "tc0280grd", __FILE__), diff --git a/src/mame/video/tc0360pri.cpp b/src/mame/video/tc0360pri.cpp index de9c8de0746..beba1fc556a 100644 --- a/src/mame/video/tc0360pri.cpp +++ b/src/mame/video/tc0360pri.cpp @@ -43,7 +43,7 @@ each one of them can declare to have four different priority levels. #include "tc0360pri.h" -const device_type TC0360PRI = &device_creator; +const device_type TC0360PRI = device_creator; tc0360pri_device::tc0360pri_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0360PRI, "Taito TC0360PRI", tag, owner, clock, "tc0360pri", __FILE__) diff --git a/src/mame/video/tc0480scp.cpp b/src/mame/video/tc0480scp.cpp index 713bca12e7a..8a1aed0fae1 100644 --- a/src/mame/video/tc0480scp.cpp +++ b/src/mame/video/tc0480scp.cpp @@ -144,12 +144,13 @@ Control registers #include "emu.h" #include "tc0480scp.h" #include "video/taito_helper.h" +#include "screen.h" #define TC0480SCP_RAM_SIZE 0x10000 #define TC0480SCP_TOTAL_CHARS 256 -const device_type TC0480SCP = &device_creator; +const device_type TC0480SCP = device_creator; tc0480scp_device::tc0480scp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0480SCP, "Taito TC0480SCP", tag, owner, clock, "tc0480scp", __FILE__), diff --git a/src/mame/video/tc0780fpa.cpp b/src/mame/video/tc0780fpa.cpp index 00ad628d795..590a657ff15 100644 --- a/src/mame/video/tc0780fpa.cpp +++ b/src/mame/video/tc0780fpa.cpp @@ -390,7 +390,7 @@ void tc0780fpa_renderer::render(uint16_t *polygon_fifo, int length) } } -const device_type TC0780FPA = &device_creator; +const device_type TC0780FPA = device_creator; tc0780fpa_device::tc0780fpa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TC0780FPA, "TC0780FPA Polygon Renderer", tag, owner, clock, "tc0780fpa", __FILE__), diff --git a/src/mame/video/tecmo_mix.cpp b/src/mame/video/tecmo_mix.cpp index 4de75355d33..f7d1e6b3481 100644 --- a/src/mame/video/tecmo_mix.cpp +++ b/src/mame/video/tecmo_mix.cpp @@ -5,7 +5,7 @@ #include "tecmo_mix.h" -const device_type TECMO_MIXER = &device_creator; +const device_type TECMO_MIXER = device_creator; tecmo_mix_device::tecmo_mix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TECMO_MIXER, "Tecmo 16-bit Mixer", tag, owner, clock, "tecmo_mix", __FILE__), diff --git a/src/mame/video/tecmo_spr.cpp b/src/mame/video/tecmo_spr.cpp index babb0d3ac9f..c52c3bc0f43 100644 --- a/src/mame/video/tecmo_spr.cpp +++ b/src/mame/video/tecmo_spr.cpp @@ -10,12 +10,12 @@ */ - #include "emu.h" #include "tecmo_spr.h" +#include "screen.h" -const device_type TECMO_SPRITE = &device_creator; +const device_type TECMO_SPRITE = device_creator; tecmo_spr_device::tecmo_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TECMO_SPRITE, "Tecmo Chained Sprites", tag, owner, clock, "tecmo_spr", __FILE__), diff --git a/src/mame/video/tetrisp2.cpp b/src/mame/video/tetrisp2.cpp index 9d8ac20ec62..7ed809557fa 100644 --- a/src/mame/video/tetrisp2.cpp +++ b/src/mame/video/tetrisp2.cpp @@ -33,8 +33,9 @@ To Do: ***************************************************************************/ #include "emu.h" -#include "machine/jalcrpt.h" #include "includes/tetrisp2.h" +#include "machine/jalcrpt.h" +#include "screen.h" /*************************************************************************** diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp index e1e79de664b..a4d3729b636 100644 --- a/src/mame/video/tia.cpp +++ b/src/mame/video/tia.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "tia.h" #include "sound/tiaintf.h" +#include "screen.h" static const int nusiz[8][3] = { @@ -361,7 +362,7 @@ tia_video_device::tia_video_device(const machine_config &mconfig, device_type ty } // device type definition -const device_type TIA_PAL_VIDEO = &device_creator; +const device_type TIA_PAL_VIDEO = device_creator; //------------------------------------------------- // tia_pal_video_device - constructor @@ -388,7 +389,7 @@ machine_config_constructor tia_pal_video_device::device_mconfig_additions() cons } // device type definition -const device_type TIA_NTSC_VIDEO = &device_creator; +const device_type TIA_NTSC_VIDEO = device_creator; //------------------------------------------------- // tia_ntsc_video_device - constructor diff --git a/src/mame/video/tigeroad_spr.cpp b/src/mame/video/tigeroad_spr.cpp index 31d78194c6a..40c8383e0ed 100644 --- a/src/mame/video/tigeroad_spr.cpp +++ b/src/mame/video/tigeroad_spr.cpp @@ -19,7 +19,7 @@ #include "tigeroad_spr.h" -const device_type TIGEROAD_SPRITE = &device_creator; +const device_type TIGEROAD_SPRITE = device_creator; tigeroad_spr_device::tigeroad_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TIGEROAD_SPRITE, "Simple Capcom (Tiger Road) Sprite", tag, owner, clock, "tigeroad_spr", __FILE__) diff --git a/src/mame/video/tmc1800.cpp b/src/mame/video/tmc1800.cpp index c971034c8e5..e7f855f10e8 100644 --- a/src/mame/video/tmc1800.cpp +++ b/src/mame/video/tmc1800.cpp @@ -2,10 +2,13 @@ // copyright-holders:Curt Coder #include "emu.h" #include "includes/tmc1800.h" + #include "cpu/cosmac/cosmac.h" -#include "video/cdp1861.h" -#include "sound/cdp1864.h" #include "machine/rescap.h" +#include "sound/cdp1864.h" +#include "video/cdp1861.h" +#include "speaker.h" + /* Telmac 2000 */ diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp index 98cabd4f5f2..65c403e64ed 100644 --- a/src/mame/video/tmc600.cpp +++ b/src/mame/video/tmc600.cpp @@ -1,9 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "sound/cdp1869.h" #include "includes/tmc600.h" +#include "sound/cdp1869.h" +#include "speaker.h" + + WRITE8_MEMBER( tmc600_state::vismac_register_w ) { m_vismac_reg_latch = data; diff --git a/src/mame/video/toaplan_scu.cpp b/src/mame/video/toaplan_scu.cpp index 8258c7e882a..2402e1df285 100644 --- a/src/mame/video/toaplan_scu.cpp +++ b/src/mame/video/toaplan_scu.cpp @@ -6,11 +6,12 @@ */ - #include "emu.h" #include "toaplan_scu.h" +#include "screen.h" + -const device_type TOAPLAN_SCU = &device_creator; +const device_type TOAPLAN_SCU = device_creator; const gfx_layout toaplan_scu_device::spritelayout = { diff --git a/src/mame/video/topspeed.cpp b/src/mame/video/topspeed.cpp index d4f27d1d59e..187c475b97f 100644 --- a/src/mame/video/topspeed.cpp +++ b/src/mame/video/topspeed.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves #include "emu.h" #include "includes/topspeed.h" +#include "screen.h" /**************************************************************************** diff --git a/src/mame/video/trs80.cpp b/src/mame/video/trs80.cpp index 53885d0c30e..a52e66e993d 100644 --- a/src/mame/video/trs80.cpp +++ b/src/mame/video/trs80.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "includes/trs80.h" +#include "screen.h" /* Bit assignment for "state->m_mode" d7 Page select diff --git a/src/mame/video/undrfire.cpp b/src/mame/video/undrfire.cpp index c14c66328d7..b1eed38bebc 100644 --- a/src/mame/video/undrfire.cpp +++ b/src/mame/video/undrfire.cpp @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail, David Graves #include "emu.h" #include "includes/undrfire.h" +#include "screen.h" diff --git a/src/mame/video/uv201.cpp b/src/mame/video/uv201.cpp index 5cf21144d47..fdbd98ab2af 100644 --- a/src/mame/video/uv201.cpp +++ b/src/mame/video/uv201.cpp @@ -90,7 +90,7 @@ //************************************************************************** // device type definition -const device_type UV201 = &device_creator; +const device_type UV201 = device_creator; //------------------------------------------------- diff --git a/src/mame/video/uv201.h b/src/mame/video/uv201.h index 6cf1d0aa63a..48f34921cb3 100644 --- a/src/mame/video/uv201.h +++ b/src/mame/video/uv201.h @@ -51,12 +51,13 @@ **********************************************************************/ -#pragma once +#ifndef MAME_VIDEO_UV201_H +#define MAME_VIDEO_UV201_H -#ifndef __UV201__ -#define __UV201__ +#pragma once +#include "screen.h" //************************************************************************** @@ -153,6 +154,4 @@ private: // device type definition extern const device_type UV201; - - -#endif +#endif // MAME_VIDEO_UV201_H diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index f28abbc2c5a..46c91e5a485 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -3,6 +3,8 @@ #include "emu.h" #include "includes/v1050.h" +#include "screen.h" + /* TODO: diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp index 0d681d8ba74..22b514d1840 100644 --- a/src/mame/video/vrender0.cpp +++ b/src/mame/video/vrender0.cpp @@ -23,7 +23,7 @@ DEVICE INTERFACE *****************************************************************************/ -const device_type VIDEO_VRENDER0 = &device_creator; +const device_type VIDEO_VRENDER0 = device_creator; vr0video_device::vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VIDEO_VRENDER0, "VRender0 Video", tag, owner, clock, "vr0video", __FILE__) diff --git a/src/mame/video/vs920a.cpp b/src/mame/video/vs920a.cpp index 0ff605f76a4..da5811f9fd8 100644 --- a/src/mame/video/vs920a.cpp +++ b/src/mame/video/vs920a.cpp @@ -30,7 +30,7 @@ t=tile, p=palette #include "vs920a.h" -const device_type VS920A = &device_creator; +const device_type VS920A = device_creator; vs920a_text_tilemap_device::vs920a_text_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VS920A, "VS920A Text Tilemap", tag, owner, clock, "vs920a", __FILE__), diff --git a/src/mame/video/vsystem_spr.cpp b/src/mame/video/vsystem_spr.cpp index 60459f1b981..d7ffb4ce830 100644 --- a/src/mame/video/vsystem_spr.cpp +++ b/src/mame/video/vsystem_spr.cpp @@ -59,17 +59,12 @@ Abstracts the VS9210 */ - - #include "emu.h" #include "vsystem_spr.h" +#include "screen.h" - - - - -const device_type VSYSTEM_SPR = &device_creator; +const device_type VSYSTEM_SPR = device_creator; vsystem_spr_device::vsystem_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VSYSTEM_SPR, "Video System Sprites", tag, owner, clock, "vsystem_spr", __FILE__) diff --git a/src/mame/video/vsystem_spr.h b/src/mame/video/vsystem_spr.h index 43e23a92db1..8167cb5a31c 100644 --- a/src/mame/video/vsystem_spr.h +++ b/src/mame/video/vsystem_spr.h @@ -1,6 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, David Haywood // Video System Sprites +#ifndef MAME_VIDEO_VSYSTEM_SPR_H +#define MAME_VIDEO_VSYSTEM_SPR_H typedef device_delegate vsystem_tile_indirection_delegate; @@ -79,3 +81,5 @@ private: extern const device_type VSYSTEM_SPR; + +#endif // MAME_VIDEO_VSYSTEM_SPR_H diff --git a/src/mame/video/vsystem_spr2.cpp b/src/mame/video/vsystem_spr2.cpp index 69444a89bc2..74712e37021 100644 --- a/src/mame/video/vsystem_spr2.cpp +++ b/src/mame/video/vsystem_spr2.cpp @@ -27,7 +27,7 @@ #include "vsystem_spr2.h" -const device_type VSYSTEM_SPR2 = &device_creator; +const device_type VSYSTEM_SPR2 = device_creator; vsystem_spr2_device::vsystem_spr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VSYSTEM_SPR2, "Video System Sprites Type 2", tag, owner, clock, "vsystem_spr2", __FILE__) diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp index e5c4939421e..225af086bdd 100644 --- a/src/mame/video/vtvideo.cpp +++ b/src/mame/video/vtvideo.cpp @@ -59,6 +59,7 @@ FIXME: work out the differences and identify common code between VT and Rainbow. #include "emu.h" #include "video/vtvideo.h" +#include "screen.h" /*************************************************************************** PARAMETERS @@ -69,8 +70,8 @@ PARAMETERS #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -const device_type VT100_VIDEO = &device_creator; -const device_type RAINBOW_VIDEO = &device_creator; +const device_type VT100_VIDEO = device_creator; +const device_type RAINBOW_VIDEO = device_creator; vt100_video_device::vt100_video_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) diff --git a/src/mame/video/warriorb.cpp b/src/mame/video/warriorb.cpp index 2da5ed55ee5..7d505e09d96 100644 --- a/src/mame/video/warriorb.cpp +++ b/src/mame/video/warriorb.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves #include "emu.h" #include "includes/warriorb.h" +#include "screen.h" /************************************************************ SPRITE DRAW ROUTINE diff --git a/src/mame/video/welltris.cpp b/src/mame/video/welltris.cpp index 68a0e871f19..dd03b46388f 100644 --- a/src/mame/video/welltris.cpp +++ b/src/mame/video/welltris.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" #include "includes/welltris.h" +#include "screen.h" diff --git a/src/mame/video/wgp.cpp b/src/mame/video/wgp.cpp index 22ac92ab083..fd31d78b878 100644 --- a/src/mame/video/wgp.cpp +++ b/src/mame/video/wgp.cpp @@ -2,6 +2,7 @@ // copyright-holders:David Graves #include "emu.h" #include "includes/wgp.h" +#include "screen.h" /*******************************************************************/ diff --git a/src/mame/video/wpc_dmd.cpp b/src/mame/video/wpc_dmd.cpp index cb12c25af95..fc6338f3301 100644 --- a/src/mame/video/wpc_dmd.cpp +++ b/src/mame/video/wpc_dmd.cpp @@ -3,8 +3,9 @@ #include "emu.h" #include "wpc_dmd.h" #include "rendlay.h" +#include "screen.h" -const device_type WPC_DMD = &device_creator; +const device_type WPC_DMD = device_creator; DEVICE_ADDRESS_MAP_START( registers, 8, wpc_dmd_device ) AM_RANGE(0, 0) AM_WRITE(bank2_w) diff --git a/src/mame/video/wswan.cpp b/src/mame/video/wswan.cpp index edcd5c13682..4ac72c2e596 100644 --- a/src/mame/video/wswan.cpp +++ b/src/mame/video/wswan.cpp @@ -15,8 +15,9 @@ #include "emu.h" #include "wswan.h" +#include "screen.h" -const device_type WSWAN_VIDEO = &device_creator; +const device_type WSWAN_VIDEO = device_creator; wswan_video_device::wswan_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/mame/video/x68k.cpp b/src/mame/video/x68k.cpp index 19582d5278d..a4b61f110c9 100644 --- a/src/mame/video/x68k.cpp +++ b/src/mame/video/x68k.cpp @@ -34,10 +34,7 @@ */ #include "emu.h" - -#include "machine/mc68901.h" #include "includes/x68k.h" -#include "machine/ram.h" PALETTE_DECODER_MEMBER(x68k_state, GGGGGRRRRRBBBBBI) diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp index bc5f1c0922b..0366048e3c6 100644 --- a/src/mame/video/ygv608.cpp +++ b/src/mame/video/ygv608.cpp @@ -33,6 +33,8 @@ #include "emu.h" #include "video/ygv608.h" +#include "screen.h" + #define _ENABLE_SPRITES #define _ENABLE_SCROLLX @@ -147,7 +149,7 @@ static GFXDECODE_START( ygv608 ) GFXDECODE_END -const device_type YGV608 = &device_creator; +const device_type YGV608 = device_creator; ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t(mconfig, YGV608, "YGV608 VDP", tag, owner, clock, "ygv608", __FILE__), diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp index 755839d35fe..bac4b89729b 100644 --- a/src/mame/video/zx8301.cpp +++ b/src/mame/video/zx8301.cpp @@ -19,6 +19,7 @@ #include "emu.h" #include "zx8301.h" +#include "screen.h" //************************************************************************** @@ -51,7 +52,7 @@ static const rgb_t PALETTE_ZX8301[] = //************************************************************************** // devices -const device_type ZX8301 = &device_creator; +const device_type ZX8301 = device_creator; // default address map diff --git a/src/osd/modules/render/aviwrite.cpp b/src/osd/modules/render/aviwrite.cpp index 291f42f9656..0bdfd3d0e8b 100644 --- a/src/osd/modules/render/aviwrite.cpp +++ b/src/osd/modules/render/aviwrite.cpp @@ -8,7 +8,10 @@ #include "emu.h" #include "aviwrite.h" + #include "modules/lib/osdobj_common.h" +#include "screen.h" + avi_write::avi_write(running_machine& machine, uint32_t width, uint32_t height) : m_machine(machine) -- cgit v1.2.3